[CI] Testing infra refactoring (#782)

Author: testableapple

.github/workflows/cron-checks.yml

@@ -97,7 +97,6 @@ jobs:
         STREAM_SDK_TEST_ACCOUNT_EMAIL: ${{ secrets.STREAM_SDK_TEST_ACCOUNT_EMAIL }}
         STREAM_SDK_TEST_ACCOUNT_PASSWORD: ${{ secrets.STREAM_SDK_TEST_ACCOUNT_PASSWORD }}
         STREAM_SDK_TEST_ACCOUNT_OTP_SECRET: ${{ secrets.STREAM_SDK_TEST_ACCOUNT_OTP_SECRET }}
-        STREAM_VIDEO_SECRET: ${{ secrets.STREAM_VIDEO_SECRET }}
     - name: Allure TestOps Upload
       if: success() || failure()
       run: bundle exec fastlane allure_upload launch_id:$LAUNCH_ID
@@ -149,7 +148,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       XCODE_VERSION: ${{ matrix.xcode }}
-      STREAM_VIDEO_SECRET: ${{ secrets.STREAM_VIDEO_SECRET }}
     steps:
     - uses: actions/[email protected]
     - uses: ./.github/actions/bootstrap

.github/workflows/smoke-checks.yml

@@ -34,8 +34,6 @@ jobs:
     name: Test LLC (Debug)
     runs-on: macos-15
     if: ${{ github.event.inputs.record_snapshots_swiftui != 'true' && github.event.inputs.record_snapshots_uikit != 'true' }}
-    env:
-      STREAM_VIDEO_SECRET: ${{ secrets.STREAM_VIDEO_SECRET }}
     steps:
     - uses: actions/[email protected]
       with:
@@ -280,7 +278,6 @@ jobs:
         STREAM_SDK_TEST_ACCOUNT_EMAIL: ${{ secrets.STREAM_SDK_TEST_ACCOUNT_EMAIL }}
         STREAM_SDK_TEST_ACCOUNT_PASSWORD: ${{ secrets.STREAM_SDK_TEST_ACCOUNT_PASSWORD }}
         STREAM_SDK_TEST_ACCOUNT_OTP_SECRET: ${{ secrets.STREAM_SDK_TEST_ACCOUNT_OTP_SECRET }}
-        STREAM_VIDEO_SECRET: ${{ secrets.STREAM_VIDEO_SECRET }}
     - name: Allure TestOps Upload
       if: env.LAUNCH_ID != '' && (success() || failure())
       run: bundle exec fastlane allure_upload launch_id:$LAUNCH_ID

StreamVideoTests/StreamVideo.xctestplan

@@ -20,10 +20,7 @@
     },
     "defaultTestExecutionTimeAllowance" : 100,
     "environmentVariableEntries" : [
-      {
-        "key" : "STREAM_VIDEO_SECRET",
-        "value" : "$(STREAM_VIDEO_SECRET)"
-      }
+
     ],
     "maximumTestExecutionTimeAllowance" : 100,
     "maximumTestRepetitions" : 3,

SwiftUIDemoAppUITests/SwiftUIDemoApp.xctestplan

