fastlane-plugin-xcresult_to_junit 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5757e2a9823c97cfa45d23ac665ed098c7cae0736484b9f6c3467b9c6d94aa2
-  data.tar.gz: 591790faba5cd45cbf2d4611ed8a7b7fe9218a98bbf277e21a7cad294b542871
+  metadata.gz: 1532fc3a5078d597ebdbb5e41a5bd038f38d9e3481ffe0b22b4dca0766f0a079
+  data.tar.gz: 81d441aec6f1bf6c8b0034a54f569fdf6164bc74c0533db42bbc51daf0503d84
 SHA512:
-  metadata.gz: 50ff098a3dfa44f066d477985fedf2e138b1007648b618911c2b4c1681d7134d13d0f10524882ab17687662c370c01c282ffd356070232ea8c539c8161234859
-  data.tar.gz: c8a5783667857c1cc03e25e48df679b9e1721ff00f90d710250daea7debdb82e68b613397f0dd48e273e237a2bc1d168c62f35345f4084a0b653bd23da110bbf
+  metadata.gz: e69e4ee036d1ad1158438cd65f01fc0fe04b5284a1dc57510a85b73744add7014dbaf141f44f6291510bfbdc166133bd7896a82a226cfc23dd6cbbaa74211627
+  data.tar.gz: 77e4e345da4c1b667805f9e1c66fb0db02fc96c412b04c417651a60aab0ae68df28201ec2964dd7fd691fb56d35e804f6dc472e995afb58b079475bdda1469cc

data/README.md

@@ -38,7 +38,7 @@ Ensure you specify the following when you call scan
 
 After scan you can call the plugin, which will look something like this
 ```ruby
-    xcresult_to_junit(xcresult_path: './test_output/MyScheme.test_result.xcresult', output_path: './test_output/')
+    xcresult_to_junit(xcresult_path: './fastlane/test_output/MyScheme.test_result.xcresult', output_path: './fastlane/test_output/')
 ```
 
 We can get a list of the junit reports generated by doing something like so

data/lib/fastlane/plugin/xcresult_to_junit/actions/xcresult_to_junit_action.rb

@@ -9,6 +9,7 @@ module Fastlane
         all_results = Helper::XcresultToJunitHelper.load_results(params[:xcresult_path])['actions']['_values']
         all_results.each do |test_run|
           if test_run['actionResult']['testsRef'] # Skip if section has no testRef data as this means its not a test run
+            junit_folder = Helper::XcresultToJunitHelper.save_device_details_to_file(params[:output_path], test_run['runDestination'])
             test_run_id = test_run['actionResult']['testsRef']['id']['_value']
             all_tests = Helper::XcresultToJunitHelper.load_object(params[:xcresult_path], test_run_id)['summaries']['_values'][0]['testableSummaries']['_values']
             test_suites = []
@@ -21,12 +22,26 @@ module Fastlane
               end
               test_classes = target['tests']['_values'][0]['subtests']['_values'][0]['subtests']['_values']
               test_classes.each do |test_class|
-                suite = { name: "#{target_name}.#{test_class['name']['_value']}", cases: [] }
+                suite_name = "#{target_name}.#{test_class['name']['_value']}"
+                suite = { name: suite_name, cases: [] }
                 if test_class['subtests']
                   test_class['subtests']['_values'].each do |test|
                     duration = 0
                     duration = test['duration']['_value'] if test['duration']
-                    testcase = { name: test['name']['_value'], time: duration }
+                    testcase_name = test['name']['_value'].tr('()', '')
+                    testcase = { name: testcase_name, time: duration }
+
+                    summaryRef = test['summaryRef']['id']['_value']
+                    ref = Helper::XcresultToJunitHelper.load_object(params[:xcresult_path], summaryRef)['activitySummaries']['_values']
+                    ref.each do |summary|
+                      if summary['attachments']
+                        summary['attachments']['_values'].each do |attachment|
+                          id = attachment['payloadRef']['id']['_value']
+                          Helper::XcresultToJunitHelper.fetch_screenshot(params[:xcresult_path], "#{junit_folder}/attachments/#{suite_name}.#{testcase_name}", "#{id}.png", id)
+                        end
+                      end
+                    end
+
                     if test['testStatus']['_value'] == 'Failure'
                       failure = Helper::XcresultToJunitHelper.load_object(params[:xcresult_path], test['summaryRef']['id']['_value'])['failureSummaries']['_values'][0]
                       filename = failure['fileName']['_value']
@@ -47,7 +62,6 @@ module Fastlane
                 test_suites << suite
               end
             end
-            junit_folder = Helper::XcresultToJunitHelper.save_device_details_to_file(params[:output_path], test_run['runDestination'])
             Helper::XcresultToJunitHelper.generate_junit(junit_folder, test_suites)
           end
         end

data/lib/fastlane/plugin/xcresult_to_junit/helper/xcresult_to_junit_helper.rb

@@ -15,6 +15,13 @@ module Fastlane
         JSON.load FastlaneCore::CommandExecutor.execute(command: "xcrun xcresulttool get --format json --path #{xcresult_path}")
       end
 
+      def self.fetch_screenshot(xcresult_path, output_path, file_name, id)
+        if !File.directory?(output_path)
+          FileUtils.mkdir output_path
+        end
+        JSON.load FastlaneCore::CommandExecutor.execute(command: "xcrun xcresulttool export --path #{xcresult_path} --output-path #{output_path}/#{file_name} --id #{id} --type file")
+      end
+
       def self.save_device_details_to_file(output_path, device_destination)
         device_udid = device_destination['targetDeviceRecord']['identifier']['_value']
         device_details = {
@@ -26,6 +33,7 @@ module Fastlane
         junit_folder = "#{output_path}/ios-#{device_udid}.junit"
         FileUtils.rm_rf junit_folder
         FileUtils.mkdir junit_folder
+        FileUtils.mkdir "#{junit_folder}/attachments"
         File.open("#{junit_folder}/device.json", 'w') do |f|
           f << device_details
         end
@@ -55,7 +63,7 @@ module Fastlane
       end
 
       def self.junit_testcase_start(suite, testcase)
-        print "<testcase classname=#{suite[:name].encode xml: :attr} name=#{testcase[:name].encode xml: :attr} time='#{testcase[:time]}'"
+        print "<testcase name=#{testcase[:name].encode xml: :attr} classname=#{suite[:name].encode xml: :attr} time='#{testcase[:time]}'"
       end
 
       def self.junit_testcase_success

data/lib/fastlane/plugin/xcresult_to_junit/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module XcresultToJunit
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-xcresult_to_junit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Shane Birdsall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2019-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry