Merge branch 'WORDSCLOUD_893' into 'master'

Wordscloud 893 See merge request words-cloud/words-cloud-node!3
aspose-words-cloud · Oct 7, 2019 · 62ff6b3 · 62ff6b3
2 parents 95e79e9 + a617b98
commit 62ff6b3
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 174 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,124 +1,16 @@
+# project files
+.vscode/*
 
-Temp/
-obj/
-classes/
-generated/
-*.suo
-bin/
-*_out_*
-* Out*
-* out*
-*.ldb
-Thumbs.db
-_ReSharper*/
-out/
-*.lic
-*.user
-Out/
-Out*/
-Data/*Out*
-TestResults/
-*.ide
-*.vsmdi
-test-results/
+# node packages
+package-lock.json
 node_modules/
-*.userprefs
-packages/
-Plugins/Aspose_Words_NET_for_PHP/.idea/*
-Plugins/Aspose_Words_NET_for_PHP/vendor/*
-Plugins/Aspose_Words_NET_for_PHP/composer.lock
-*.gitattributes
-*.pyc
-# Built application files
-*.apk
-*.ap_
 
-# Files for the ART/Dalvik VM
-*.dex
-
-# Java class files
-*.class
-
-# Generated files
-bin/
-gen/
-out/
-
-# Gradle files
-.gradle/
-build/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Proguard folder generated by Eclipse
-proguard/
-
-# Log Files
-*.log
-
-# Android Studio Navigation editor temp files
-.navigation/
-
-# Android Studio captures folder
-captures/
-
-# Intellij
-*.iml
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/dictionaries
-.idea/libraries
-
-# Keystore files
-*.jks
-
-# External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
-
-# Google Services (e.g. APIs or Firebase)
-google-services.json
-
-# Freeline
-freeline.py
-freeline/
-freeline_project_description.json
-
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.war
-*.ear
-*.zip
-*.tar.gz
-*.rar
+# credentials
+testConfig.json
+.npmrc
 
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+# build files
+dist/*
 
-.DS_Store
-*.xcuserstate*StyleCop.Cache
-*StyleCop.Cache
-SDKs/NET/.vs/*
-SDKs/PHP/.idea/*
-SDKs/PHP/vendor/*
-SDKs/PHP/testReports/*
-SDKs/servercreds.json
-*/testConfig.json
-/dist/*
-/servercreds.json
-testConfig.json
-/ts-node-*
-reports/*
-/.npmrc
+# reports
+reports/*
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,16 +1,15 @@
-parameters {
-        string(name: 'branch', defaultValue: 'master', description: 'branch to test')		
-		string(name: 'testServerUrl', defaultValue: 'https://auckland-words-cloud-staging.dynabic.com', description: 'server url')		
-}
+properties([
+	parameters([string(defaultValue: 'master', description: 'the branch to build', name: 'branch', trim: true)])
+])
 
 def runtests(dockerImageVersion)
 {
     dir(dockerImageVersion){
         try {
             stage('checkout'){
-                checkout([$class: 'GitSCM', branches: [[name: '*/' + params.branch]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '9d6c4dfa-042c-4ed1-81c7-9175179dddda', url: 'https://github.com/aspose-words-cloud/aspose-words-cloud-node.git/']]])
+                checkout([$class: 'GitSCM', branches: [[name: '*/' + params.branch]], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-node.git']]])
                 withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'AppKey', usernameVariable: 'AppSid')]) {
-                    sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"$testServerUrl\\"}" > testConfig.json'
+                    sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\"}" > testConfig.json'
                 }
             }
 
@@ -56,7 +55,6 @@ def runtests(dockerImageVersion)
     }
 }
 
-node('billing-qa-ubuntu-16.04.4') {        
-    runtests("latest")
-    runtests("6")       
+node('words-linux') {        
+    runtests("latest")   
 }
diff --git a/JenkinsfileRelease b/JenkinsfileRelease
@@ -1,13 +1,14 @@
-node('billing-qa-ubuntu-16.04.4') {         
+node('words-linux') {         
     try {
        stage('checkout'){
-           checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '9d6c4dfa-042c-4ed1-81c7-9175179dddda', url: 'https://github.com/aspose-words-cloud/aspose-words-cloud-node.git/']]])
-           withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'AppKey', usernameVariable: 'AppSid')]) {
-               sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"https://auckland-words-cloud-staging.dynabic.com\\"}" > testConfig.json'
-           }
+			checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-node.git']]])
 
