applying review comment

Author: Yousif-Ahmed

lib/fastlane/plugin/instabug_stores_upload/actions/instabug_build_android_app_action.rb

@@ -35,7 +35,7 @@ def self.run(params)
           build_time = (Time.now - build_start_time).round
 
           # Extract Android build path (APK or AAB)
-          build_path = Helper::InstabugStoresUploadHelper.fetch_android_build_path(Actions.lane_context)
+          build_path = fetch_android_build_path(Actions.lane_context)
 
           if build_path.nil? || build_path.empty?
             UI.user_error!("Could not find any generated APK or AAB. Please check your gradle settings.")
@@ -147,6 +147,24 @@ def self.example_code
       def self.category
         :building
       end
+
+      # This helper method provides a clean and prioritized way to get the Android build output.
+      # It checks for the most common output types in a specific order.
+      # This is used to get the build path for the Android build artifact.
+      def self.fetch_android_build_path(lane_context)
+        build_keys = [
+          SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS,
+          SharedValues::GRADLE_APK_OUTPUT_PATH,
+          SharedValues::GRADLE_ALL_AAB_OUTPUT_PATHS,
+          SharedValues::GRADLE_AAB_OUTPUT_PATH
+        ]
+        build_keys.each do |build_key|
+          build_path = lane_context[build_key]
+          return build_path if build_path && !build_path.empty?
+        end
+
+        nil
+      end
     end
   end
 end

lib/fastlane/plugin/instabug_stores_upload/helper/instabug_stores_upload_helper.rb

@@ -30,25 +30,6 @@ def self.report_status(branch_name:, api_key:, status:, step:, extras: {}, error
         )
       end
 
-      # This helper method provides a clean and prioritized way to get the Android build output.
-      # It checks for the most common output types in a specific order.
-      # This is used to get the build path for the Android build artifact.
-      def self.fetch_android_build_path(lane_context)
-        all_aab_paths = lane_context[Actions::SharedValues::GRADLE_ALL_AAB_OUTPUT_PATHS]
-        return all_aab_paths if all_aab_paths && !all_aab_paths.empty?
-
-        aab_path = lane_context[Actions::SharedValues::GRADLE_AAB_OUTPUT_PATH]
-        return aab_path if aab_path && !aab_path.empty?
-
-        all_apk_paths = lane_context[Actions::SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS]
-        return all_apk_paths if all_apk_paths && !all_apk_paths.empty?
-
-        apk_path = lane_context[Actions::SharedValues::GRADLE_APK_OUTPUT_PATH]
-        return apk_path if apk_path && !apk_path.empty?
-
-        return nil
-      end
-
       def self.make_api_request(branch_name:, status:, api_key:, step:, extras: {}, error_message: nil)
         return unless api_key
 

spec/instabug_build_android_app_action_spec.rb

@@ -139,6 +139,58 @@
     end
   end
 
+  describe '.fetch_android_build_path' do
+    let(:lane_context) { {} }
+
+    context 'when all AAB output paths are available' do
+      it 'returns all AAB paths' do
+        lane_context[Fastlane::Actions::SharedValues::GRADLE_ALL_AAB_OUTPUT_PATHS] = ['/path/to/app1.aab', '/path/to/app2.aab']
+
+        result = described_class.fetch_android_build_path(lane_context)
+
+        expect(result).to eq(['/path/to/app1.aab', '/path/to/app2.aab'])
+      end
+    end
+
+    context 'when single AAB output path is available' do
+      it 'returns single AAB path' do
+        lane_context[Fastlane::Actions::SharedValues::GRADLE_AAB_OUTPUT_PATH] = '/path/to/app.aab'
+
+        result = described_class.fetch_android_build_path(lane_context)
+
+        expect(result).to eq('/path/to/app.aab')
+      end
+    end
+
+    context 'when all APK output paths are available' do
+      it 'returns all APK paths' do
+        lane_context[Fastlane::Actions::SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS] = ['/path/to/app1.apk', '/path/to/app2.apk']
+
+        result = described_class.fetch_android_build_path(lane_context)
+
+        expect(result).to eq(['/path/to/app1.apk', '/path/to/app2.apk'])
+      end
+    end
+
+    context 'when single APK output path is available' do
+      it 'returns single APK path' do
+        lane_context[Fastlane::Actions::SharedValues::GRADLE_APK_OUTPUT_PATH] = '/path/to/app.apk'
+
+        result = described_class.fetch_android_build_path(lane_context)
+
+        expect(result).to eq('/path/to/app.apk')
+      end
+    end
+
+    context 'when no build paths are available' do
+      it 'returns nil' do
+        result = described_class.fetch_android_build_path(lane_context)
+
+        expect(result).to be_nil
+      end
+    end
+  end
+
   describe 'metadata' do
     it 'has correct description' do
       expect(described_class.description).to eq('Build Android app with Instabug metadata reporting')

