Merge branch 'next' into tests/dev-team

.buildkite/pipeline.full.yml

@@ -266,7 +266,7 @@ steps:
           - "--app=@build/ipa_url.txt"
           - "--farm=bs"
           - "--device=IOS_11_0_IPHONE_8_PLUS"
-          - "--appium-version=1.8.0"
+          - "--appium-version=1.16.0"
           - "--fail-fast"
           - "--exclude=features/[e-z].*.feature$"
           - "--order=random"
@@ -297,7 +297,7 @@ steps:
           - "--app=@build/ipa_url.txt"
           - "--farm=bs"
           - "--device=IOS_11_0_IPHONE_8_PLUS"
-          - "--appium-version=1.8.0"
+          - "--appium-version=1.16.0"
           - "--fail-fast"
           - "--exclude=features/[a-d].*.feature$"
           - "--order=random"
@@ -339,7 +339,6 @@ steps:
           - "macOSTestApp.log"
           - "maze_output/failed/**/*"
     commands:
-      - bundle config set --local path 'vendor/bundle'
       - bundle install
       - bundle exec maze-runner
         --os=macos

.buildkite/pipeline.yml

@@ -251,7 +251,6 @@ steps:
           - "macOSTestApp.log"
           - "maze_output/failed/**/*"
     commands:
-      - bundle config set --local path 'vendor/bundle'
       - bundle install
       - bundle exec maze-runner
         features/barebone_tests.feature
@@ -471,61 +470,60 @@ steps:
   #
   # BrowserStack
   #
-  # TODO: Disabled until PLAT-10337 fixes
-  # - label: ':browserstack: iOS 11 barebone tests'
-  #   depends_on:
-  #     - cocoa_fixture
-  #   timeout_in_minutes: 60
-  #   agents:
-  #     queue: opensource
-  #   plugins:
-  #     artifacts#v1.5.0:
-  #       download: "features/fixtures/ios/output/ipa_url.txt"
-  #       upload: "maze_output/failed/**/*"
-  #     docker-compose#v3.7.0:
-  #       pull: cocoa-maze-runner-legacy
-  #       run: cocoa-maze-runner-legacy
-  #       command:
-  #         - "--app=@build/ipa_url.txt"
-  #         - "--farm=bs"
-  #         - "--device=IOS_11_0_IPHONE_8_PLUS"
-  #         - "--appium-version=1.8.0"
-  #         - "features/barebone_tests.feature"
-  #   concurrency: 5
-  #   concurrency_group: browserstack-app
-  #   concurrency_method: eager
-  #   retry:
-  #     automatic:
-  #       - exit_status: -1  # Agent was lost
-  #         limit: 2
-
-  # - label: ':browserstack: iOS 10 barebone tests'
-  #   depends_on:
-  #     - cocoa_fixture
-  #   timeout_in_minutes: 60
-  #   agents:
-  #     queue: opensource
-  #   plugins:
-  #     artifacts#v1.5.0:
-  #       download: "features/fixtures/ios/output/ipa_url.txt"
-  #       upload: "maze_output/failed/**/*"
-  #     docker-compose#v3.7.0:
-  #       pull: cocoa-maze-runner-legacy
-  #       run: cocoa-maze-runner-legacy
-  #       command:
-  #         - "--app=@build/ipa_url.txt"
-  #         - "--farm=bs"
-  #         - "--device=IOS_10"
-  #         - "--appium-version=1.8.0"
-  #         - "--fail-fast"
-  #         - "features/barebone_tests.feature"
-  #   concurrency: 5
-  #   concurrency_group: browserstack-app
-  #   concurrency_method: eager
-  #   retry:
-  #     automatic:
-  #       - exit_status: -1  # Agent was lost
-  #         limit: 2
+  - label: ':browserstack: iOS 11 barebone tests'
+    depends_on:
+      - cocoa_fixture
+    timeout_in_minutes: 60
+    agents:
+      queue: opensource
+    plugins:
+      artifacts#v1.5.0:
+        download: "features/fixtures/ios/output/ipa_url.txt"
+        upload: "maze_output/failed/**/*"
+      docker-compose#v3.7.0:
+        pull: cocoa-maze-runner
+        run: cocoa-maze-runner
+        command:
+          - "--app=@build/ipa_url.txt"
+          - "--farm=bs"
+          - "--device=IOS_11_0_IPHONE_8_PLUS"
+          - "--appium-version=1.16.0"
+          - "features/barebone_tests.feature"
+    concurrency: 5
+    concurrency_group: browserstack-app
+    concurrency_method: eager
+    retry:
+      automatic:
+        - exit_status: -1  # Agent was lost
+          limit: 2
+
+  - label: ':browserstack: iOS 10 barebone tests'
+    depends_on:
+      - cocoa_fixture
+    timeout_in_minutes: 60
+    agents:
+      queue: opensource
+    plugins:
+      artifacts#v1.5.0:
+        download: "features/fixtures/ios/output/ipa_url.txt"
+        upload: "maze_output/failed/**/*"
+      docker-compose#v3.7.0:
+        pull: cocoa-maze-runner
+        run: cocoa-maze-runner
+        command:
+          - "--app=@build/ipa_url.txt"
+          - "--farm=bs"
+          - "--device=IOS_10"
+          - "--appium-version=1.15.0"
+          - "--fail-fast"
+          - "features/barebone_tests.feature"
+    concurrency: 5
+    concurrency_group: browserstack-app
+    concurrency_method: eager
+    retry:
+      automatic:
+        - exit_status: -1  # Agent was lost
+          limit: 2
 
   ##############################################################################
   #

