lib/testrail.rb in gridium-0.2.3 vs lib/testrail.rb in gridium-0.2.4

@@ -18,10 +18,12 @@
       if Gridium.config.testrail
         @url = ENV['GRIDIUM_TR_URL'].empty? || ENV['GRIDIUM_TR_URL'].nil? ? ENV_ERROR : ENV['GRIDIUM_TR_URL'] + '/index.php?/api/v2/'
         @user = ENV['GRIDIUM_TR_USER'].empty? || ENV['GRIDIUM_TR_USER'].nil? ? ENV_ERROR : ENV['GRIDIUM_TR_USER']
         @password = ENV['GRIDIUM_TR_PW'].empty? || ENV['GRIDIUM_TR_PW'].nil? ? ENV_ERROR : ENV['GRIDIUM_TR_PW']
         @pid = ENV['GRIDIUM_TR_PID'].empty? || ENV['GRIDIUM_TR_PID'].nil? ? ENV_ERROR : ENV['GRIDIUM_TR_PID']
+				@testcase_ids = Array.new
+				@testcase_infos = Array.new
       end
 		end
 
     def add_run(name, desc)
       if Gridium.config.testrail
@@ -35,48 +37,52 @@
           @runid = r["id"]
         end
       end
     end
 
-    def close_run
-      if Gridium.config.testrail
-        Log.debug("[GRIDIUM::TestRail] Closing RunID: #{@runid}")
-        unless @runid.nil?
-          r = _send_request('POST', "close_run/#{@runid}", nil)
-        end
-      end
-    end
+		def add_case(rspec_test)
+			if Gridium.config.testrail
+				Log.debug("[GRIDIUM::TestRail] Adding to list of TestRail Cases...")
+				if rspec_test.nil? then
+					Log.error("[GRIDIUM::TestRail] No test added to results. Turn of Gridium.config.testrail\n")
+				end
+				if rspec_test.exception
+					status = FAILED
+					message = rspec_test.exception.message
+				else
+					status = PASSED
+					message = 'Test Passed.'
+				end
+				test_info = {:trid => rspec_test.metadata[:testrail_id], :status_id => status, :message => message}
+				@testcase_infos.push(test_info)
+				@testcase_ids.push(test_info[:trid])
+			end
+		end
 
-    def add_case(rspec_test)
-      if Gridium.config.testrail
-        Log.debug("[GRIDIUM::TestRail] Adding case: #{rspec_test} for RunID: #{@runid}")
-        if rspec_test.nil? then
-          raise(ArgumentError, "No test data was passed in.")
-        end
-        unless @runid.nil?
-          r = _send_request('POST', "update_run/#{@runid}", {:case_ids => [rspec_test.metadata[:testrail_id]]})
-          if rspec_test.exception
-            status = FAILED
-            message = rspec_test.exception.message
-          else
-            status = PASSED
-            message = ''
-          end
-          r = _send_request(
-            'POST',
-            "add_result_for_case/#{@runid}/#{rspec_test.metadata[:testrail_id]}",
-            status_id: status,
-            comment: message
-          )
-        end
-      end
-    end
+		def close_run
+			if Gridium.config.testrail
+				Log.debug("[GRIDIUM::TestRail] Closing test runid: #{@runid}\n")
+				unless @runid.nil?
+					r = _send_request('POST', "update_run/#{@runid}", {:case_ids => @testcase_ids})
+					@testcase_infos.each do |tc|
+						r = _send_request(
+							'POST',
+							"add_result_for_case/#{@runid}/#{tc[:trid]}",
+							status_id: tc[:status_id],
+							comment: tc[:message]
+							)
+							sleep(0.25)
+					end
+					r = _send_request('POST', "close_run/#{@runid}", nil)
+				end
+			end
+		end
 
-
     private
 		def _send_request(method, uri, data)
 			url = URI.parse(@url + uri)
+			Log.debug("[GRIDIUM::TestRail] Method: #{method} URL:#{uri} Data:#{data}")
 			if method == 'POST'
 				request = Net::HTTP::Post.new(url.path + '?' + url.query)
 				request.body = JSON.dump(data)
 			else
 				request = Net::HTTP::Get.new(url.path + '?' + url.query)
@@ -88,22 +94,23 @@
 			if url.scheme == 'https'
 				conn.use_ssl = true
 				conn.verify_mode = OpenSSL::SSL::VERIFY_NONE
 			end
 			response = conn.request(request)
-
 			if response.body && !response.body.empty?
 				result = JSON.parse(response.body)
 			else
 				result = {}
 			end
 
 			if response.code != '200'
+
 				if result && result.key?('error')
 					error = '"' + result['error'] + '"'
 				else
 					error = 'No additional error message received'
 				end
+				Log.debug("[GRIDIUM::TestRail] Error with request: #{error}")
 				raise APIError.new('TestRail API returned HTTP %s (%s)' %
 					[response.code, error])
 			end
 
 			result