bugsnag-maze-runner 6.27.0 → 7.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 508b197638d8f5af31b4018fecd9776cfa91071ba760c90ce6647cf720d0bfb0
-  data.tar.gz: 3f47abb96bfa76e64a569b06c58d13b229305405e74142da6b9709a5a655d27e
+  metadata.gz: 25918b6a96c58be96023fec6acae1dca6463db11c722fe9ef612f1faa1137f48
+  data.tar.gz: 68af4db3ee29db253541685361060a0b969371752a22c7c7e7e78bfd51c7dc31
 SHA512:
-  metadata.gz: 5ad71748e2a4ee9a83c65b1192ebd3a5cbfe6c7ee31ef63cdff5ea78674c130315946cd784004c8a0b0f0bfaf21fbf4e71c8277ca94b9a036bf88f7b36781538
-  data.tar.gz: bec09abd2c07c745d561a3ffc84653b07d792614a5070af2b7fbecc88f5f4a2b720e0bdae2a4e430d872a86885432e3552837b6f1542e92c9e0226949362ad7d
+  metadata.gz: 5734aa0594c7286ebe127cb4261b0d029f7241a88c090eea5c52a059459e3f7deed26a3fc14d754155ae8d1000b5001d65b3b903e2d98822ccc6cf7a824573e4
+  data.tar.gz: 91d4e5a297ec91c2f71bc2f023632eab9c328fe70bcd61bf511f8eab688b7e85c4cba8a9d5dc5ccec3017a2240daee180f6c0364db490e71376389f77cc5a45f

data/bin/download-logs

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 require_relative '../lib/maze'
-require_relative '../lib/maze/browser_stack_utils'
+require_relative '../lib/maze/client/bs_client_utils'
 require_relative '../lib/maze/logger'
 require 'net/http'
 require 'json'
@@ -44,9 +44,9 @@ class DownloadLogEntry
     end
 
 
-    build_info = Maze::BrowserStackUtils.build_info username,
-                                                    access_key,
-                                                    opts[:build_id]
+    build_info = Maze::Client::BrowserStackClientUtils.build_info username,
+                                                                  access_key,
+                                                                  opts[:build_id]
 
     $logger.info "Getting logs for build: #{opts[:build_id]}"
 
@@ -55,20 +55,18 @@ class DownloadLogEntry
 
       log_name = "#{opts[:build_id]}-#{index + 1}"
 
-      Maze::BrowserStackUtils.download_log username,
-                                           access_key,
-                                           log_name,
-                                           session['automation_session']['device_logs_url'],
-                                           :device
+      Maze::Client::BrowserStackClientUtils.download_log username,
+                                                         access_key,
+                                                         log_name,
+                                                         session['automation_session']['device_logs_url'],
+                                                         :device
 
       $logger.info "Downloading Appium Logs for Session: #{index + 1}"
-      Maze::BrowserStackUtils.download_log username,
-                                           access_key,
-                                           log_name,
-                                           session['automation_session']['appium_logs_url'],
-                                           :appium
-
-
+      Maze::Client::BrowserStackClientUtils.download_log username,
+                                                         access_key,
+                                                         log_name,
+                                                         session['automation_session']['appium_logs_url'],
+                                                         :appium
     end
   end
 end

data/bin/maze-runner

@@ -3,37 +3,60 @@
 
 require 'cucumber/cli/main'
 
+require_relative '../lib/utils/deep_merge'
+
 require_relative '../lib/maze'
 
 require_relative '../lib/maze/appium_server'
-require_relative '../lib/maze/bitbar_utils'
-require_relative '../lib/maze/bitbar_devices'
-require_relative '../lib/maze/browser_stack_devices'
-require_relative '../lib/maze/browser_stack_utils'
+require_relative '../lib/maze/api/appium/file_manager'
 require_relative '../lib/maze/bugsnag_config'
