From e954bd0e92da2ea7f2bcbe63101179bb6bbe4c03 Mon Sep 17 00:00:00 2001 From: Dan Skinner Date: Fri, 1 Sep 2023 16:27:05 +0100 Subject: [PATCH] Revert "Merge pull request #2007 from bugsnag/tms/maze-v8" This reverts commit 17b99e58a1eacf4eff2cde4f627dafc1b4071d58, reversing changes made to a410757f6bf8cb27a8c20b66ea1298d7540d6a45. --- docker-compose.yml | 4 +- dockerfiles/Dockerfile.node | 2 +- test/node/Gemfile | 2 +- test/node/Gemfile.lock | 107 +++++++----------- .../node/features/fixtures/docker-compose.yml | 2 - test/node/features/proxy.feature | 2 +- test/node/features/unhandled_errors.feature | 4 +- test/react-native-cli/Gemfile | 2 +- test/react-native-cli/Gemfile.lock | 83 ++++++-------- test/react-native/Gemfile | 2 +- test/react-native/Gemfile.lock | 83 ++++++-------- test/react-native/features/app.feature | 2 +- test/react-native/features/session.feature | 2 +- 13 files changed, 123 insertions(+), 174 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a002466c7d..434bf37a09 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -188,7 +188,7 @@ services: - ./test/react-native-cli/features/:/app/features react-native-maze-runner: - image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v8-cli + image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v7-cli environment: <<: *common-environment BITBAR_USERNAME: @@ -207,7 +207,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock react-native-cli-maze-runner: - image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v8-cli + image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v7-cli environment: <<: *common-environment BITBAR_USERNAME: diff --git a/dockerfiles/Dockerfile.node b/dockerfiles/Dockerfile.node index eb25763019..b29044d015 100644 --- a/dockerfiles/Dockerfile.node +++ b/dockerfiles/Dockerfile.node @@ -21,7 +21,7 @@ RUN npm pack --verbose packages/plugin-koa/ RUN npm pack --verbose packages/plugin-restify/ # The maze-runner node tests -FROM 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v8-cli as node-maze-runner +FROM 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v7-cli as node-maze-runner WORKDIR /app/ COPY packages/node/ . COPY test/node/features test/node/features diff --git a/test/node/Gemfile b/test/node/Gemfile index 29d3f3cccb..bd133a4451 100644 --- a/test/node/Gemfile +++ b/test/node/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'bugsnag-maze-runner', '~>8.0' +gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v7.6.0' # Use a branch of Maze Runner #gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', branch: 'tms/use-maze-check' diff --git a/test/node/Gemfile.lock b/test/node/Gemfile.lock index 12713cd4f6..b9ab0e431d 100644 --- a/test/node/Gemfile.lock +++ b/test/node/Gemfile.lock @@ -1,35 +1,37 @@ -GEM - remote: https://rubygems.org/ +GIT + remote: https://github.com/bugsnag/maze-runner + revision: fe12189f83aad154f54221ee0fcd41b483d3c0d1 + tag: v6.8.0 specs: - appium_lib (12.0.1) - appium_lib_core (~> 5.0) - nokogiri (~> 1.8, >= 1.8.1) - tomlrb (>= 1.1, < 3.0) - appium_lib_core (5.4.0) - faye-websocket (~> 0.11.0) - selenium-webdriver (~> 4.2, < 4.6) - bugsnag (6.26.0) - concurrent-ruby (~> 1.0) - bugsnag-maze-runner (8.4.0) - appium_lib (~> 12.0.0) - appium_lib_core (~> 5.4.0) + bugsnag-maze-runner (6.8.0) + appium_lib (~> 11.2.0) bugsnag (~> 6.24) cucumber (~> 7.1) cucumber-expressions (~> 6.0.0) curb (~> 0.9.6) - dogstatsd-ruby (~> 5.5.0) - json_schemer (~> 0.2.24) optimist (~> 3.0.1) os (~> 1.0.0) - rack (~> 2.2) rake (~> 12.3.3) rubyzip (~> 2.3.2) - selenium-webdriver (~> 4.0) + selenium-webdriver (~> 3.11) test-unit (~> 3.5.2) webrick (~> 1.7.0) + +GEM + remote: https://rubygems.org/ + specs: + appium_lib (11.2.0) + appium_lib_core (~> 4.1) + nokogiri (~> 1.8, >= 1.8.1) + tomlrb (~> 1.1) + appium_lib_core (4.7.1) + faye-websocket (~> 0.11.0) + selenium-webdriver (~> 3.14, >= 3.14.1) + bugsnag (6.24.1) + concurrent-ruby (~> 1.0) builder (3.2.4) - childprocess (4.1.0) - concurrent-ruby (1.2.2) + childprocess (3.0.0) + concurrent-ruby (1.1.9) cucumber (7.1.0) builder (~> 3.2, >= 3.2.4) cucumber-core (~> 10.1, >= 10.1.0) @@ -43,10 +45,10 @@ GEM mime-types (~> 3.3, >= 3.3.1) multi_test (~> 0.1, >= 0.1.2) sys-uname (~> 1.2, >= 1.2.2) - cucumber-core (10.1.1) + cucumber-core (10.1.0) cucumber-gherkin (~> 22.0, >= 22.0.0) cucumber-messages (~> 17.1, >= 17.1.1) - cucumber-tag-expressions (~> 4.1, >= 4.1.0) + cucumber-tag-expressions (~> 4.0, >= 4.0.2) cucumber-create-meta (6.0.4) cucumber-messages (~> 17.1, >= 17.1.1) sys-uname (~> 1.2, >= 1.2.2) @@ -58,62 +60,41 @@ GEM cucumber-messages (~> 17.1, >= 17.1.0) cucumber-messages (17.1.1) cucumber-tag-expressions (4.1.0) - cucumber-wire (6.2.1) + cucumber-wire (6.2.0) cucumber-core (~> 10.1, >= 10.1.0) cucumber-cucumber-expressions (~> 14.0, >= 14.0.0) + cucumber-messages (~> 17.1, >= 17.1.1) curb (0.9.11) - diff-lcs (1.5.0) - dogstatsd-ruby (5.5.0) - ecma-re-validator (0.4.0) - regexp_parser (~> 2.2) + diff-lcs (1.4.4) eventmachine (1.2.7) - faye-websocket (0.11.3) + faye-websocket (0.11.1) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) - ffi (1.15.5) - hana (1.3.7) - 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.5.0) + ffi (1.15.4) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0808) - mini_portile2 (2.8.4) + mime-types-data (3.2021.1115) + mini_portile2 (2.6.1) multi_test (0.1.2) - nokogiri (1.15.4) - mini_portile2 (~> 2.8.2) + nokogiri (1.12.5) + mini_portile2 (~> 2.6.1) racc (~> 1.4) optimist (3.0.1) os (1.0.1) - power_assert (2.0.3) - racc (1.7.1) - rack (2.2.8) + power_assert (2.0.1) + racc (1.6.0) rake (12.3.3) - regexp_parser (2.8.1) - rexml (3.2.6) rubyzip (2.3.2) - selenium-webdriver (4.5.0) - childprocess (>= 0.5, < 5.0) - 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) + selenium-webdriver (3.142.7) + childprocess (>= 0.5, < 4.0) + rubyzip (>= 1.2.2) + sys-uname (1.2.2) ffi (~> 1.1) - test-unit (3.5.9) + test-unit (3.5.3) power_assert - tomlrb (2.0.3) - unf (0.1.4) - unf_ext - unf_ext (0.0.8.2) - uri_template (0.7.0) + tomlrb (1.3.0) webrick (1.7.0) - websocket (1.2.9) - websocket-driver (0.7.6) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -121,7 +102,7 @@ PLATFORMS ruby DEPENDENCIES - bugsnag-maze-runner (~> 8.0) + bugsnag-maze-runner! BUNDLED WITH 2.2.20 diff --git a/test/node/features/fixtures/docker-compose.yml b/test/node/features/fixtures/docker-compose.yml index 39c0aaf698..5eba62f7ec 100644 --- a/test/node/features/fixtures/docker-compose.yml +++ b/test/node/features/fixtures/docker-compose.yml @@ -290,6 +290,4 @@ services: networks: default: - external: true name: ${NETWORK_NAME:-js-maze-runner} - diff --git a/test/node/features/proxy.feature b/test/node/features/proxy.feature index 8358877ce2..1826cc5a86 100644 --- a/test/node/features/proxy.feature +++ b/test/node/features/proxy.feature @@ -18,4 +18,4 @@ Scenario: using options to configure a proxy Scenario: making sure no request get through a bad proxy And I run the service "proxy" with the command "node scenarios/misconfigured-proxy" And I wait for 1 second - Then I should receive no errors + Then I should receive no requests diff --git a/test/node/features/unhandled_errors.feature b/test/node/features/unhandled_errors.feature index ffdc256eb2..87504de593 100644 --- a/test/node/features/unhandled_errors.feature +++ b/test/node/features/unhandled_errors.feature @@ -22,7 +22,7 @@ Scenario: reporting thrown exception which is not caught Scenario: not reporting uncaughtExceptions when autoDetectErrors is off And I run the service "unhandled" with the command "node scenarios/thrown-error-not-caught-auto-notify-off" And I wait for 1 second - Then I should receive no errors + Then I should receive no requests Scenario: reporting unhandled promise rejections And I run the service "unhandled" with the command "node scenarios/unhandled-promise-rejection" @@ -53,7 +53,7 @@ Scenario: reporting unhandled promise rejections Scenario: not reporting unhandledRejections when autoDetectErrors is off And I run the service "unhandled" with the command "node scenarios/unhandled-promise-rejection-auto-notify-off" And I wait for 1 second - Then I should receive no errors + Then I should receive no requests Scenario: overridden handled state in a callback And I run the service "unhandled" with the command "node scenarios/modify-unhandled-callback" diff --git a/test/react-native-cli/Gemfile b/test/react-native-cli/Gemfile index c703a18be5..bcc82390d2 100644 --- a/test/react-native-cli/Gemfile +++ b/test/react-native-cli/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gem 'cocoapods' -gem 'bugsnag-maze-runner', '~>8.4.0' +gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v7.4.0' # Use a branch of Maze Runner #gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', branch: 'tms/use-maze-check' diff --git a/test/react-native-cli/Gemfile.lock b/test/react-native-cli/Gemfile.lock index f203f7f864..8b0833ee30 100644 --- a/test/react-native-cli/Gemfile.lock +++ b/test/react-native-cli/Gemfile.lock @@ -1,3 +1,23 @@ +GIT + remote: https://github.com/bugsnag/maze-runner + revision: fc5e8c39582b067743ffb18c946f2c9e8fd27311 + tag: v7.4.0 + specs: + bugsnag-maze-runner (7.4.0) + appium_lib (~> 12.0) + appium_lib_core (~> 5.4.0) + bugsnag (~> 6.24) + cucumber (~> 7.1) + cucumber-expressions (~> 6.0.0) + curb (~> 0.9.6) + optimist (~> 3.0.1) + os (~> 1.0.0) + rake (~> 12.3.3) + rubyzip (~> 2.3.2) + selenium-webdriver (~> 4.0) + test-unit (~> 3.5.2) + webrick (~> 1.7.0) + GEM remote: https://rubygems.org/ specs: @@ -22,25 +42,8 @@ GEM faye-websocket (~> 0.11.0) selenium-webdriver (~> 4.2, < 4.6) atomos (0.1.3) - bugsnag (6.26.0) + bugsnag (6.24.2) concurrent-ruby (~> 1.0) - bugsnag-maze-runner (8.4.0) - appium_lib (~> 12.0.0) - appium_lib_core (~> 5.4.0) - bugsnag (~> 6.24) - cucumber (~> 7.1) - cucumber-expressions (~> 6.0.0) - curb (~> 0.9.6) - dogstatsd-ruby (~> 5.5.0) - json_schemer (~> 0.2.24) - optimist (~> 3.0.1) - os (~> 1.0.0) - rack (~> 2.2) - rake (~> 12.3.3) - rubyzip (~> 2.3.2) - selenium-webdriver (~> 4.0) - test-unit (~> 3.5.2) - webrick (~> 1.7.0) builder (3.2.4) childprocess (4.1.0) claide (1.1.0) @@ -116,52 +119,40 @@ GEM cucumber-cucumber-expressions (~> 14.0, >= 14.0.0) curb (0.9.11) diff-lcs (1.5.0) - dogstatsd-ruby (5.5.0) - ecma-re-validator (0.4.0) - regexp_parser (~> 2.2) escape (0.0.4) ethon (0.15.0) ffi (>= 1.15.0) eventmachine (1.2.7) - faye-websocket (0.11.3) + faye-websocket (0.11.1) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) ffi (1.15.5) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - hana (1.3.7) httpclient (2.8.3) i18n (1.10.0) concurrent-ruby (~> 1.0) json (2.6.1) - 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.5.0) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0808) - mini_portile2 (2.8.4) + mime-types-data (3.2022.0105) + mini_portile2 (2.8.0) minitest (5.15.0) molinillo (0.8.0) multi_test (0.1.2) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) - nokogiri (1.15.4) - mini_portile2 (~> 2.8.2) + nokogiri (1.13.9) + mini_portile2 (~> 2.8.0) racc (~> 1.4) optimist (3.0.1) os (1.0.1) - power_assert (2.0.3) + power_assert (2.0.2) public_suffix (4.0.6) - racc (1.7.1) - rack (2.2.8) + racc (1.6.0) rake (12.3.3) - regexp_parser (2.8.1) rexml (3.2.5) ruby-macho (2.5.1) rubyzip (2.3.2) @@ -170,24 +161,18 @@ 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) + sys-uname (1.2.2) ffi (~> 1.1) - test-unit (3.5.9) + test-unit (3.5.5) power_assert tomlrb (2.0.3) typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (2.0.4) 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) - websocket-driver (0.7.6) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xcodeproj (1.21.0) @@ -203,8 +188,8 @@ PLATFORMS ruby DEPENDENCIES - bugsnag-maze-runner (~> 8.4.0) + bugsnag-maze-runner! cocoapods BUNDLED WITH - 2.4.8 + 2.3.0 diff --git a/test/react-native/Gemfile b/test/react-native/Gemfile index 9ae53510db..4eb2c78891 100644 --- a/test/react-native/Gemfile +++ b/test/react-native/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gem 'cocoapods' -gem 'bugsnag-maze-runner', '~>8.4.0' +gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v7.7.0' # Use a branch of Maze Runner #gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', branch: 'tms/use-maze-check' diff --git a/test/react-native/Gemfile.lock b/test/react-native/Gemfile.lock index f203f7f864..4a81844517 100644 --- a/test/react-native/Gemfile.lock +++ b/test/react-native/Gemfile.lock @@ -1,3 +1,23 @@ +GIT + remote: https://github.com/bugsnag/maze-runner + revision: 07e5d231773bc740b1d8de4d5c311b5c73f86e12 + tag: v7.7.0 + specs: + bugsnag-maze-runner (7.7.0) + appium_lib (~> 12.0) + appium_lib_core (~> 5.4.0) + bugsnag (~> 6.24) + cucumber (~> 7.1) + cucumber-expressions (~> 6.0.0) + curb (~> 0.9.6) + optimist (~> 3.0.1) + os (~> 1.0.0) + rake (~> 12.3.3) + rubyzip (~> 2.3.2) + selenium-webdriver (~> 4.0) + test-unit (~> 3.5.2) + webrick (~> 1.7.0) + GEM remote: https://rubygems.org/ specs: @@ -22,25 +42,8 @@ GEM faye-websocket (~> 0.11.0) selenium-webdriver (~> 4.2, < 4.6) atomos (0.1.3) - bugsnag (6.26.0) + bugsnag (6.25.0) concurrent-ruby (~> 1.0) - bugsnag-maze-runner (8.4.0) - appium_lib (~> 12.0.0) - appium_lib_core (~> 5.4.0) - bugsnag (~> 6.24) - cucumber (~> 7.1) - cucumber-expressions (~> 6.0.0) - curb (~> 0.9.6) - dogstatsd-ruby (~> 5.5.0) - json_schemer (~> 0.2.24) - optimist (~> 3.0.1) - os (~> 1.0.0) - rack (~> 2.2) - rake (~> 12.3.3) - rubyzip (~> 2.3.2) - selenium-webdriver (~> 4.0) - test-unit (~> 3.5.2) - webrick (~> 1.7.0) builder (3.2.4) childprocess (4.1.0) claide (1.1.0) @@ -116,52 +119,40 @@ GEM cucumber-cucumber-expressions (~> 14.0, >= 14.0.0) curb (0.9.11) diff-lcs (1.5.0) - dogstatsd-ruby (5.5.0) - ecma-re-validator (0.4.0) - regexp_parser (~> 2.2) escape (0.0.4) ethon (0.15.0) ffi (>= 1.15.0) eventmachine (1.2.7) - faye-websocket (0.11.3) + faye-websocket (0.11.1) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) ffi (1.15.5) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - hana (1.3.7) httpclient (2.8.3) i18n (1.10.0) concurrent-ruby (~> 1.0) json (2.6.1) - 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.5.0) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2023.0808) - mini_portile2 (2.8.4) + mime-types-data (3.2022.0105) + mini_portile2 (2.8.0) minitest (5.15.0) molinillo (0.8.0) multi_test (0.1.2) nanaimo (0.3.0) nap (1.1.0) netrc (0.11.0) - nokogiri (1.15.4) - mini_portile2 (~> 2.8.2) + nokogiri (1.13.9) + mini_portile2 (~> 2.8.0) racc (~> 1.4) optimist (3.0.1) os (1.0.1) - power_assert (2.0.3) + power_assert (2.0.2) public_suffix (4.0.6) - racc (1.7.1) - rack (2.2.8) + racc (1.6.1) rake (12.3.3) - regexp_parser (2.8.1) rexml (3.2.5) ruby-macho (2.5.1) rubyzip (2.3.2) @@ -170,24 +161,18 @@ 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) + sys-uname (1.2.2) ffi (~> 1.1) - test-unit (3.5.9) + test-unit (3.5.5) power_assert tomlrb (2.0.3) typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (2.0.4) 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) - websocket-driver (0.7.6) + websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xcodeproj (1.21.0) @@ -203,8 +188,8 @@ PLATFORMS ruby DEPENDENCIES - bugsnag-maze-runner (~> 8.4.0) + bugsnag-maze-runner! cocoapods BUNDLED WITH - 2.4.8 + 2.3.0 diff --git a/test/react-native/features/app.feature b/test/react-native/features/app.feature index 291dc054af..d01beb4f2c 100644 --- a/test/react-native/features/app.feature +++ b/test/react-native/features/app.feature @@ -125,4 +125,4 @@ Scenario: Setting releaseStage and enabledReleaseStages to enable delivery Scenario: Setting releaseStage and enabledReleaseStages to disable delivery When I run "AppConfigEnabledReleaseStagesNoSendScenario" And I wait for 5 seconds - Then I should receive no errors + Then I should receive no requests diff --git a/test/react-native/features/session.feature b/test/react-native/features/session.feature index addbaa0f4c..ac8f924e78 100644 --- a/test/react-native/features/session.feature +++ b/test/react-native/features/session.feature @@ -21,7 +21,7 @@ Scenario: Automatic session on app start Scenario: Automatic sessions disabled When I run "SessionAutoDisabledScenario" And I wait for 5 seconds - Then I should receive no sessions + Then I should receive no requests Scenario: Manual JS sessions (JS Controls) When I run "SessionJsControlledManualJsScenario"