@@ -10,10 +10,7 @@
   ],
   "defaultOptions" : {
     "environmentVariableEntries" : [
-      {
-        "key" : "STREAM_VIDEO_SECRET",
-        "value" : "$(STREAM_VIDEO_SECRET)"
-      }
+
     ],
     "preferredScreenCaptureFormat" : "screenshot",
     "targetForVariableExpansion" : {

SwiftUIDemoAppUITests/Tests/StreamTestCase.swift

@@ -8,7 +8,7 @@ let app = XCUIApplication()
 var userRobot = UserRobot()
 
 class StreamTestCase: XCTestCase {
-    
+
     let deviceRobot = DeviceRobot(app)
     var participantRobot = ParticipantRobot()
     var sinatra = Sinatra()
@@ -20,8 +20,7 @@ class StreamTestCase: XCTestCase {
     override func setUpWithError() throws {
         try super.setUpWithError()
         continueAfterFailure = false
-        
-        setLaunchArguments()
+
         alertHandler()
         ipadSetup()
         startVideo()
@@ -42,19 +41,14 @@ class StreamTestCase: XCTestCase {
 }
 
 extension StreamTestCase {
-    
+
     static var randomCallId: String {
         let uuid = UUID().uuidString.split(separator: "-")
         if let first = uuid.first { return String(first) } else { return "Test" }
     }
 }
 
 extension StreamTestCase {
-    
-    private func setLaunchArguments() {
-        let secret = ProcessInfo.processInfo.environment[EnvironmentVariable.streamVideoSecret.rawValue] ?? ""
-        app.setEnvironmentVariables([.streamVideoSecret: secret])
-    }
 
     private func attachElementTree() {
         let attachment = XCTAttachment(string: app.debugDescription)
@@ -73,7 +67,7 @@ extension StreamTestCase {
             return false
         }
     }
-    
+
     private func ipadSetup() {
         if UIDevice.current.userInterfaceIdiom == .pad {
             app.landscape()

TestTools/TestData/LaunchArgument.swift

@@ -7,7 +7,6 @@ import XCTest
 
 public enum EnvironmentVariable: String {
     case jwtExpiration = "JWT_EXPIRATION"
-    case streamVideoSecret = "STREAM_VIDEO_SECRET"
 }
 
 public enum LaunchArgument: String {
@@ -26,7 +25,7 @@ public extension XCUIApplication {
     func setLaunchArguments(_ args: LaunchArgument...) {
         launchArguments.append(contentsOf: args.map { $0.rawValue })
     }
-    
+
     func setEnvironmentVariables(_ envVars: [EnvironmentVariable: String]) {
         envVars.forEach { envVar in
             launchEnvironment[envVar.key.rawValue] = envVar.value

fastlane/Fastfile

@@ -13,7 +13,6 @@ podspec_names = ['StreamVideo', 'StreamVideo-XCFramework', 'StreamVideoSwiftUI',
 github_repo = ENV['GITHUB_REPOSITORY'] || 'GetStream/stream-video-swift'
 sinatra_port = 4567
 video_buddy_port = 5678
-app_secret = ENV.fetch('STREAM_VIDEO_SECRET', nil)
 derived_data_path = 'derived_data'
 source_packages_path = 'spm_cache'
 gci = ENV['GOOGLE_CLIENT_ID'] || ''
@@ -234,8 +233,7 @@ lane :test do |options|
     devices: options[:device],
     number_of_retries: 3,
     skip_build: options[:skip_build],
-    build_for_testing: options[:build_for_testing],
-    xcargs: is_ci ? "STREAM_VIDEO_SECRET=#{app_secret}" : ''
+    build_for_testing: options[:build_for_testing]
   }
 
   begin
@@ -423,33 +421,27 @@ lane :test_e2e do |options|
     build_for_testing: options[:build_for_testing],
     devices: options[:device],
     prelaunch_simulator: is_ci,
-    number_of_retries: 3,
-    xcargs: is_ci ? "STREAM_VIDEO_SECRET=#{app_secret}" : ''
+    number_of_retries: 3
   }
 
-  if is_localhost
-    scan(scan_options)
-  else
-    parallelize_tests_on_ci(scan: scan_options, batch: options[:batch], cron: options[:cron])
+  if ENV['MATRIX_SIZE'] && options[:batch]
+    products_dir = File.expand_path("../#{derived_data_path}/Build/Products")
+    xctestrun = Dir.glob(File.expand_path("#{products_dir}/*.xctestrun")).first
+    tests = retrieve_xctest_names(xctestrun: xctestrun).values.flatten
+    slice_size = (tests.size / ENV['MATRIX_SIZE'].to_f).ceil
+    only_testing = []
+    tests.each_slice(slice_size) { |test| only_testing << test }
+    only_testing_batch = only_testing[options[:batch].to_i]
+    scan_options[:only_testing] = only_testing_batch
+    UI.important("Tests in total: #{only_testing.flatten.size}. Running #{only_testing_batch.size} of them ⌛️")
   end
-end
-
-private_lane :parallelize_tests_on_ci do |options|
-  products_dir = File.expand_path("../#{derived_data_path}/Build/Products")
-  xctestrun = Dir.glob(File.expand_path("#{products_dir}/*.xctestrun")).first
-  tests = retrieve_xctest_names(xctestrun: xctestrun).values.flatten
-  slice_size = options[:cron] ? tests.size : (tests.size / ENV['MATRIX_SIZE'].to_f).ceil
-  only_testing = []
-  tests.each_slice(slice_size) { |test| only_testing << test }
-  only_testing_batch = only_testing[options[:batch].to_i]
 
   begin
-    UI.success("Tests in total: #{only_testing.flatten.size}. Running #{only_testing_batch.size} of them ⌛️")
-    scan(options[:scan].merge(only_testing: only_testing_batch))
+    scan(scan_options)
   rescue StandardError
     failed_tests = retreive_failed_tests
     UI.important("Re-running #{failed_tests.size} failed tests ⌛️")
-    scan(options[:scan].merge(only_testing: failed_tests))
+    scan(scan_options.merge(only_testing: failed_tests))
   end
 end