-require_relative '../lib/maze/capabilities'
+require_relative '../lib/maze/client/bb_api_client'
+require_relative '../lib/maze/client/bb_client_utils'
+require_relative '../lib/maze/client/bs_client_utils'
+require_relative '../lib/maze/client/appium'
+require_relative '../lib/maze/client/appium/base_client'
+require_relative '../lib/maze/client/appium/bb_client'
+require_relative '../lib/maze/client/appium/bb_devices'
+require_relative '../lib/maze/client/appium/bs_client'
+require_relative '../lib/maze/client/appium/bs_legacy_client'
+require_relative '../lib/maze/client/appium/bs_devices'
+require_relative '../lib/maze/client/appium/local_client'
+require_relative '../lib/maze/client/selenium'
+require_relative '../lib/maze/client/selenium/base_client'
+require_relative '../lib/maze/client/selenium/bb_client'
+require_relative '../lib/maze/client/selenium/bs_client'
+require_relative '../lib/maze/client/selenium/local_client'
+require_relative '../lib/maze/aws_public_ip'
 require_relative '../lib/maze/compare'
 require_relative '../lib/maze/docker'
 require_relative '../lib/maze/document_server'
 require_relative '../lib/maze/errors'
+require_relative '../lib/maze/generator'
 require_relative '../lib/maze/helper'
+require_relative '../lib/maze/http_request'
 require_relative '../lib/maze/logger'
 require_relative '../lib/maze/macos_utils'
+require_relative '../lib/maze/maze_output'
 require_relative '../lib/maze/network'
 require_relative '../lib/maze/proxy'
 require_relative '../lib/maze/retry_handler'
+require_relative '../lib/maze/request_repeater'
 require_relative '../lib/maze/runner'
-require_relative '../lib/maze/sauce_labs_utils'
-require_relative '../lib/maze/smart_bear_utils'
 require_relative '../lib/maze/terminating_server'
 
 require_relative '../lib/maze/servlets/base_servlet'
 require_relative '../lib/maze/servlets/command_servlet'
 require_relative '../lib/maze/servlets/servlet'
 require_relative '../lib/maze/servlets/log_servlet'
+require_relative '../lib/maze/servlets/trace_servlet'
 require_relative '../lib/maze/servlets/reflective_servlet'
 require_relative '../lib/maze/server'
 
+require_relative '../lib/maze/assertions/request_set_assertions'
+
+require_relative '../lib/maze/schemas/trace_schema'
+require_relative '../lib/maze/schemas/trace_validator'
+
 require_relative '../lib/maze/store'
 require_relative '../lib/maze/timers'
 
@@ -46,21 +69,23 @@ require_relative '../lib/maze/option/processor'
 require_relative '../lib/maze/option/validator'
 
 
-require_relative '../lib/maze/assertions/request_set_assertions'
-
 require_relative '../lib/maze/hooks/hooks'
 require_relative '../lib/maze/hooks/appium_hooks'
 require_relative '../lib/maze/hooks/browser_hooks'
 require_relative '../lib/maze/hooks/command_hooks'
+require_relative '../lib/maze/hooks/error_code_hook'
 
 require_relative '../lib/maze/driver/appium'
 require_relative '../lib/maze/driver/browser'
-require_relative '../lib/maze/driver/resilient_appium'
 
 require_relative '../lib/maze/plugins/bugsnag_reporting_plugin'
 require_relative '../lib/maze/plugins/cucumber_report_plugin'
+require_relative '../lib/maze/plugins/error_code_plugin'
 require_relative '../lib/maze/plugins/global_retry_plugin'
 
+# Require monkey-patches after everything else
+require_relative '../lib/utils/selenium_money_patch'
+
 # Encapsulates the MazeRunner entry point
 class MazeRunnerEntry
 
@@ -105,13 +130,26 @@ class MazeRunnerEntry
     options = Maze::Option::Parser.parse args
 
     if options[Maze::Option::LIST_DEVICES]
-      case options[Maze::Option::FARM]
+      case options[Maze::Option::FARM].to_sym
       when :bs