-		sh "git config user.email \"jenkins.aspose@gmail.com\""
-		sh "git config user.name \"jenkins\""
+			sh "git config user.email \"jenkins.aspose@gmail.com\""
+			sh "git config user.name \"jenkins\""
+
+			withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', usernameVariable: 'gitUsername', passwordVariable: 'gitPass')]) {
+				gitRepoUrl = "https://${gitUsername}:${gitPass}@git.auckland.dynabic.com/words-cloud/words-cloud-node.git"
+			}
        }
 
        docker.image('node:latest').inside{
@@ -37,10 +38,7 @@ node('billing-qa-ubuntu-16.04.4') {
 	    	sh "git merge --no-ff --allow-unrelated-histories origin/master"
 	    	sh "git diff --name-status"			
 	    	sh 'git commit -am "Merged master branch to testPackage" || exit 0'
-
-	    	withCredentials([usernamePassword(credentialsId: '9d6c4dfa-042c-4ed1-81c7-9175179dddda', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
-	    		sh "git push https://WordsCloud:$gitPass@github.com/aspose-words-cloud/aspose-words-cloud-node testPackage"
-	    	}
+	    	sh "git push ${gitRepoUrl} testPackage"
 	    }
 
 	    stage('add reference to new package'){
@@ -64,9 +62,7 @@ node('billing-qa-ubuntu-16.04.4') {
 			sh "git ls-files --others --exclude-standard"
 			sh "git add -A"
 	    	sh 'git commit -am "new version of package added to repository" || exit 0'
-	    	withCredentials([usernamePassword(credentialsId: '9d6c4dfa-042c-4ed1-81c7-9175179dddda', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
-	    		sh "git push https://WordsCloud:$gitPass@github.com/aspose-words-cloud/aspose-words-cloud-node testPackage"
-	    	}
+			sh "git push ${gitRepoUrl} testPackage"		
 	    }
 
     } finally {                       
@@ -75,10 +71,9 @@ node('billing-qa-ubuntu-16.04.4') {
 }
 
 stage('test package'){
-	build job: 'words-sdk-nodejs', 
+	build job: 'words-node-sdk', 
 	   parameters: [
-		string(name: 'branch', value: 'testPackage'), 
-		string(name: 'testServerUrl', value: 'https://api.aspose.cloud')						
+		string(name: 'branch', value: 'testPackage')						
 	   ]
 }   
 
@@ -88,11 +83,18 @@ stage('wait for publish confirmation'){
 	}
 }
 
-node('billing-qa-ubuntu-16.04.4') {         
+node('words-linux') {         
     try {
         stage('checkout again'){
-           checkout([$class: 'GitSCM', branches: [[name: '*/testPackage']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '9d6c4dfa-042c-4ed1-81c7-9175179dddda', url: 'https://github.com/aspose-words-cloud/aspose-words-cloud-node.git/']]])          
+           checkout([$class: 'GitSCM', branches: [[name: '*/testPackage']], doGenerateSubmoduleConfigurations: false, extensions: [], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-node.git']]])          
 
+			sh "git config user.email \"jenkins.aspose@gmail.com\""
+			sh "git config user.name \"jenkins\""
+
+			withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', usernameVariable: 'gitUsername', passwordVariable: 'gitPass')]) {
+				gitRepoUrl = "https://${gitUsername}:${gitPass}@git.auckland.dynabic.com/words-cloud/words-cloud-node.git"
+			}
+
 			sh "git checkout testPackage"
 	    	sh "git reset --hard origin/testPackage"
         }
@@ -108,8 +110,8 @@ node('billing-qa-ubuntu-16.04.4') {
 					*/
 				'HOME=.',
 				]) {
-				withCredentials([usernamePassword(credentialsId: '19f0eab9-c600-4746-a4bd-724efd2102c8', passwordVariable: 'npmPass', usernameVariable: 'npmLogin')]) {
-					sh "echo //registry.npmjs.org/:_authToken=${npmPass} > .npmrc"
+				withCredentials([string(credentialsId: '19f0eab9-c600-4746-a4bd-724efd2102c8', variable: 'npmToken')]) {
+					sh "echo //registry.npmjs.org/:_authToken=${npmToken} > .npmrc"
 					sh "npm publish ${packageName}"
 				}
 				}
@@ -134,20 +136,18 @@ node('billing-qa-ubuntu-16.04.4') {
 
 			sh "git diff --name-status"
 	    	sh 'git commit -am "reference changed to published package" || exit 0'
-	    	withCredentials([usernamePassword(credentialsId: '9d6c4dfa-042c-4ed1-81c7-9175179dddda', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
-	    		sh "git push https://WordsCloud:$gitPass@github.com/aspose-words-cloud/aspose-words-cloud-node testPackage"
-	    	}			
+			sh "git push ${gitRepoUrl} testPackage"						
+		}
+
+		stage('add version tag') {
+			final fullVersion = packageName.substring(packageName.lastIndexOf('@') + 1, packageName.length())
+			final version = fullVersion.substring(0, fullVersion.lastIndexOf('.'))
+
+			sh "git tag -a ${version} -m \"version ${version}\"" 
+			sh "git push ${gitRepoUrl} ${version}"
 		}
 
     } finally {                       
         deleteDir()
     }
-}
-
-stage('test published package'){
-	build job: 'words-sdk-nodejs', 
-	   parameters: [
-		string(name: 'branch', value: 'testPackage'), 
-		string(name: 'testServerUrl', value: 'https://api.aspose.cloud')						
-	   ]
-}   
+} 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "asposewordscloud",
-  "version": "19.2.0",
+  "version": "19.9.0",
   "description": "Aspose.Words Cloud SDK for Node.js",
   "homepage": "https://products.aspose.cloud/words/cloud",
   "author": {

diff --git a/test/documentElements/commentsTests.ts b/test/documentElements/commentsTests.ts
@@ -90,7 +90,7 @@ describe("comments", () => {
         });
     });
 
-    describe("putComment function", () => {
+    describe("insertComment function", () => {
 
         it("should return response with code 200", () => {
 
@@ -108,7 +108,7 @@ describe("comments", () => {
                     request.folder = remotePath;
 
                     const nodeLink = new NodeLink();
-                    nodeLink.nodeId = "0.0.3";
+                    nodeLink.nodeId = "0.3.0.3";
                     const documentPosition = new DocumentPosition();
                     documentPosition.node = nodeLink;
                     documentPosition.offset = 0;
@@ -131,7 +131,7 @@ describe("comments", () => {
         });
     });
 
-    describe("postComment function", () => {
+    describe("updateComment function", () => {
 
         it("should return response with code 200", () => {
 
@@ -150,7 +150,7 @@ describe("comments", () => {
 
                     request.commentIndex = 0;
                     const nodeLink = new NodeLink();
-                    nodeLink.nodeId = "0.0.3";
+                    nodeLink.nodeId = "0.3.0";
                     const documentPosition = new DocumentPosition();
                     documentPosition.node = nodeLink;
                     documentPosition.offset = 0;

diff --git a/test/documentElements/rangeTests.ts b/test/documentElements/rangeTests.ts
@@ -46,8 +46,8 @@ describe("range", () => {
                     const request = new GetRangeTextRequest();
                     request.name = remoteFileName;
                     request.folder = remotePath;
-                    request.rangeStartIdentifier = "id0.0";
-                    request.rangeEndIdentifier = "id0.1";
+                    request.rangeStartIdentifier = "id0.0.0";
+                    request.rangeEndIdentifier = "id0.0.1";
 
                     // Act
                     return wordsApi.getRangeText(request)
@@ -75,8 +75,8 @@ describe("range", () => {
                     const request = new RemoveRangeRequest();
                     request.name = remoteFileName;
                     request.folder = remotePath;
-                    request.rangeStartIdentifier = "id0.0";
-                    request.rangeEndIdentifier = "id0.1";
+                    request.rangeStartIdentifier = "id0.0.0";
+                    request.rangeEndIdentifier = "id0.0.1";
 
                     // Act
                     return wordsApi.removeRange(request)
@@ -103,8 +103,8 @@ describe("range", () => {
                     const request = new ReplaceWithTextRequest();
                     request.name = remoteFileName;
                     request.folder = remotePath;
-                    request.rangeStartIdentifier = "id0.0";
-                    request.rangeEndIdentifier = "id0.1";
+                    request.rangeStartIdentifier = "id0.0.0";
+                    request.rangeEndIdentifier = "id0.0.1";
                     request.rangeText = new ReplaceRange({text: "Replaced header"});
 
                     // Act
@@ -132,8 +132,8 @@ describe("range", () => {
                     const request = new SaveAsRangeRequest();
                     request.name = remoteFileName;
                     request.folder = remotePath;
-                    request.rangeStartIdentifier = "id0.0";
-                    request.rangeEndIdentifier = "id0.1";
+                    request.rangeStartIdentifier = "id0.0.0";
+                    request.rangeEndIdentifier = "id0.0.1";
                     request.documentParameters = new RangeDocument({documentName: remotePath + "/newDoc.docx"});
 
                     // Act