spec/instabug_stores_upload_helper_spec.rb

@@ -2,100 +2,6 @@
 require 'webmock/rspec'
 
 describe Fastlane::Helper::InstabugStoresUploadHelper do
-  describe '.fetch_android_build_path' do
-    let(:lane_context) { {} }
-
-    context 'when all AAB output paths are available' do
-      it 'returns all AAB paths with highest priority' do
-        lane_context[Fastlane::Actions::SharedValues::GRADLE_ALL_AAB_OUTPUT_PATHS] = ['/path/to/app1.aab', '/path/to/app2.aab']
-        lane_context[Fastlane::Actions::SharedValues::GRADLE_AAB_OUTPUT_PATH] = '/path/to/single.aab'
-        lane_context[Fastlane::Actions::SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS] = ['/path/to/app.apk']
-        lane_context[Fastlane::Actions::SharedValues::GRADLE_APK_OUTPUT_PATH] = '/path/to/single.apk'
-
-        result = described_class.fetch_android_build_path(lane_context)
-
-        expect(result).to eq(['/path/to/app1.aab', '/path/to/app2.aab'])
-      end
-    end
-
-    context 'when single AAB output path is available' do
-      it 'returns single AAB path when all AAB paths are not available' do
-        lane_context[Fastlane::Actions::SharedValues::GRADLE_AAB_OUTPUT_PATH] = '/path/to/app.aab'
-        lane_context[Fastlane::Actions::SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS] = ['/path/to/app.apk']
-        lane_context[Fastlane::Actions::SharedValues::GRADLE_APK_OUTPUT_PATH] = '/path/to/single.apk'
-
-        result = described_class.fetch_android_build_path(lane_context)
-
-        expect(result).to eq('/path/to/app.aab')
-      end
-    end
-
-    context 'when all APK output paths are available' do
-      it 'returns all APK paths when AAB paths are not available' do
-        lane_context[Fastlane::Actions::SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS] = ['/path/to/app1.apk', '/path/to/app2.apk']
-        lane_context[Fastlane::Actions::SharedValues::GRADLE_APK_OUTPUT_PATH] = '/path/to/single.apk'
-
-        result = described_class.fetch_android_build_path(lane_context)
-
-        expect(result).to eq(['/path/to/app1.apk', '/path/to/app2.apk'])
-      end
-    end
-
-    context 'when single APK output path is available' do
-      it 'returns single APK path when other paths are not available' do
-        lane_context[Fastlane::Actions::SharedValues::GRADLE_APK_OUTPUT_PATH] = '/path/to/app.apk'
-
-        result = described_class.fetch_android_build_path(lane_context)
-
-        expect(result).to eq('/path/to/app.apk')
-      end
-    end
-
-    context 'when no build paths are available' do
-      it 'returns nil' do
-        result = described_class.fetch_android_build_path(lane_context)
-
-        expect(result).to be_nil
-      end
-    end
-
-    context 'when paths are empty strings' do
-      it 'returns nil for empty AAB path' do
-        lane_context[Fastlane::Actions::SharedValues::GRADLE_AAB_OUTPUT_PATH] = ''
-
-        result = described_class.fetch_android_build_path(lane_context)
-
-        expect(result).to be_nil
-      end
-
-      it 'returns nil for empty APK path' do
-        lane_context[Fastlane::Actions::SharedValues::GRADLE_APK_OUTPUT_PATH] = ''
-
-        result = described_class.fetch_android_build_path(lane_context)
-
-        expect(result).to be_nil
-      end
-    end
-
-    context 'when paths are empty arrays' do
-      it 'returns nil for empty all AAB paths' do
-        lane_context[Fastlane::Actions::SharedValues::GRADLE_ALL_AAB_OUTPUT_PATHS] = []
-
-        result = described_class.fetch_android_build_path(lane_context)
-
-        expect(result).to be_nil
-      end
-
-      it 'returns nil for empty all APK paths' do
-        lane_context[Fastlane::Actions::SharedValues::GRADLE_ALL_APK_OUTPUT_PATHS] = []
-
-        result = described_class.fetch_android_build_path(lane_context)
-
-        expect(result).to be_nil
-      end
-    end
-  end
-
   describe '.report_status' do
     let(:api_endpoint) { 'https://api.instabug.com/api/web/public/agent_fastlane/status' }