-        Maze::BrowserStackDevices.list_devices('ios')
-        Maze::BrowserStackDevices.list_devices('android')
+        Maze::Client::Appium::BrowserStackDevices.list_devices('ios')
+        Maze::Client::Appium::BrowserStackDevices.list_devices('android')
+      when :bb
+        unless options[Maze::Option::ACCESS_KEY]
+          puts 'Listing BitBar devices or device groups available requires a valid access key'
+          exit 1
+        end
+        access_key = options[Maze::Option::ACCESS_KEY]
+        if options[Maze::Option::DEVICE] && !options[Maze::Option::DEVICE].empty?
+          options[Maze::Option::DEVICE].each do |device_group|
+            Maze::Client::Appium::BitBarDevices.list_devices_for_group(device_group, access_key)
+          end
+        else
+          Maze::Client::Appium::BitBarDevices.list_device_groups(access_key)
+        end
       else
-        Maze::BrowserStackDevices.list_devices('ios')
-        Maze::BrowserStackDevices.list_devices('android')
+        Maze::Client::Appium::BrowserStackDevices.list_devices('ios')
+        Maze::Client::Appium::BrowserStackDevices.list_devices('android')
       end
       exit 0
     end

data/bin/upload-app

@@ -2,7 +2,7 @@
 # frozen_string_literal: true
 
 require_relative '../lib/maze'
-require_relative '../lib/maze/browser_stack_utils'
+require_relative '../lib/maze/client/bs_client_utils'
 require_relative '../lib/maze/logger'
 require_relative '../lib/maze/helper'
 require 'optimist'
@@ -45,12 +45,12 @@ class UploadAppEntry
       end
     end
 
-    Maze::BrowserStackUtils.upload_app username,
-                                       access_key,
-                                       opts[:app],
-                                       opts[:app_id_file]
+    Maze::Client::BrowserStackClientUtils.upload_app username,
+                                                     access_key,
+                                                     opts[:app],
+                                                     opts[:app_id_file]
 
   end
 end
 
-UploadAppEntry.new.start(ARGV)
+UploadAppEntry.new.start(ARGV)

data/lib/features/steps/breadcrumb_steps.rb

@@ -1,16 +1,41 @@
 # @!group Breadcrumb steps
 
+# Tests whether the first event entry contains the specified number of breadcrumbs.
+#
+# @step_input expected [Integer] The expected number of breadcrumbs
+Then("the event has {int} breadcrumb(s)") do |expected|
+  breadcrumbs = Maze::Server.errors.current[:body]['events'].first['breadcrumbs']
+
+  Maze.check.equal(
+    expected,
+    breadcrumbs&.length || 0,
+    "Expected event to have '#{expected}' breadcrumbs, but got: #{breadcrumbs}"
+  )
+end
+
+# Tests whether the first event entry contains no breadcrumbs.
+Then("the event has no breadcrumbs") do
+  breadcrumbs = Maze::Server.errors.current[:body]['events'].first['breadcrumbs']
+
+  Maze.check.true(
+    # some notifiers may omit breadcrumbs entirely when empty, otherwise it should
+    # be an empty array
+    breadcrumbs.nil? || breadcrumbs.empty?,
+    "Expected event not to have breadcrumbs, but got: #{breadcrumbs}"
+  )
+end
+
 # Tests whether the first event entry contains a specific breadcrumb with a type and name.
 #
 # @step_input type [String] The expected breadcrumb's type
 # @step_input name [String] The expected breadcrumb's name
 Then('the event has a {string} breadcrumb named {string}') do |type, name|
-  value = Maze::Server.errors.current[:body]['events'].first['breadcrumbs']
-  found = false
-  value.each do |crumb|
-    found = true if crumb['type'] == type and crumb['name'] == name
-  end
-  raise("No breadcrumb matched: #{value}") unless found
+  breadcrumbs = Maze::Server.errors.current[:body]['events'].first['breadcrumbs']
+
+  Maze.check.true(
+    breadcrumbs.any? { |crumb| crumb['type'] == type && crumb['name'] == name },
+    "Expected event to have a breadcrumb with type '#{type}' and name '#{name}', but got: #{breadcrumbs}"
+  )
 end
 
 # Tests whether the first event entry contains a specific breadcrumb with a type and message.
@@ -19,10 +44,7 @@ end
 # @step_input message [String] The expected breadcrumb's message
 Then('the event has a {string} breadcrumb with message {string}') do |type, message|
   value = Maze::Server.errors.current[:body]['events'].first['breadcrumbs']