Gemfile

@@ -4,7 +4,7 @@ gem 'cocoapods'
 
 # A reference to Maze Runner is only needed for running tests locally and if committed it must be
 # portable for CI, e.g. a specific release.  However, leaving it commented out would mean quicker CI.
-gem 'bugsnag-maze-runner', '~> 7.0'
+gem 'bugsnag-maze-runner', '~> 8.0'
 
 # Use a specific branch
 #gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', branch: 'master'

Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     CFPropertyList (3.0.6)
       rexml
-    activesupport (7.0.4.3)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -23,7 +23,7 @@ GEM
     atomos (0.1.3)
     bugsnag (6.25.2)
       concurrent-ruby (~> 1.0)
-    bugsnag-maze-runner (7.26.1)
+    bugsnag-maze-runner (8.1.4)
       appium_lib (~> 12.0.0)
       appium_lib_core (~> 5.4.0)
       bugsnag (~> 6.24)
@@ -131,33 +131,34 @@ GEM
     gh_inspector (1.1.3)
     hana (1.3.7)
     httpclient (2.8.3)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     json (2.6.3)
-    json_schemer (0.2.24)
+    json_schemer (0.2.25)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
+      simpleidn (~> 0.2)
       uri_template (~> 0.7)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
-    minitest (5.18.0)
+    minitest (5.18.1)
     molinillo (0.8.0)
     multi_test (0.1.2)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
-    nokogiri (1.14.3-x86_64-darwin)
+    nokogiri (1.15.3-x86_64-darwin)
       racc (~> 1.4)
     optimist (3.0.1)
     os (1.0.1)
     power_assert (2.0.3)
     public_suffix (4.0.7)
-    racc (1.6.2)
-    rack (2.2.6.4)
+    racc (1.7.1)
+    rack (2.2.7)
     rake (12.3.3)
-    regexp_parser (2.8.0)
+    regexp_parser (2.8.1)
     rexml (3.2.5)
     ruby-macho (2.5.1)
     rubyzip (2.3.2)
@@ -166,15 +167,20 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
+    simpleidn (0.2.1)
+      unf (~> 0.1.4)
     sys-uname (1.2.3)
       ffi (~> 1.1)
-    test-unit (3.5.7)
+    test-unit (3.5.9)
       power_assert
     tomlrb (2.0.3)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
     uri_template (0.7.0)
     webrick (1.7.0)
     websocket (1.2.9)
@@ -190,10 +196,11 @@ GEM
       rexml (~> 3.2.4)
 
 PLATFORMS
+  x86_64-darwin-19
   x86_64-darwin-20
 
 DEPENDENCIES
-  bugsnag-maze-runner (~> 7.0)
+  bugsnag-maze-runner (~> 8.0)
   cocoapods
 
 BUNDLED WITH

docker-compose.yml

@@ -20,7 +20,7 @@ x-common-environment: &common-environment
 
 services:
   cocoa-maze-runner:
-    image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v7-cli
+    image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v8-cli
     environment:
       <<: *common-environment
       BROWSER_STACK_USERNAME:
@@ -31,7 +31,7 @@ services:
       - ./maze_output:/app/maze_output
 
   cocoa-maze-runner-bitbar:
-    image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v7-cli
+    image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v8-cli
     environment:
       <<: *common-environment
       BITBAR_USERNAME:
@@ -45,7 +45,7 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
 
   cocoa-maze-runner-legacy:
-    image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner:tms-guard-unlock-cli-legacy
+    image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v8-cli-legacy
     environment:
       <<: *common-environment
       BROWSER_STACK_USERNAME:

features/auto_detect_errors.feature

@@ -15,7 +15,7 @@ Feature: autoDetectErrors flag controls whether errors are captured automaticall
         And I kill and relaunch the app
         When I run "AutoDetectFalseNSExceptionScenario" and relaunch the crashed app
         And I configure Bugsnag for "AutoDetectFalseHandledScenario"
-        Then I should receive no requests
+        Then I should receive no errors
 
     Scenario: Signal not reported when autoDetectErrors is false
         When I run "AutoDetectFalseHandledScenario"
@@ -27,4 +27,4 @@ Feature: autoDetectErrors flag controls whether errors are captured automaticall
         And I kill and relaunch the app
         When I run "AutoDetectFalseAbortScenario" and relaunch the crashed app
         And I configure Bugsnag for "AutoDetectFalseHandledScenario"
-        Then I should receive no requests
+        Then I should receive no errors

features/delivery.feature

@@ -22,7 +22,7 @@ Feature: Delivery of errors
     And I kill and relaunch the app
     And I clear the error queue
     And I configure Bugsnag for "HandledExceptionScenario"
-    Then I should receive no requests
+    Then I should receive no errors
 
   Scenario: Delivery is not retried for oversized handled payloads
     Given I set the HTTP status code to 500
@@ -33,7 +33,7 @@ Feature: Delivery of errors
     And I kill and relaunch the app
     And I clear the error queue
     And I configure Bugsnag for "OversizedHandledErrorScenario"
-    Then I should receive no requests
+    Then I should receive no errors
 
   Scenario: Delivery is not retried for old handled payloads
     Given I set the HTTP status code to 500
@@ -50,7 +50,7 @@ Feature: Delivery of errors
     And I kill and relaunch the app
     And I clear the error queue
     And I configure Bugsnag for "OldHandledErrorScenario"
-    Then I should receive no requests
+    Then I should receive no errors
 
   Scenario: Delivery is not retried for oversized crash payloads
     Given I set the HTTP status code to 500
@@ -62,7 +62,7 @@ Feature: Delivery of errors
     And I kill and relaunch the app
     And I clear the error queue
     And I configure Bugsnag for "OversizedCrashReportScenario"
-    Then I should receive no requests
+    Then I should receive no errors
 
   Scenario: Delivery is not retried for old crash payloads
     Given I set the HTTP status code to 500
@@ -74,7 +74,7 @@ Feature: Delivery of errors
     And I kill and relaunch the app
     And I clear the error queue
     And I configure Bugsnag for "OldCrashReportScenario"
-    Then I should receive no requests
+    Then I should receive no errors
 
   Scenario: Bugsnag.start() should block for 2 seconds after a launch crash
     When I run "SendLaunchCrashesSynchronouslyScenario" and relaunch the crashed app
@@ -125,7 +125,7 @@ Feature: Delivery of errors
     And I wait to receive a session
     Then the session "user.id" equals "new"
     And I discard the oldest session
