Merge branch 'master' into release

Author: yaroslaw.ekimov

Jenkinsfile

@@ -1,6 +1,7 @@
 parameters {
         string(name: 'branch', defaultValue: 'master', description: 'branch to test')		
 		string(name: 'testServerUrl', defaultValue: 'https://api-qa.aspose.cloud', description: 'server url')		
+		booleanParam(name: 'debugMode', defaultValue: 'false', description: 'start tests in debug mode')		
 }
 
 def runtests(dockerImageVersion)
@@ -11,14 +12,14 @@ def runtests(dockerImageVersion)
 				checkout([$class: 'GitSCM', branches: [[name: params.branch]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-ruby.git']]])
                 withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'AppKey', usernameVariable: 'AppSid')]) {
 					sh 'mkdir -p Settings'
-                    sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"$testServerUrl\\"}" > Settings/servercreds.json'
+                    sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"$testServerUrl\\", \\"Debug\\" : $debugMode}" > Settings/servercreds.json'
                 }
             }
 
             docker.image('ruby:' + dockerImageVersion).inside('-u root'){
                 stage('build'){
 						sh "mkdir testReports"
-						sh "gem install bundler && bundle install"
+						sh "gem install bundler -v 2.0.2 && bundle install"
                 }
 
                 stage('tests'){   
@@ -57,28 +58,6 @@ node('words-linux') {
 			runtests("2.5") 
 		} finally {
 			cleanWs()
-		}      
+		}
  	}
-
-	     
-    stage('wait for publishing'){
-        timeout(time:1, unit:'DAYS') {
-            input message:'Is packet already published'
-        }
-    }
-    stage('Merge master to release'){
-		if (params.branch.contains("master")) {
-				checkout([$class: 'GitSCM', branches: [[name: '*/release']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-ruby.git']]])
-				sh "git config user.email '[email protected]'"
-				sh "git config user.name 'jenkins'"
-				sh "git checkout --merge release"
-				sh "git reset --hard origin/release"
-				sh "git merge --no-ff --allow-unrelated-histories origin/master"
-				sh "git diff --name-status"			
-				sh 'git commit -am "Merged master branch to release" || exit 0'
-				withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
-					sh "git push https://$gitUsername:$gitPass@git.auckland.dynabic.com/words-cloud/words-cloud-ruby.git release"
-				}
-		}  
-	}
 }

JenkinsfileRelease

@@ -53,7 +53,7 @@ def testGemLocally()
 
 				stage('test gem locally'){
 					sh "mkdir testReports"
-					sh "gem install bundler && bundle install"
+					sh "gem install bundler -v 2.0.2 && bundle install"
 					try{
 						sh 'rake test'
 					} finally{
@@ -113,6 +113,21 @@ def publishGem()
 }
 
 node('words-linux') {
+	   stage('Merge master to release'){
+		if (params.branch.contains("master")) {
+				checkout([$class: 'GitSCM', branches: [[name: '*/release']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-ruby.git']]])
+				sh "git config user.email '[email protected]'"
+				sh "git config user.name 'jenkins'"
+				sh "git checkout --merge release"
+				sh "git reset --hard origin/release"
+				sh "git merge --no-ff --allow-unrelated-histories origin/master"
+				sh "git diff --name-status"			
+				sh 'git commit -am "Merged master branch to release" || exit 0'
+				withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
+					sh "git push https://$gitUsername:[email protected]/words-cloud/words-cloud-ruby.git release"
+				}
+		}  
+	}
 	try {
 		testGemLocally()
 	} finally {

tests/DocumentElements/tables_tests.rb

@@ -97,11 +97,11 @@ def test_delete_table_row
     def test_get_border
       filename = 'TablesGet.docx'
       remote_name = 'TestGetBorder.docx'
-      index = 0
+      borderType = "Left"
 
       upload_file File.join(local_test_folder, test_folder, filename), File.join(remote_test_folder, test_folder, remote_name)
 
-      request = GetBorderRequest.new remote_name, 'sections/0/tables/2/rows/0', index, remote_test_folder + test_folder
+      request = GetBorderRequest.new remote_name, 'sections/0/tables/2/rows/0', borderType, remote_test_folder + test_folder
       result = @words_api.get_border request
       assert_equal FALSE, result.nil?
     end
@@ -439,11 +439,11 @@ def test_delete_border
       filename = 'TablesGet.docx'
       remote_name = 'TestDeleteBorder.docx'
       dest_name = remote_test_out + remote_name
-      index = 0
+      borderType = "Left"
 
       upload_file File.join(local_test_folder, test_folder, filename), File.join(remote_test_folder, test_folder, remote_name)
 
-      request = DeleteBorderRequest.new remote_name, 'tables/1/rows/0/cells/0/', index, remote_test_folder + test_folder, :dest_file_name => dest_name
+      request = DeleteBorderRequest.new remote_name, 'tables/1/rows/0/cells/0/', borderType, remote_test_folder + test_folder, :dest_file_name => dest_name
       result = @words_api.delete_border request
       assert_equal FALSE, result.nil?
     end
@@ -468,14 +468,14 @@ def test_delete_borders
     def test_update_border
       filename = 'TablesGet.docx'
       remote_name = 'TestUpdateBorder.docx'
-      index = 0
+      borderType = "Left"
       border = Border.new({:BorderType => 'Left', :Color => XmlColor.new({:Alpha => 2}),
                           :DistanceFromText => 6, :LineStyle => 'DashDotStroker',
                           :LineWith => 2, :Shadow => true})
 
       upload_file File.join(local_test_folder, test_folder, filename), File.join(remote_test_folder, test_folder, remote_name)
 
-      request = UpdateBorderRequest.new remote_name, border, 'tables/1/rows/0/cells/0/', index, remote_test_folder + test_folder
+      request = UpdateBorderRequest.new remote_name, border, 'tables/1/rows/0/cells/0/', borderType, remote_test_folder + test_folder
       result = @words_api.update_border request
       assert_equal FALSE, result.nil?
     end

tests/base_test_context.rb

@@ -39,6 +39,7 @@ def setup
       AsposeWordsCloud.configure do |config|
         config.api_key['api_key'] = creds['AppKey']
         config.api_key['app_sid'] = creds['AppSid']
+		config.debugging = creds['Debug']
         config.host = creds['BaseUrl']
       end
       @words_api = WordsApi.new