-  found = false
-  value.each do |crumb|
-    found = true if crumb['type'] == type && crumb['metaData'] && crumb['metaData']['message'] == message
-  end
+  found = value.any? { |crumb| crumb['type'] == type && crumb['metaData'] && crumb['metaData']['message'] == message }
   raise("No breadcrumb matched: #{value}") unless found
 end
 
@@ -32,13 +54,21 @@ end
 # @step_input type [String] The type of breadcrumb expected to not be present
 Then('the event does not have a {string} breadcrumb') do |type|
   value = Maze::Server.errors.current[:body]['events'].first['breadcrumbs']
-  found = false
-  value.each do |crumb|
-    found = true if crumb['type'] == type
-  end
+  found = value.any? { |crumb| crumb['type'] == type  }
   raise("Breadcrumb with type: #{type} matched") if found
 end
 
+# Test whether the first event entry does not contain a breadcrumb with a specific type and message.
+# Used for confirming filtering of breadcrumbs
+#
+# @step_input type [String] The type of the breadcrumb expected to be absent
+# @step_input message [String] The message of the breadcrumb expected to be absent
+Then('the event does not have a {string} breadcrumb with message {string}') do |type, message|
+  value = Maze::Server.errors.current[:body]['events'].first['breadcrumbs']
+  found = value.any? { |crumb| crumb['type'] == type && crumb['metaData'] && crumb['metaData']['message'] == message }
+  raise("Breadcrumb with type: #{type} and message: #{message} matched") if found
+end
+
 # Tests whether any breadcrumb matches a given JSON fixture.  This follows all the usual rules for JSON fixture matching.
 #
 # @step_input json_fixture [String] A path to the JSON fixture to compare against

data/lib/features/steps/error_reporting_steps.rb

@@ -120,6 +120,22 @@ Then('the event {string} equals {string}') do |field, string_value|
   step "the error payload field \"events.0.#{field}\" equals \"#{string_value}\""
 end
 
+# Tests whether a value in the first event entry matches a floating point value.
+#
+# @step_input field [String] The relative location of the value to test
+# @step_input string_value [String] The string to match against
+Then('the event {string} equals {float}') do |field, float_value|
+  step "the error payload field \"events.0.#{field}\" equals #{float_value}"
+end
+
+# Tests whether a value in the first event entry matches a floating point value, to a given number of decimal places.
+#
+# @step_input field [String] The relative location of the value to test
+# @step_input string_value [String] The string to match against
+Then('the event {string} equals {float} to {int} decimal place(s)') do |field, float_value, places|
+  step "the error payload field \"events.0.#{field}\" equals #{float_value} to #{places} decimal places"
+end
+
 # Tests whether a value in the first event entry equals an integer.
 #
 # @step_input field [String] The relative location of the value to test

data/lib/features/steps/network_steps.rb

@@ -12,32 +12,92 @@ end
 #
 # @step_input status_code [Integer] The status code to return
 When('I set the HTTP status code to {int}') do |status_code|
-  Maze::Server.status_code = status_code
+  Maze::Server.set_status_code_generator(Maze::Generator.new [status_code].cycle)
 end
 
 # Sets the HTTP status code to be used for the next request
 #
 # @step_input status_code [Integer] The status code to return
 When('I set the HTTP status code for the next request to {int}') do |status_code|
-  Maze::Server.reset_status_code = true
-  Maze::Server.status_code = status_code
+  Maze::Server.set_status_code_generator(create_defaulting_generator([status_code], Maze::Server::DEFAULT_STATUS_CODE))
+end
+
+# Sets the HTTP status code to be used for the next set of requests
+#
+# @step_input status_codes [String] A comma separated list of status codes to return
+When('I set the HTTP status code for the next requests to {string}') do |status_codes|
+  codes = status_codes.split(',').map(&:strip)
+  Maze::Server.set_status_code_generator(create_defaulting_generator(codes, Maze::Server::DEFAULT_STATUS_CODE))
+end
+
+# Steps the HTTP status code to be used for all subsequent requests for a given connection type
+#
+# @step_input http_verb [String] The type of request this code will be used for
+# @step_input status_code [Integer] The status code to return
+When('I set the HTTP status code for {string} requests to {int}') do |http_verb, status_code|
+  raise("Invalid HTTP verb: #{http_verb}") unless Maze::Server::ALLOWED_HTTP_VERBS.include?(http_verb)
+  Maze::Server.set_status_code_generator(Maze::Generator.new([status_code].cycle), http_verb)
+end
+
+# Steps the HTTP status code to be used for the next request for a given connection type
+#
+# @step_input http_verb [String] The type of request this code will be used for
+# @step_input status_code [Integer] The status code to return
+When('I set the HTTP status code for the next {string} request to {int}') do |http_verb, status_code|
+  raise("Invalid HTTP verb: #{http_verb}") unless Maze::Server::ALLOWED_HTTP_VERBS.include?(http_verb)
+  Maze::Server.set_status_code_generator(create_defaulting_generator([status_code], Maze::Server::DEFAULT_STATUS_CODE), http_verb)
+end
+
+# Sets the sampling probability to be used for all subsequent trace responses
+#
+# @step_input sampling_probability [String] The sampling probability to return
+When('I set the sampling probability to {string}') do |sampling_probability|
+  Maze::Server.set_sampling_probability_generator(Maze::Generator.new [sampling_probability].cycle)
+end
+
+# Sets the sampling probability to be used for the next trace responses
+#
+# @step_input status_code [Integer] The status code to return
+When('I set the sampling probability for the next trace to {string}') do |sampling_probability|
+  Maze::Server.set_sampling_probability_generator(create_defaulting_generator([sampling_probability], Maze::Server::DEFAULT_SAMPLING_PROBABILITY))
+end
+
+# Sets the sampling probability to be used for the next set of trace requests
+#
+# @step_input sampling_probability [String] A comma separated list of values to use, with "null" used to omit the header
+When('I set the sampling probability for the next traces to {string}') do |status_codes|
+  codes = status_codes.split(',').map(&:strip)
+  Maze::Server.set_sampling_probability_generator(create_defaulting_generator(codes, Maze::Server::DEFAULT_SAMPLING_PROBABILITY))
 end
 
 # Sets the response delay to be used for all subsequent requests
 #
 # @step_input response_delay_ms [Integer] The delay in milliseconds
 When('I set the response delay to {int} milliseconds') do |response_delay_ms|
-  Maze::Server.response_delay_ms = response_delay_ms
+  Maze::Server.set_response_delay_generator(Maze::Generator.new [response_delay_ms].cycle)
 end
 
 # Sets the response delay to be used for the next request
 #
 # @step_input delay [Integer] The delay in milliseconds
 When('I set the response delay for the next request to {int} milliseconds') do |delay|
-  Maze::Server.reset_response_delay = true
-  Maze::Server.response_delay_ms = delay
+  Maze::Server.set_response_delay_generator(create_defaulting_generator([delay], Maze::Server::DEFAULT_RESPONSE_DELAY))
+end
+
+def create_defaulting_generator(codes, default)
+  enumerator = Enumerator.new do |yielder|
+    codes.each do |code|
+      yielder.yield code
+    end
+
+    loop do
+      yielder.yield default
+    end
+  end
+  Maze::Generator.new enumerator
 end
 
+
 # Attempts to open a URL.
 #
 # @step_input url [String] The URL to open.

data/lib/features/steps/payload_steps.rb

@@ -86,6 +86,29 @@ Then('the {word} payload field {string} equals {int}') do |request_type, field_p
                    Maze::Helper.read_key_path(Maze::Server.list_for(request_type).current[:body], field_path))
 end
 
+# Tests that a payload element equals a float.
+#
+# @step_input request_type [String] The type of request (error, session, build, etc)
+# @step_input field_path [String] Path to the tested element
+# @step_input float_value [Float] The value to test against
+Then('the {word} payload field {string} equals {float}') do |request_type, field_path, float_value|
+  Maze.check.equal(float_value,
+                   Maze::Helper.read_key_path(Maze::Server.list_for(request_type).current[:body], field_path))
+end
+
+# Tests that a payload element equals a float, to a given number of decimal places.
+#
+# @step_input request_type [String] The type of request (error, session, build, etc)
+# @step_input field_path [String] Path to the tested element
+# @step_input float_value [Float] The value to test against
+# @step_input places [Int] The number of decimal places to round the actual value to first
+Then('the {word} payload field {string} equals {float} to {int} decimal place(s)') do |request_type, field_path, float_value, places|
+  body = Maze::Server.list_for(request_type).current[:body]
+  rounded_value = Maze::Helper.read_key_path(body, field_path).round places
+  Maze.check.equal(float_value,
+                   rounded_value)
+end
+
 # Tests the payload field value against an environment variable.
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)

data/lib/features/steps/request_assertion_steps.rb

@@ -8,15 +8,15 @@ require_relative '../../maze/wait'
 
 # @!group Request assertion steps
 
-def assert_received_requests(request_count, list, list_name)
+def assert_received_requests(request_count, list, list_name, precise = true)
   timeout = Maze.config.receive_requests_wait
   wait = Maze::Wait.new(timeout: timeout)
 
-  received = wait.until { list.size >= request_count }
+  received = wait.until { list.size_remaining >= request_count }
 
   unless received
     raise Test::Unit::AssertionFailedError.new <<-MESSAGE
-    Expected #{request_count} #{list_name} but received #{list.size} within the #{timeout}s timeout.
+    Expected #{request_count} #{list_name} but received #{list.size_remaining} within the #{timeout}s timeout.
     This could indicate that:
     - Bugsnag crashed with a fatal error.
     - Bugsnag did not make the requests that it should have done.
@@ -26,7 +26,65 @@ def assert_received_requests(request_count, list, list_name)
     MESSAGE
   end
 
-  Maze.check.equal(request_count, list.size, "#{list.size} #{list_name} received")
+  if precise
+    Maze.check.equal(request_count, list.size_remaining, "#{list.size_remaining} #{list_name} received")
+  else
+    Maze.check.operator(request_count, :<=, list.size_remaining, "#{list.size_remaining} #{list_name} received")
+  end
+
+  verify_schema_matches(list, list_name)
+  validate_payload_elements(list, list_name)
+end
+
+def verify_schema_matches(list, list_name)
+  request_schema_results = list.all.map { |request| request[:schema_errors] }
+  passed = true
+  request_schema_results.each.with_index(1) do |schema_errors, index|
+    next if schema_errors.nil?
+    if schema_errors.size > 0
+      passed = false
+      $stdout.puts "\n"
+      $stdout.puts "\e[31m--- #{list_name} #{index} failed validation with errors at the following locations:\e[0m"
+      schema_errors.each do |error|
+        $stdout.puts "\e[31m#{error["data_pointer"]} failed to match #{error["schema_pointer"]}\e[0m"
+      end
+      $stdout.puts "\n"
+    end
+  end
+
+  unless passed
+    raise Test::Unit::AssertionFailedError.new 'The received payloads did not match the endpoint schema.  A full list of the errors can be found above'
+  end
+end
+
+def validate_payload_elements(list, list_name)
+  validator_class = case list_name
+  when 'trace', 'traces'
+    Maze::Schemas::TraceValidator
+  else
+    nil
+  end
+
+  if validator_class
+    validators = list.all.map do |request|
+      validator = validator_class.new(request[:body])
+      validator.validate
+      validator
+    end
+
+    return if validators.all? { |validator| validator.success }
+    validators.each.with_index(1) do |validator, index|
+      unless validator.success
+        $stdout.puts "\n"
+        $stdout.puts "\e[31m--- #{list_name} #{index} failed validation with the following errors:\e[0m"
+        validator.errors.each do |error|
+          $stdout.puts "\e[31m#{error}\e[0m"
+        end
+        $stdout.puts "\n"
+      end
+    end
+    raise Test::Unit::AssertionFailedError.new("One or more #{list_name} payloads failed validation.  A full list of the errors can be found above")
+  end
 end
 
 #
@@ -52,6 +110,27 @@ Then('I wait to receive {int} {word}') do |request_count, request_type|
   list.sort_by_sent_at! request_count
 end
 
+# Continually checks to see if at least the number requests given has been received,
+# timing out according to @see Maze.config.receive_requests_wait.
+#
+# This step can tolerate receiving more than the expected number of requests.
+#
+# @step_input request_type [String] The type of request (error, session, build, etc)
+# @step_input request_count [Integer] The amount of requests expected
+Then('I wait to receive at least {int} {word}') do |request_count, request_type|
+  list = Maze::Server.list_for(request_type)
+  assert_received_requests request_count, list, request_type, false
+end
+
+# Sorts the remaining requests in a list by the field path given.
+#
+# @step_input request_type [String] The type of request (error, session, build, etc)
+# @step_input field_path [String] The field to sort by
+Then('I sort the {word} by the payload field {string}') do |request_type, field_path|
+  list = Maze::Server.list_for(request_type)
+  list.sort_by! field_path
+end
+
 # Verify that at least a certain amount of requests have been received
 # This step is only intended for use in stress tests
 #
@@ -59,7 +138,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 Then('I have received at least {int} {word}') do |min_received, request_type|
   list = Maze::Server.list_for(request_type)
-  Maze.check.operator(list.size, :>=, min_received, "Actually received #{list.size} #{request_type} requests")
+  Maze.check.operator(list.size_remaining, :>=, min_received, "Actually received #{list.size_remaining} #{request_type} requests")
 end
 
 # Assert that the test Server hasn't received any requests - of a specific, or any, type.
@@ -70,11 +149,11 @@ Then('I should receive no {word}') do |request_type|
   sleep Maze.config.receive_no_requests_wait
   if request_type == 'requests'
     # Assert that the test Server hasn't received any requests at all.
-    Maze.check.equal(0, Maze::Server.errors.size, "#{Maze::Server.errors.size} errors received")
-    Maze.check.equal(0, Maze::Server.sessions.size, "#{Maze::Server.sessions.size} sessions received")
+    Maze.check.equal(0, Maze::Server.errors.size_remaining, "#{Maze::Server.errors.size_remaining} errors received")
+    Maze.check.equal(0, Maze::Server.sessions.size_remaining, "#{Maze::Server.sessions.size_remaining} sessions received")
   else
     list = Maze::Server.list_for(request_type)
-    Maze.check.equal(0, list.size, "#{list.size} #{request_type} received")
+    Maze.check.equal(0, list.size_remaining, "#{list.size_remaining} #{request_type} received")
   end
 end
 

data/lib/features/steps/runner_steps.rb

@@ -97,6 +97,28 @@ When('I run the service {string} with the command') do |service, command|
   Maze::Docker.start_service(service, command: one_line_cmd)
 end
 
+# Executes a command in the given docker compose service.
+#
+# The service must already be running for this to succeed as it uses 'docker
+# compose exec'.
+#
+# @step_input command [String] The command to run inside the service
+# @step_input service [String] The name of the service
+When('I execute the command {string} in the service {string}') do |command, service|
+  Maze::Docker.exec(service, command)
+end
+
+# Executes a command in the given docker compose service in the background.
+#
+# The service must already be running for this to succeed as it uses 'docker
+# compose exec --detach'.
+#
+# @step_input command [String] The command to run inside the service
+# @step_input service [String] The name of the service
+When('I execute the command {string} in the service {string} in the background') do |command, service|
+  Maze::Docker.exec(service, command, detach: true)
+end
+
 # Allows validation of the last exit code of the last run docker-compose command.
 # Will fail if no commands have been run.
 #

data/lib/features/steps/session_tracking_steps.rb

@@ -36,7 +36,7 @@ Then('the session is valid for the session reporting API version {string} for th
     And the session "Content-Type" header equals "application/json"
     And the session "Bugsnag-Sent-At" header is a timestamp
 
-    And the session payload field "notifier.name" matches the regex "(Android|iOS) Bugsnag Notifier"
+    And the session payload field "notifier.name" matches the regex "(Bugsnag React Native|(Android|iOS) Bugsnag Notifier)"
     And the session payload field "notifier.url" is not null
     And the session payload field "notifier.version" is not null