-    And I should receive no requests
+    And I should receive no sessions
 
   Scenario: The oldest sessions should be deleted to comply with maxPersistedSessions
     Given I set the HTTP status code to 500

features/fixtures/ios/iOSTestApp.xcodeproj/project.pbxproj

@@ -123,6 +123,7 @@
 		AA4C7F1529AEA0C4009B09A9 /* BugsnagWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA4C7F1429AEA0C4009B09A9 /* BugsnagWrapper.swift */; };
 		AA6ACD1C2773E0B3006464C4 /* UserFromConfigScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA6ACD1B2773E0B3006464C4 /* UserFromConfigScenario.swift */; };
 		AA6ACD202773E3F0006464C4 /* UserInfoScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA6ACD1F2773E3F0006464C4 /* UserInfoScenario.swift */; };
+		AA8BAEE32A4DD90E00A8BEA7 /* CommandReaderThread.swift in Sources */ = {isa = PBXBuildFile; fileRef = AA8BAEE22A4DD90E00A8BEA7 /* CommandReaderThread.swift */; };
 		AAFEF9EA26EB533800980A10 /* NetworkBreadcrumbsScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = AAFEF9E926EB533800980A10 /* NetworkBreadcrumbsScenario.swift */; };
 		CB0AE1F1287D89C90079B28E /* OnSendErrorCallbackFeatureFlagsScenario.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB0AE1F0287D89C90079B28E /* OnSendErrorCallbackFeatureFlagsScenario.swift */; };
 		CB42FF9026F1EDB500E8D5D2 /* libBugsnagNetworkRequestPluginStatic.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CB42FF8F26F1EDB500E8D5D2 /* libBugsnagNetworkRequestPluginStatic.a */; };
@@ -320,6 +321,7 @@
 		AA4C7F1429AEA0C4009B09A9 /* BugsnagWrapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BugsnagWrapper.swift; sourceTree = "<group>"; };
 		AA6ACD1B2773E0B3006464C4 /* UserFromConfigScenario.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserFromConfigScenario.swift; sourceTree = "<group>"; };
 		AA6ACD1F2773E3F0006464C4 /* UserInfoScenario.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserInfoScenario.swift; sourceTree = "<group>"; };
+		AA8BAEE22A4DD90E00A8BEA7 /* CommandReaderThread.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommandReaderThread.swift; sourceTree = "<group>"; };
 		AAFEF9E926EB533800980A10 /* NetworkBreadcrumbsScenario.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkBreadcrumbsScenario.swift; sourceTree = "<group>"; };
 		AAFEFA0226EB6B5A00980A10 /* BugsnagNetworkRequestPlugin.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = BugsnagNetworkRequestPlugin.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		CB0AE1F0287D89C90079B28E /* OnSendErrorCallbackFeatureFlagsScenario.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnSendErrorCallbackFeatureFlagsScenario.swift; sourceTree = "<group>"; };
@@ -443,6 +445,7 @@
 				8AB8866C20404DD30003E444 /* LaunchScreen.storyboard */,
 				8AB8866520404DD30003E444 /* ViewController.swift */,
 				8AB8866720404DD30003E444 /* Main.storyboard */,
+				AA8BAEE22A4DD90E00A8BEA7 /* CommandReaderThread.swift */,
 			);
 			path = iOSTestApp;
 			sourceTree = "<group>";
@@ -778,6 +781,7 @@
 				E75040A2247801A8005D33BD /* AutoDetectFalseNSExceptionScenario.swift in Sources */,
 				E700EE7E247D7A61008CFFB6 /* SIGSYSScenario.m in Sources */,
 				010BAB272833D0160003FF36 /* AppHangDefaultConfigScenario.swift in Sources */,
+				AA8BAEE32A4DD90E00A8BEA7 /* CommandReaderThread.swift in Sources */,
 				010BAB212833CFE60003FF36 /* AppHangFatalDisabledScenario.swift in Sources */,
 				E75040A42478052D005D33BD /* AutoDetectFalseAbortScenario.swift in Sources */,
 				8A14F0F62282D4AE00337B05 /* (null) in Sources */,