Refactor

Author: loremattei

lib/fastlane/plugin/ddg_apple_automation/actions/tds_perf_test.rb

@@ -8,9 +8,40 @@
 module Fastlane
   module Actions
     class TdsPerfTestAction < Action
+      # Define platform-specific constants
+      IOS_TEST_PARAMS = {
+        ut_file_name: "ios-tds.json",
+        ut_url: "https://staticcdn.duckduckgo.com/trackerblocking/v5/current/ios-tds.json",
+        ref_file_name: "trackerData.json",
+        ref_url: "https://github.com/duckduckgo/apple-browsers/tree/main/iOS/Core"
+      }.freeze
+
+      MAC_TEST_PARAMS = {
+        ut_file_name: "macos-tds.json",
+        ut_url: "https://staticcdn.duckduckgo.com/trackerblocking/v6/current/",
+        ref_file_name: "trackerData.json",
+        ref_url: "https://github.com/duckduckgo/apple-browsers/tree/main/macOS/DuckDuckGo/ContentBlocker"
+      }.freeze
+
       def self.run(params)
         UI.message("Starting TDS Performance Testing...")
 
+        # Determine platform and set default parameters if needed
+        platform = lane_context[SharedValues::PLATFORM_NAME]
+        default_params = platform == :ios ? IOS_TEST_PARAMS : MAC_TEST_PARAMS
+
+        # Use provided parameters or defaults
+        ut_file_name = params[:ut_file_name] || default_params[:ut_file_name]
+        ut_url = params[:ut_url] || default_params[:ut_url]
+        ref_file_name = params[:ref_file_name] || default_params[:ref_file_name]
+        ref_url = params[:ref_url] || default_params[:ref_url]
+
+        UI.message("Using TDS parameters for #{platform} platform:")
+        UI.message("  Under-test file: #{ut_file_name}")
+        UI.message("  Under-test URL: #{ut_url}")
+        UI.message("  Reference file: #{ref_file_name}")
+        UI.message("  Reference URL: #{ref_url}")
+
         # Create temporary directory
         tmp_dir = "#{ENV.fetch('TMPDIR', nil)}/tds-perf-testing"
 
@@ -27,10 +58,10 @@ def self.run(params)
               # Set environment variables and run test
               test_command = [
                 "env",
-                "TEST_RUNNER_TDS_UT_FILE_NAME=#{params[:ut_file_name]}",
-                "TEST_RUNNER_TDS_UT_URL=#{params[:ut_url]}",
-                "TEST_RUNNER_TDS_REF_FILE_NAME=#{params[:ref_file_name]}",
-                "TEST_RUNNER_TDS_REF_URL=#{params[:ref_url]}",
+                "TEST_RUNNER_TDS_UT_FILE_NAME=#{ut_file_name}",
+                "TEST_RUNNER_TDS_UT_URL=#{ut_url}",
+                "TEST_RUNNER_TDS_REF_FILE_NAME=#{ref_file_name}",
+                "TEST_RUNNER_TDS_REF_URL=#{ref_url}",
                 "xcodebuild test-without-building",
                 "-scheme TrackerRadarKit",
                 "-destination 'platform=macOS'",
@@ -58,7 +89,7 @@ def self.description
       end
 
       def self.authors
-        ["Your Name"]
+        ["Lorenzo Mattei"]
       end
 
       def self.available_options
@@ -68,28 +99,28 @@ def self.available_options
             env_name: "TEST_RUNNER_TDS_UT_FILE_NAME",
             description: "The file name for the under-test TDS",
             type: String,
-            optional: false
+            optional: true
           ),
           FastlaneCore::ConfigItem.new(
             key: :ut_url,
             env_name: "TEST_RUNNER_TDS_UT_URL",
             description: "The URL for the under-test TDS",
             type: String,
-            optional: false
+            optional: true
           ),
           FastlaneCore::ConfigItem.new(
             key: :ref_file_name,
             env_name: "TEST_RUNNER_TDS_REF_FILE_NAME",
             description: "The file name for the reference TDS",
             type: String,
-            optional: false
+            optional: true
           ),
           FastlaneCore::ConfigItem.new(
             key: :ref_url,
             env_name: "TEST_RUNNER_TDS_REF_URL",
             description: "The URL for the reference TDS",
             type: String,
-            optional: false
+            optional: true
           )
         ]
       end

lib/fastlane/plugin/ddg_apple_automation/helper/ddg_apple_automation_helper.rb

@@ -5,7 +5,6 @@
 require "semantic"
 require_relative "github_actions_helper"
 require_relative "git_helper"
-require_relative "perf_testing_helper"
 
 module Fastlane
   UI = FastlaneCore::UI unless Fastlane.const_defined?(:UI)
@@ -228,7 +227,11 @@ def self.create_release_branch(platform, version)
       end
 
       def self.update_embedded_files(platform, other_action)
-        Helper::PerfTestingHelper.test_tds_embedded_files(other_action)
+        tds_perf_test_result = other_action.tds_perf_test
+
+        unless tds_perf_test_result
+          UI.important("TDS performance tests failed. Proceeding with caution.")
+        end
         Actions.sh("./scripts/update_embedded.sh")
 
         # Verify no unexpected files were modified

lib/fastlane/plugin/ddg_apple_automation/helper/perf_testing_helper.rb

@@ -108,14 +108,6 @@
         :ref_url
       )
     end
-
-    it 'marks all parameters as required' do
-      options = Fastlane::Actions::TdsPerfTestAction.available_options
-
-      options.each do |option|
-        expect(option.optional).to be false
-      end
-    end
   end
 
   describe '#is_supported?' do