From 0577f8eefd847f70f9f138579bd730268cc45122 Mon Sep 17 00:00:00 2001 From: Dan Skinner Date: Thu, 14 Nov 2024 09:30:49 +0000 Subject: [PATCH 1/7] https wip --- test/browser/Gemfile | 2 +- test/browser/Gemfile.lock | 57 ++++++++++++++++------------ test/browser/features/support/env.rb | 14 +++---- 3 files changed, 40 insertions(+), 33 deletions(-) diff --git a/test/browser/Gemfile b/test/browser/Gemfile index 18bb3fa0a7..c1ff00ee7b 100644 --- a/test/browser/Gemfile +++ b/test/browser/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'bugsnag-maze-runner', '~> 8.0' +gem 'bugsnag-maze-runner', '~> 9.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/browser/Gemfile.lock b/test/browser/Gemfile.lock index 6023efc60d..778f777679 100644 --- a/test/browser/Gemfile.lock +++ b/test/browser/Gemfile.lock @@ -8,28 +8,35 @@ GEM appium_lib_core (5.4.0) faye-websocket (~> 0.11.0) selenium-webdriver (~> 4.2, < 4.6) - bugsnag (6.26.0) + base64 (0.2.0) + bigdecimal (3.1.8) + bugsnag (6.27.1) concurrent-ruby (~> 1.0) - bugsnag-maze-runner (8.13.1) + bugsnag-maze-runner (9.18.1) appium_lib (~> 12.0.0) appium_lib_core (~> 5.4.0) + base64 (~> 0.2.0) + bigdecimal (~> 3.1) bugsnag (~> 6.24) cucumber (~> 7.1) cucumber-expressions (~> 6.0.0) - curb (~> 0.9.6) + curb (~> 1.0.5) dogstatsd-ruby (~> 5.5.0) json_schemer (~> 0.2.24) + logger (~> 1.6) optimist (~> 3.0.1) os (~> 1.0.0) + ostruct (~> 0.6.0) rack (~> 2.2) rake (~> 12.3.3) rubyzip (~> 2.3.2) selenium-webdriver (~> 4.0) test-unit (~> 3.5.2) + uri (~> 0.13.0) webrick (~> 1.7.0) - builder (3.2.4) + builder (3.3.0) childprocess (4.1.0) - concurrent-ruby (1.2.2) + concurrent-ruby (1.3.4) cucumber (7.1.0) builder (~> 3.2, >= 3.2.4) cucumber-core (~> 10.1, >= 10.1.0) @@ -61,8 +68,8 @@ GEM cucumber-wire (6.2.1) cucumber-core (~> 10.1, >= 10.1.0) cucumber-cucumber-expressions (~> 14.0, >= 14.0.0) - curb (0.9.11) - diff-lcs (1.5.0) + curb (1.0.6) + diff-lcs (1.5.1) dogstatsd-ruby (5.5.0) ecma-re-validator (0.4.0) regexp_parser (~> 2.2) @@ -70,7 +77,7 @@ GEM faye-websocket (0.11.3) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) - ffi (1.16.3) + ffi (1.17.0) hana (1.3.7) json_schemer (0.2.25) ecma-re-validator (~> 0.3) @@ -78,41 +85,41 @@ GEM regexp_parser (~> 2.0) simpleidn (~> 0.2) uri_template (~> 0.7) - mime-types (3.5.1) + logger (1.6.1) + mime-types (3.6.0) + logger mime-types-data (~> 3.2015) - mime-types-data (3.2023.1003) - mini_portile2 (2.8.5) + mime-types-data (3.2024.1105) + mini_portile2 (2.8.7) multi_test (0.1.2) - nokogiri (1.15.5) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) optimist (3.0.1) os (1.0.1) - power_assert (2.0.3) - racc (1.7.3) - rack (2.2.8) + ostruct (0.6.1) + power_assert (2.0.4) + racc (1.8.1) + rack (2.2.10) rake (12.3.3) - regexp_parser (2.8.2) - rexml (3.2.6) + regexp_parser (2.9.2) + rexml (3.3.9) 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) + simpleidn (0.2.3) + sys-uname (1.3.0) ffi (~> 1.1) test-unit (3.5.9) power_assert tomlrb (2.0.3) - unf (0.1.4) - unf_ext - unf_ext (0.0.9.1) + uri (0.13.1) uri_template (0.7.0) webrick (1.7.0) - websocket (1.2.10) + websocket (1.2.11) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -121,7 +128,7 @@ PLATFORMS ruby DEPENDENCIES - bugsnag-maze-runner (~> 8.0) + bugsnag-maze-runner (~> 9.0) BUNDLED WITH 2.4.8 diff --git a/test/browser/features/support/env.rb b/test/browser/features/support/env.rb index 791bce977c..3a036961d8 100644 --- a/test/browser/features/support/env.rb +++ b/test/browser/features/support/env.rb @@ -10,17 +10,17 @@ def get_test_url(path) host = Maze.public_document_server_address api_host = Maze.public_address else - host = "#{ENV['HOST']}:#{Maze.config.document_server_port}" - api_host = "#{ENV['API_HOST']}:#{Maze.config.port}" + host = "#{ENV['HOST']}:9339/docs" + api_host = "#{ENV['API_HOST']}:9339" end - notify = "http://#{api_host}/notify" - sessions = "http://#{api_host}/sessions" - logs = "http://#{api_host}/logs" - reflect= "http://#{api_host}/reflect" + notify = "https://#{api_host}/notify" + sessions = "https://#{api_host}/sessions" + logs = "https://#{api_host}/logs" + reflect= "https://#{api_host}/reflect" config_query_string = "NOTIFY=#{notify}&SESSIONS=#{sessions}&API_KEY=#{$api_key}&LOGS=#{logs}&REFLECT=#{reflect}" - uri = URI("http://#{host}#{path}") + uri = URI("https://#{host}#{path}") if uri.query uri.query += "&#{config_query_string}" From 283de9d4a91119ea6683f08db141ce554c5b3b9f Mon Sep 17 00:00:00 2001 From: Dan Skinner Date: Thu, 14 Nov 2024 14:43:25 +0000 Subject: [PATCH 2/7] update fixtures for new docs server endpoint --- .buildkite/basic/browser-pipeline.yml | 3 +++ .../features/fixtures/auto_detect_errors/script/a.html | 2 +- .../features/fixtures/auto_detect_errors/script/b.html | 2 +- .../features/fixtures/auto_detect_errors/script/c.html | 2 +- test/browser/features/fixtures/cause/script/constructor.html | 2 +- test/browser/features/fixtures/cause/script/property.html | 2 +- test/browser/features/fixtures/csp/script/a.html | 2 +- test/browser/features/fixtures/delivery/script/a.html | 2 +- test/browser/features/fixtures/device/script/a.html | 2 +- test/browser/features/fixtures/device/script/b.html | 2 +- test/browser/features/fixtures/device/script/c.html | 2 +- .../features/fixtures/feature_flags/script/handled_error.html | 2 +- .../fixtures/feature_flags/script/unhandled_error.html | 2 +- test/browser/features/fixtures/handled/script/a.html | 2 +- test/browser/features/fixtures/handled/script/b.html | 2 +- test/browser/features/fixtures/handled/script/c.html | 2 +- test/browser/features/fixtures/handled/script/d.html | 2 +- test/browser/features/fixtures/handled/script/e.html | 2 +- test/browser/features/fixtures/handled/script/f.html | 2 +- test/browser/features/fixtures/handled/script/g.html | 2 +- test/browser/features/fixtures/handled/script/h.html | 2 +- test/browser/features/fixtures/handled/typescript/a.html | 2 +- test/browser/features/fixtures/handled/typescript/b.html | 2 +- test/browser/features/fixtures/handled/typescript/c.html | 2 +- test/browser/features/fixtures/inline_script/script/a.html | 2 +- test/browser/features/fixtures/inline_script/script/b.js | 2 +- test/browser/features/fixtures/ip_redaction/script/a.html | 2 +- test/browser/features/fixtures/ip_redaction/script/b.html | 2 +- test/browser/features/fixtures/navigation/script/a.html | 2 +- .../fixtures/network_breadcrumbs/script/fetch_failure.html | 2 +- .../fixtures/network_breadcrumbs/script/fetch_success.html | 2 +- .../fixtures/network_breadcrumbs/script/xhr_failure.html | 2 +- .../fixtures/network_breadcrumbs/script/xhr_success.html | 2 +- test/browser/features/fixtures/on_error/script/a.html | 2 +- test/browser/features/fixtures/on_error/script/b.html | 2 +- test/browser/features/fixtures/on_error/script/d.html | 2 +- test/browser/features/fixtures/on_error/script/e.html | 2 +- .../features/fixtures/plugin_angular/ng/src/index.html | 2 +- test/browser/features/fixtures/redaction/script/a.html | 2 +- test/browser/features/fixtures/redaction/script/b.html | 2 +- test/browser/features/fixtures/redaction/script/c.html | 2 +- test/browser/features/fixtures/redaction/script/d.html | 2 +- test/browser/features/fixtures/release_stage/script/a.html | 2 +- test/browser/features/fixtures/release_stage/script/b.html | 2 +- test/browser/features/fixtures/release_stage/script/c.html | 2 +- test/browser/features/fixtures/release_stage/script/d.html | 2 +- test/browser/features/fixtures/release_stage/script/e.html | 2 +- test/browser/features/fixtures/release_stage/script/f.html | 2 +- test/browser/features/fixtures/sessions/script/a.html | 2 +- test/browser/features/fixtures/sessions/script/b.html | 2 +- test/browser/features/fixtures/strict_mode/script/a.html | 2 +- test/browser/features/fixtures/unhandled/script/a.html | 2 +- test/browser/features/fixtures/unhandled/script/b.html | 2 +- test/browser/features/fixtures/unhandled/script/c.html | 2 +- test/browser/features/fixtures/unhandled/script/d.html | 2 +- test/browser/features/fixtures/unhandled/script/e.html | 2 +- test/browser/features/fixtures/unhandled/script/f.html | 2 +- test/browser/features/fixtures/unhandled/script/g.html | 2 +- test/browser/features/fixtures/unhandled/script/h.html | 2 +- test/browser/features/fixtures/user_info/script/a.html | 2 +- test/browser/features/fixtures/user_info/script/b.html | 2 +- test/browser/features/fixtures/user_info/script/d.html | 2 +- test/browser/features/fixtures/user_info/script/e.html | 2 +- test/browser/features/fixtures/user_info/script/f.html | 2 +- test/browser/features/fixtures/user_info/script/g.html | 2 +- .../fixtures/web_worker/auto_track_sessions/worker.js | 2 +- .../features/fixtures/web_worker/ip_redaction/worker.js | 2 +- .../web_worker/worker_auto_detect_errors/default/worker.js | 2 +- .../web_worker/worker_auto_detect_errors/enabled/worker.js | 2 +- .../fixtures/web_worker/worker_notify_error/worker.js | 2 +- .../web_worker/worker_unhandled_promise_rejection/worker.js | 2 +- test/browser/features/support/env.rb | 4 +--- 72 files changed, 74 insertions(+), 73 deletions(-) diff --git a/.buildkite/basic/browser-pipeline.yml b/.buildkite/basic/browser-pipeline.yml index a0f6bb9cba..90f021c133 100644 --- a/.buildkite/basic/browser-pipeline.yml +++ b/.buildkite/basic/browser-pipeline.yml @@ -59,6 +59,7 @@ steps: service-ports: true use-aliases: true command: + - "--https" - "--farm=bb" - "--browser={{matrix}}" - "--no-tunnel" @@ -117,6 +118,7 @@ steps: service-ports: true use-aliases: true command: + - "--https" - "--farm=bb" - "--browser=ie_11" - "--no-tunnel" @@ -158,6 +160,7 @@ steps: run: browser-maze-runner-bs use-aliases: true command: + - "--https" - "--farm=bs" - "--browser={{matrix}}" artifacts#v1.5.0: diff --git a/test/browser/features/fixtures/auto_detect_errors/script/a.html b/test/browser/features/fixtures/auto_detect_errors/script/a.html index 1cb66417ce..e308d761a2 100644 --- a/test/browser/features/fixtures/auto_detect_errors/script/a.html +++ b/test/browser/features/fixtures/auto_detect_errors/script/a.html @@ -2,7 +2,7 @@ - + + + + + + + + + + + + + + + + + + + + + diff --git a/test/browser/features/fixtures/handled/typescript/b.html b/test/browser/features/fixtures/handled/typescript/b.html index 608f139d6e..4dad86ea72 100644 --- a/test/browser/features/fixtures/handled/typescript/b.html +++ b/test/browser/features/fixtures/handled/typescript/b.html @@ -2,7 +2,7 @@ - + diff --git a/test/browser/features/fixtures/handled/typescript/c.html b/test/browser/features/fixtures/handled/typescript/c.html index 30bbfbc9db..4bd9194816 100644 --- a/test/browser/features/fixtures/handled/typescript/c.html +++ b/test/browser/features/fixtures/handled/typescript/c.html @@ -2,7 +2,7 @@ - +
PENDING
diff --git a/test/browser/features/fixtures/inline_script/script/a.html b/test/browser/features/fixtures/inline_script/script/a.html index 72bd59c8da..fd3c3ee285 100644 --- a/test/browser/features/fixtures/inline_script/script/a.html +++ b/test/browser/features/fixtures/inline_script/script/a.html @@ -2,7 +2,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + +