Cleanup

Author: jkmassel

lib/fastlane/plugin/wpmreleasetoolkit/actions/android/android_firebase_test.rb

@@ -3,10 +3,8 @@
 module Fastlane
   module Actions
     module SharedValues
-      FIREBASE_TEST_RESULT = :FIREBASE_TEST_ACTION_RESULT
-      FIREBASE_TEST_LOG_FILE = :FIREBASE_TEST_LOG_FILE
+      FIREBASE_TEST_RESULT = :FIREBASE_TEST_LOG_FILE
       FIREBASE_TEST_LOG_FILE_PATH = :FIREBASE_TEST_LOG_FILE_PATH
-      FIREBASE_TEST_RESULTS_FILE_PATH = :FIREBASE_TEST_LOG_FILE_PATH
     end
 
     class AndroidFirebaseTestAction < Action
@@ -18,7 +16,7 @@ def self.run(params)
         test_runner = Fastlane::FirebaseTestRunner.new(key_file: params[:key_file])
 
         # Set up the log file and output directory
-        Fastlane::Actions.lane_context[:FIREBASE_TEST_RESULTS_FILE_PATH] = params[:results_output_dir]
+        FileUtils.mkdir_p(params[:results_output_dir])
         Fastlane::Actions.lane_context[:FIREBASE_TEST_LOG_FILE_PATH] = File.join(params[:results_output_dir], 'output.log')
 
         device = Fastlane::FirebaseDevice.new(
@@ -36,15 +34,19 @@ def self.run(params)
         )
 
         # Download all of the outputs from the job to the local machine
-        test_runner.download_raw_results(params[:results_output_dir])
+        test_runner.download_result_files(
+          result: result,
+          destination: params[:results_output_dir],
+          project_id: params[:project_id],
+          key_file_path: params[:key_file]
+        )
 
-        if result == true
+        if result.success?
           UI.success 'Firebase Tests Complete'
           return
         end
 
-        log_file = Fastlane::Actions.lane_context[:FIREBASE_TEST_LOG_FILE]
-        FastlaneCore::UI.test_failure! "Firebase Tests failed – more information can be found at #{log_file.more_details_url}"
+        FastlaneCore::UI.test_failure! "Firebase Tests failed – more information can be found at #{result.more_details_url}"
       end
 
       #####################################################

…kit/models/firebase_test_lab_log_file.rb …olkit/models/firebase_test_lab_result.rblib/fastlane/plugin/wpmreleasetoolkit/models/firebase_test_lab_log_file.rb renamed to lib/fastlane/plugin/wpmreleasetoolkit/models/firebase_test_lab_result.rb lib/fastlane/plugin/wpmreleasetoolkit/models/firebase_test_lab_log_file.rb renamed to lib/fastlane/plugin/wpmreleasetoolkit/models/firebase_test_lab_result.rb

@@ -1,14 +1,14 @@
 module Fastlane
-  class FirebaseTestLabLogFile
-    def initialize(path:)
-      raise "No log file found at path #{path}" unless File.file? path
+  class FirebaseTestLabResult
+    def initialize(log_file_path:)
+      raise "No log file found at path #{log_file_path}" unless File.file? log_file_path
 
-      @path = path
+      @path = log_file_path
     end
 
     # Scan the log file to for indications that the Test Run failed
-    def indicates_failure
-      File.readlines(@path).any? { |line| !line.include? 'Failed' }
+    def success?
+      File.readlines(@path).none? { |line| !line.include? 'Failed' }
     end
 
     # Parse the log for the "More details are available..." URL

lib/fastlane/plugin/wpmreleasetoolkit/models/firebase_test_runner.rb

@@ -1,5 +1,6 @@
 require 'json'
 require 'uri'
+require 'fileutils'
 
 module Fastlane
   class FirebaseTestRunner
@@ -34,29 +35,29 @@ def run_tests(apk_path:, test_apk_path:, device:, type: 'instrumentation')
       ].join(' ')
 
       log_file_path = Fastlane::Actions.lane_context[:FIREBASE_TEST_LOG_FILE_PATH]
+
       UI.message "Streaming log output to #{log_file_path}"
       Action.sh("#{command} 2>&1 | tee #{log_file_path}")
 
       # Make the file object available to other tasks
-      file = FirebaseTestLabLogFile.new(path: log_file_path)
-      Fastlane::Actions.lane_context[:FIREBASE_TEST_LOG_FILE] = file
+      result = FirebaseTestLabResult.new(log_file_path: log_file_path)
+      Fastlane::Actions.lane_context[:FIREBASE_TEST_LOG_FILE] = result
 
-      # Return `true` if it looks like the test passed
-      !file.indicates_failure
+      result
     end
 
-    def download_raw_results(log_file:, destination:)
-      raise unless log_file.is_a? Fastlane::FirebaseTestLabLogFile
+    def download_result_files(result:, destination:, project_id:, key_file_path:)
+      raise unless result.is_a? Fastlane::FirebaseTestLabResult
 
-      paths = log_file.raw_results_paths
+      paths = result.raw_results_paths
       raise "Log File doesn't contain a raw results URL" if paths.nil?
 
       FileUtils.mkdir_p(destination) unless File.directory? destination
 
       require 'google/cloud/storage'
       storage = Google::Cloud::Storage.new(
-        project_id: Fastlane::Actions.lane_context[:FIREBASE_PROJECT_ID],
-        credentials: Fastlane::Actions.lane_context[:FIREBASE_CREDENTIALS]
+        project_id: project_id,
+        credentials: key_file_path
       )
 
       # Set up the download

spec/firebase_test_lab_log_file_spec.rb spec/firebase_test_lab_result.rbspec/firebase_test_lab_log_file_spec.rb renamed to spec/firebase_test_lab_result.rb

@@ -4,13 +4,19 @@
 FAILED_FIREBASE_TEST_LOG_PATH = File.join(__dir__, 'test-data', 'firebase', 'failed-firebase-test-lab-run.log')
 INVALID_TEST_LOG_PATH = 'foo'.freeze
 
-describe Fastlane::FirebaseTestLabLogFile do
-  let(:empty_test_log) { described_class.new(path: EMPTY_FIREBASE_TEST_LOG_PATH) }
-  let(:failed_test_log) { described_class.new(path: FAILED_FIREBASE_TEST_LOG_PATH) }
+describe Fastlane::FirebaseTestLabResult do
+  let(:empty_test_log) { described_class.new(log_file_path: EMPTY_FIREBASE_TEST_LOG_PATH) }
+  let(:failed_test_log) { described_class.new(log_file_path: FAILED_FIREBASE_TEST_LOG_PATH) }
 
   describe 'initialize' do
     it 'raises for an invalid file path' do
-      expect { described_class.new(path: INVALID_TEST_LOG_PATH) }.to raise_exception 'No log file found at path foo'
+      expect { described_class.new(log_file_path: INVALID_TEST_LOG_PATH) }.to raise_exception 'No log file found at path foo'
+    end
+  end
+
+  describe 'success?' do
+    it 'returns false for failure' do
+      expect(failed_test_log.success?).to be false
     end
   end