bugsnag-maze-runner 7.33.1 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c0fe6adceef2d36fc8b8f708724e5d84c34d98faf6c117f66fa25d7435a2a5b
-  data.tar.gz: 47c7bdf5d1e073fa728058cdb89ef91beef450d4b24eb5c5b0ed225d8dd89450
+  metadata.gz: 1a8fe53083056182a02bfe2c64ef7e5f16a94dc9a2cf7908e07be82d630aa7ca
+  data.tar.gz: 232d9f91e5c489994e6b63a3f09f7b21edad67c01d88270b4365707cb5808c1c
 SHA512:
-  metadata.gz: 5731f8dc95636f088b60f7c7d43643f86888d9488d9b3668290f62f12c59eba98c15f0247a3503e099471c0a5cf439f26603a37804476d003fec86040b489e8c
-  data.tar.gz: 384e4a79f84d08fd9917e2e2ad4943a13c0ad8098bee5a58e060f1b2f138f24df700d449d758a5666f8250f93ca6d7cc4a05e545b25d4ae38565b8ea70d32334
+  metadata.gz: 9a4dd6596a3dd44a6090d7c84155e3e30f2cff5b530a5b765df9e4fedce1aa153c6120604b555e44b3933dd5567479dc0b509b84ba5be8624b6e735b7d3316c0
+  data.tar.gz: 501886299af0b042122474462a4fa92ac920d64122da62129bf35f8a624786dd158c88572ae4dafdbc66e023536193a6adb5979fdbd0a319fea9ca0e9ea680dd

data/bin/maze-runner

@@ -84,7 +84,6 @@ require_relative '../lib/maze/driver/appium'
 require_relative '../lib/maze/driver/browser'
 
 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_relative '../lib/maze/plugins/datadog_metrics_plugin'
@@ -117,6 +116,15 @@ class MazeRunnerEntry
       @args << '--strict-undefined' << '--strict-pending' << '--no-strict-flaky'
     end
 
+    # Expand by default
+    if @args.include?('--no-expand')
+      # Just remove it
+      @args = @args - ["--no-expand"]
+    else
+      # Expand
+      @args << "--expand"
+    end
+
     # Load internal steps and helper functions
     load_dir = File.expand_path(File.dirname(File.dirname(__FILE__))).freeze
     paths = Dir.glob("#{load_dir}/lib/features/**/*.rb")

data/bin/purge-projects

@@ -0,0 +1,66 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative '../lib/maze'
+require_relative '../lib/maze/client/bb_api_client'
+require_relative '../lib/maze/logger'
+require_relative '../lib/maze/helper'
+require 'optimist'
+require 'uri'
+require 'net/http'
+
+class PurgeProjectEntry
+  def start(_args)
+    p = Optimist::Parser.new do
+      text 'Purge anonymous projects from BitBar'
+      text ''
+      text 'Requires BITBAR_API_KEY'
+      text ''
+      text 'Usage [OPTIONS]'
+      text ''
+      opt :help,
+          'Print this help.'
+      opt :api_key,
+          "BitBar API Key",
+          :type => :string
+    end
+
+    opts = Optimist::with_standard_exception_handling p do
+      p.parse ARGV
+    end
+
+    api_key = opts[:api_key] || ENV['BITBAR_API_KEY']
+
+    if api_key.nil?
+      $logger.warn "API KEY has not been provided or BITBAR_API_KEY has not been set"
+      Optimist::with_standard_exception_handling p do
+        raise Optimist::HelpNeeded
+      end
+    end
+
+    $logger.info "Getting list of anonymous project from BitBar"
+
+    api_client = Maze::Client::BitBarApiClient.new(api_key)
+
+    project_list = api_client.get_projects /Project \d+/
+
+    if project_list.nil?
+      $logger.info "No projects to process"
+    else
+      $logger.info "#{project_list.count} projects to process"
+
+      project_list.each do |name, id|
+        $logger.info "Processing #{name}"
+        res = api_client.delete_project id
+        if res.code == "204"
+          $logger.info "#{name} deleted"
+        else
+          $logger.warn "Failed to delete #{name}"
+          raise res.body
+        end
+      end
+    end
+  end
+end
+
+PurgeProjectEntry.new.start(ARGV)

data/lib/features/steps/app_automator_steps.rb

@@ -58,6 +58,12 @@ When('I send the keys {string} to the element {string}') do |keys, element_id|
   Maze.driver.send_keys_to_element(element_id, keys)
 end
 
+# Set the device orientation to either portrait or landscape
+# Requires a running Appium driver
+When('I set the device orientation to {orientation}') do |orientation|
+  Maze.driver.set_rotation orientation
+end
+
 # Tests that the given payload value is correct for the target BrowserStack platform.
 # This step will assume the expected and payload values are strings.
 # If the step is invoked when a remote BrowserStack device is not in use this step will fail.
@@ -73,7 +79,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field_path [String] The field to test
 # @step_input platform_values [DataTable] A table of acceptable values for each platform
-Then('the {word} payload field {string} equals the platform-dependent string:') do |request_type, field_path, platform_values|
+Then('the {request_type} payload field {string} equals the platform-dependent string:') do |request_type, field_path, platform_values|
   test_string_platform_values(request_type, field_path, platform_values)
 end
 
@@ -100,7 +106,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field_path [String] The field to test
 # @step_input platform_values [DataTable] A table of acceptable values for each platform
-Then('the {word} payload field {string} equals the platform-dependent numeric:') do |request_type, field_path, platform_values|
+Then('the {request_type} payload field {string} equals the platform-dependent numeric:') do |request_type, field_path, platform_values|
   test_numeric_platform_values(request_type, field_path, platform_values)
 end
 
@@ -127,7 +133,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field_path [String] The field to test
 # @step_input platform_values [DataTable] A table of acceptable values for each platform
-Then('the {word} payload field {string} equals the platform-dependent boolean:') do |request_type, field_path, platform_values|
+Then('the {request_type} payload field {string} equals the platform-dependent boolean:') do |request_type, field_path, platform_values|
   test_boolean_platform_values(request_type, field_path, platform_values)
 end
 

data/lib/features/steps/header_steps.rb

@@ -6,20 +6,24 @@
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input header_name [String] The header to test
-Then('the {word} {string} header is not null') do |request_type, header_name|
+Then('the {request_type} {string} header is present') do |request_type, header_name|
   Maze.check.not_nil(Maze::Server.list_for(request_type).current[:request][header_name],
                      "The #{request_type} '#{header_name}' header should not be null")
+
+  request = Maze::Server.list_for(request_type).current[:request]
+  Maze.check.true(request.header.key?(header_name.downcase),
+                  "The #{request_type} '#{header_name}' header should be present")
 end
 
 # Tests that a request header is null
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input header_name [String] The header to test
-Then('the {word} {string} header is null') do |request_type, header_name|
+Then('the {request_type} {string} header is not present') do |request_type, header_name|
   request = Maze::Server.list_for(request_type).current[:request]
 
-  Maze.check.nil(request[header_name],
-                 "The #{request_type} '#{header_name}' header should be null")
+  Maze.check.false(request.header.key?(header_name.downcase),
+                   "The #{request_type} '#{header_name}' header should not be present")
 end
 
 # Tests that request header equals a string
@@ -27,7 +31,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input header_name [String] The header to test
 # @step_input header_value [String] The string it should match
-Then('the {word} {string} header equals {string}') do |request_type, header_name, header_value|
+Then('the {request_type} {string} header equals {string}') do |request_type, header_name, header_value|
   Maze.check.not_nil(Maze::Server.list_for(request_type).current[:request][header_name],
                      "The #{request_type} '#{header_name}' header wasn't present in the request")
   Maze.check.equal(header_value, Maze::Server.list_for(request_type).current[:request][header_name])
@@ -38,7 +42,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input header_name [String] The header to test
 # @step_input regex_string [String] The regex to match with
-Then('the {word} {string} header matches the regex {string}') do |request_type, header_name, regex_string|
+Then('the {request_type} {string} header matches the regex {string}') do |request_type, header_name, regex_string|
   regex = Regexp.new(regex_string)
   value = Maze::Server.list_for(request_type).current[:request][header_name]
   Maze.check.match(regex, value)
@@ -49,7 +53,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input header_name [String] The header to test
 # @step_input header_values [DataTable] A parsed data table
-Then('the {word} {string} header equals one of:') do |request_type, header_name, header_values|
+Then('the {request_type} {string} header equals one of:') do |request_type, header_name, header_values|
   Maze.check.include(header_values.raw.flatten, Maze::Server.list_for(request_type).current[:request][header_name])
 end
 
@@ -57,7 +61,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input header_name [String] The header to test
-Then('the {word} {string} header is a timestamp') do |request_type, header_name|
+Then('the {request_type} {string} header is a timestamp') do |request_type, header_name|
   header = Maze::Server.list_for(request_type).current[:request][header_name]
   Maze.check.match(TIMESTAMP_REGEX, header)
 end
@@ -65,7 +69,7 @@ end
 # Checks that the Bugsnag-Integrity header is a SHA1 or simple digest
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
-When('the {word} Bugsnag-Integrity header is valid') do |request_type|
+When('the {request_type} Bugsnag-Integrity header is valid') do |request_type|
   Maze.check.true(Maze::Helper.valid_bugsnag_integrity_header(Maze::Server.list_for(request_type).current),
                   'Invalid Bugsnag-Integrity header detected')
 end

data/lib/features/steps/multipart_request_steps.rb

@@ -22,7 +22,7 @@ end
 # Verifies that any type of request contains multipart form-data
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
-Then('the {word} request is valid multipart form-data') do |request_type|
+Then('the {request_type} request is valid multipart form-data') do |request_type|
   list = Maze::Server.list_for request_type
   valid_multipart_form_data?(list.current)
 end
@@ -30,7 +30,7 @@ end
 # Verifies all requests of a given type contain multipart form-data
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
-Then('all {word} requests are valid multipart form-data') do |request_type|
+Then('all {request_type} requests are valid multipart form-data') do |request_type|
   list = Maze::Server.list_for request_type
   list.all.all? { |request| valid_multipart_form_data?(request) }
 end
@@ -39,7 +39,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input part_count [Integer] The number of expected fields
-Then('the {word} multipart request has {int} fields') do |request_type, part_count|
+Then('the {request_type} multipart request has {int} fields') do |request_type, part_count|
   list = Maze::Server.list_for request_type
   parts = list.current[:body]
   Maze.check.equal(part_count, parts.size)
@@ -48,7 +48,7 @@ end
 # Tests a given type of multipart request has at least one field.
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
-Then('the {word} multipart request has a non-empty body') do |request_type|
+Then('the {request_type} multipart request has a non-empty body') do |request_type|
   list = Maze::Server.list_for request_type
   parts = list.current[:body]
   Maze.check.true(parts.size.positive?, "Multipart request payload contained #{parts.size} fields")
@@ -73,7 +73,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input json_path [String] Path to a JSON file relative to maze-runner root
-Then('the {word} multipart body does not match the JSON file in {string}') do |request_type, json_path|
+Then('the {request_type} multipart body does not match the JSON file in {string}') do |request_type, json_path|
   Maze.check.true(File.exist?(json_path), "'#{json_path}' does not exist")
   payload_list = Maze::Server.list_for request_type
   raw_payload_value = payload_list.current[:body]
@@ -88,7 +88,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input json_path [String] Path to a JSON file relative to maze-runner root
-Then('the {word} multipart body matches the JSON file in {string}') do |request_type, json_path|
+Then('the {request_type} multipart body matches the JSON file in {string}') do |request_type, json_path|
   Maze.check.true(File.exist?(json_path), "'#{json_path}' does not exist")
   payload_list = Maze::Server.list_for request_type
   raw_payload_value = payload_list.current[:body]
@@ -104,7 +104,7 @@ end
 # @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 json_path [String] Path to a JSON file relative to maze-runner root
-Then('the {word} multipart field {string} matches the JSON file in {string}') do |request_type, field_path, json_path|
+Then('the {request_type} multipart field {string} matches the JSON file in {string}') do |request_type, field_path, json_path|
   Maze.check.true(File.exist?(json_path), "'#{json_path}' does not exist")
   payload_list = Maze::Server.list_for request_type
   payload_value = JSON.parse(payload_list.current[:body][field_path].to_s)
@@ -117,7 +117,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input part_key [String] The key to the multipart element
-Then('the field {string} for multipart {word} is not null') do |part_key, request_type|
+Then('the field {string} for multipart {request_type} is not null') do |part_key, request_type|
   parts = Maze::Server.list_for(request_type).current[:body]
   Maze.check.not_nil(parts[part_key], "The field '#{part_key}' should not be null")
 end
@@ -126,7 +126,7 @@ end
 #
 # @step_input part_key [String] The key to the multipart element
 # @step_input request_type [String] The type of request (error, session, build, etc)
-Then('the field {string} for multipart {word} is null') do |part_key, request_type|
+Then('the field {string} for multipart {request_type} is null') do |part_key, request_type|
   parts = Maze::Server.list_for(request_type).current[:body]
   Maze.check.nil(parts[part_key], "The field '#{part_key}' should be null")
 end
@@ -136,7 +136,7 @@ end
 # @step_input part_key [String] The key to the multipart element
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input expected_value [String] The string to match against
-Then('the field {string} for multipart {word} equals {string}') do |part_key, request_type, expected_value|
+Then('the field {string} for multipart {request_type} equals {string}') do |part_key, request_type, expected_value|
   parts = Maze::Server.list_for(request_type).current[:body]
   Maze.check.equal(parts[part_key], expected_value)
 end

data/lib/features/steps/network_steps.rb

@@ -8,16 +8,6 @@ When('I wait for the host {string} to open port {string}') do |host, port|
   Maze::Network.wait_for_port(host, port)
 end
 
-# Sets the HTTP status code to be used for the next set of requests for a given connection type
-#
-# @step_input http_verb [String] The type of request this code will be used for
-# @step_input status_codes [String] A comma separated list of status codes to return
-When('I set the HTTP status code for the next {string} requests to {string}') do |http_verb, status_codes|
-  raise("Invalid HTTP verb: #{http_verb}") unless Maze::Server::ALLOWED_HTTP_VERBS.include?(http_verb)
-  codes = status_codes.split(',').map(&:strip)
-  Maze::Server.set_status_code_generator(create_defaulting_generator(codes, Maze::Server::DEFAULT_STATUS_CODE), http_verb)
-end
-
 # Sets 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
@@ -27,13 +17,13 @@ When('I set the HTTP status code for {string} requests to {int}') do |http_verb,
   Maze::Server.set_status_code_generator(Maze::Generator.new([status_code].cycle), http_verb)
 end
 
-# Sets the HTTP status code to be used for the next request for a given connection type
+# Sets the HTTP status code to be used for the next set of 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 the next {string} request to {int}') do |http_verb, status_code|
+# @step_input status_codes [String] One or more status codes to return, separated by commas
+When('I set the HTTP status code for the next {string} request(s) to {int_array}') do |http_verb, status_codes|
   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)
+  Maze::Server.set_status_code_generator(create_defaulting_generator(status_codes, Maze::Server::DEFAULT_STATUS_CODE), http_verb)
 end
 
 # Sets the HTTP status code to be used for all subsequent POST requests
@@ -43,18 +33,11 @@ When('I set the HTTP status code to {int}') do |status_code|
   step %{I set the HTTP status code for "POST" requests to #{status_code}}
 end
 
-# Sets the HTTP status code to be used for the next POST 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|
-  step %{I set the HTTP status code for the next "POST" request to #{status_code}}
-end
-
 # Sets the HTTP status code to be used for the next set of POST 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|
-  step %{I set the HTTP status code for the next "POST" requests to "#{status_codes}"}
+# @step_input status_codes [String] One or more status codes to return, separated by commas
+When('I set the HTTP status code for the next request(s) to {int_array}') do |status_codes|
+  step %{I set the HTTP status code for the next "POST" requests to #{status_codes.join ','}}
 end
 
 # Sets the sampling probability to be used for all subsequent trace responses

data/lib/features/steps/payload_steps.rb

@@ -6,7 +6,7 @@
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input fixture_path [String] Path to a JSON fixture
-Then('the {word} payload body does not match the JSON fixture in {string}') do |request_type, fixture_path|
+Then('the {request_type} payload body does not match the JSON fixture in {string}') do |request_type, fixture_path|
   payload_value = Maze::Server.list_for(request_type).current[:body]
   expected_value = JSON.parse(open(fixture_path, &:read))
   result = Maze::Compare.value(expected_value, payload_value)
@@ -17,7 +17,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input fixture_path [String] Path to a JSON fixture
-Then('the {word} payload body matches the JSON fixture in {string}') do |request_type, fixture_path|
+Then('the {request_type} payload body matches the JSON fixture in {string}') do |request_type, fixture_path|
   payload_value = Maze::Server.list_for(request_type).current[:body]
   expected_value = JSON.parse(open(fixture_path, &:read))
   result = Maze::Compare.value(expected_value, payload_value)
@@ -30,7 +30,7 @@ end
 # @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 fixture_path [String] Path to a JSON fixture
-Then('the {word} payload field {string} matches the JSON fixture in {string}') \
+Then('the {request_type}(|a b) payload field {string} matches the JSON fixture in {string}') \
 do |request_type, field_path, fixture_path|
   list = Maze::Server.list_for(request_type)
   payload_value = Maze::Helper.read_key_path(list.current[:body], field_path)
@@ -44,7 +44,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field_path [String] Path to the tested element
-Then('the {word} payload field {string} is true') do |request_type, field_path|
+Then('the {request_type} payload field {string} is true') do |request_type, field_path|
   list = Maze::Server.list_for(request_type)
   Maze.check.true(Maze::Helper.read_key_path(list.current[:body], field_path))
 end
@@ -53,7 +53,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field_path [String] Path to the tested element
-Then('the {word} payload field {string} is false') do |request_type, field_path|
+Then('the {request_type} payload field {string} is false') do |request_type, field_path|
   list = Maze::Server.list_for(request_type)
   Maze.check.false(Maze::Helper.read_key_path(list.current[:body], field_path))
 end
@@ -62,7 +62,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field_path [String] Path to the tested element
-Then('the {word} payload field {string} is null') do |request_type, field_path|
+Then('the {request_type} payload field {string} is null') do |request_type, field_path|
   list = Maze::Server.list_for(request_type)
   Maze.check.nil(Maze::Helper.read_key_path(list.current[:body], field_path))
 end
@@ -71,7 +71,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field_path [String] Path to the tested element
-Then('the {word} payload field {string} is not null') do |request_type, field_path|
+Then('the {request_type} payload field {string} is not null') do |request_type, field_path|
   list = Maze::Server.list_for(request_type)
   Maze.check.not_nil(Maze::Helper.read_key_path(list.current[:body], field_path))
 end
@@ -81,7 +81,7 @@ end
 # @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 int_value [Integer] The value to test against
-Then('the {word} payload field {string} equals {int}') do |request_type, field_path, int_value|
+Then('the {request_type} payload field {string} equals {int}') do |request_type, field_path, int_value|
   Maze.check.equal(int_value,
                    Maze::Helper.read_key_path(Maze::Server.list_for(request_type).current[:body], field_path))
 end
@@ -91,7 +91,7 @@ end
 # @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|
+Then('the {request_type} 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
@@ -102,7 +102,7 @@ end
 # @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|
+Then('the {request_type} 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,
@@ -114,7 +114,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field_path [String] The payload element to test
 # @step_input env_var [String] The environment variable to test against
-Then('the {word} payload field {string} equals the environment variable {string}') \
+Then('the {request_type} payload field {string} equals the environment variable {string}') \
 do |request_type, field_path, env_var|
   environment_value = ENV[env_var]
   Maze.check.false(environment_value.nil?, "The environment variable #{env_var} must not be nil")
@@ -129,7 +129,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field_path [String] The payload element to test
 # @step_input int_value [Integer] The value to compare against
-Then('the {word} payload field {string} is greater than {int}') do |request_type, field_path, int_value|
+Then('the {request_type} payload field {string} is greater than {int}') do |request_type, field_path, int_value|
   list = Maze::Server.list_for(request_type)
   value = Maze::Helper.read_key_path(list.current[:body], field_path)
   Maze.check.kind_of Integer, value
@@ -141,7 +141,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field_path [String] The payload element to test
 # @step_input int_value [Integer] The value to compare against
-Then('the {word} payload field {string} is less than {int}') do |request_type, field_path, int_value|
+Then('the {request_type} payload field {string} is less than {int}') do |request_type, field_path, int_value|
   list = Maze::Server.list_for(request_type)
   value = Maze::Helper.read_key_path(list.current[:body], field_path)
   Maze.check.kind_of Integer, value
@@ -154,7 +154,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field_path [String] The payload element to test
 # @step_input string_value [String] The string to test against
-Then('the {word} payload field {string} equals {string}') do |request_type, field_path, string_value|
+Then('the {request_type} payload field {string} equals {string}') do |request_type, field_path, string_value|
   list = Maze::Server.list_for(request_type)
   Maze.check.equal(string_value, Maze::Helper.read_key_path(list.current[:body], field_path))
 end
@@ -164,7 +164,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field_path [String] The payload element to test
 # @step_input string_value [String] The string to test against
-Then('the {word} payload field {string} starts with {string}') do |request_type, field_path, string_value|
+Then('the {request_type} payload field {string} starts with {string}') do |request_type, field_path, string_value|
   list = Maze::Server.list_for(request_type)
   value = Maze::Helper.read_key_path(list.current[:body], field_path)
   Maze.check.kind_of String, value
@@ -179,7 +179,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field_path [String] The payload element to test
 # @step_input string_value [String] The string to test against
-Then('the {word} payload field {string} ends with {string}') do |request_type, field_path, string_value|
+Then('the {request_type} payload field {string} ends with {string}') do |request_type, field_path, string_value|
   list = Maze::Server.list_for(request_type)
   value = Maze::Helper.read_key_path(list.current[:body], field_path)
   Maze.check.kind_of String, value
@@ -194,7 +194,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field [String] The payload element to test
 # @step_input count [Integer] The value expected
-Then('the {word} payload field {string} is an array with {int} elements') do |request_type, field, count|
+Then('the {request_type} payload field {string} is an array with {int} elements') do |request_type, field, count|
   list = Maze::Server.list_for(request_type)
   value = Maze::Helper.read_key_path(list.current[:body], field)
   Maze.check.kind_of Array, value
@@ -205,7 +205,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field [String] The payload element to test
-Then('the {word} payload field {string} is a non-empty array') do |request_type, field|
+Then('the {request_type} payload field {string} is a non-empty array') do |request_type, field|
   list = Maze::Server.list_for(request_type)
   value = Maze::Helper.read_key_path(list.current[:body], field)
   Maze.check.kind_of Array, value
@@ -217,7 +217,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field [String] The payload element to test
 # @step_input regex [String] The regex to test against
-Then('the {word} payload field {string} matches the regex {string}') do |request_type, field, regex_string|
+Then('the {request_type} payload field {string} matches the regex {string}') do |request_type, field, regex_string|
   regex = Regexp.new(regex_string)
   list = Maze::Server.list_for(request_type)
   value = Maze::Helper.read_key_path(list.current[:body], field)
@@ -228,7 +228,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input field [String] The payload element to test
-Then('the {word} payload field {string} is a parsable timestamp in seconds') do |request_type, field|
+Then('the {request_type} payload field {string} is a parsable timestamp in seconds') do |request_type, field|
   list = Maze::Server.list_for(request_type)
   value = Maze::Helper.read_key_path(list.current[:body], field)
   begin
@@ -245,7 +245,7 @@ end
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input key_path [String] The path to the tested array
 # @step_input element_key_path [String] The key for the expected element inside the array
-Then('each element in {word} payload field {string} has {string}') do |request_type, key_path, element_key_path|
+Then('each element in {request_type} payload field {string} has {string}') do |request_type, key_path, element_key_path|
   list = Maze::Server.list_for(request_type)
   value = Maze::Helper.read_key_path(list.current[:body], key_path)
   Maze.check.kind_of Array, value

data/lib/features/steps/query_parameter_steps.rb

@@ -7,7 +7,7 @@
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input parameter_name [String] The parameter to test
 # @step_input parameter_value [String] The expected value
-Then('the {word} {string} query parameter equals {string}') do |request_type, parameter_name, parameter_value|
+Then('the {request_type} {string} query parameter equals {string}') do |request_type, parameter_name, parameter_value|
   Maze.check.equal(parameter_value,
                    Maze::Helper.parse_querystring(Maze::Server.list_for(request_type).current)[parameter_name][0])
 end
@@ -16,7 +16,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input parameter_name [String] The parameter to test
-Then('the {word} {string} query parameter is not null') do |request_type, parameter_name|
+Then('the {request_type} {string} query parameter is not null') do |request_type, parameter_name|
   Maze.check.not_nil(Maze::Helper.parse_querystring(Maze::Server.list_for(request_type).current)[parameter_name][0],
                      "The '#{parameter_name}' query parameter should not be null")
 end
@@ -25,7 +25,7 @@ end
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
 # @step_input parameter_name [String] The parameter to test
-Then('the {word} {string} query parameter is a timestamp') do |request_type, parameter_name|
+Then('the {request_type} {string} query parameter is a timestamp') do |request_type, parameter_name|
   param = Maze::Helper.parse_querystring(Maze::Server.list_for(request_type).current)[parameter_name][0]
   Maze.check.match(TIMESTAMP_REGEX, param)
 end

data/lib/features/steps/request_assertion_steps.rb

@@ -49,12 +49,12 @@ def assert_received_requests(request_count, list, list_name, precise = true)
 end
 
 #
-# Error request assertions
+# Request assertions
 #
 # Shortcut to waiting to receive a single request of the given type
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
-Then('I wait to receive a(n) {word}') do |request_type|
+Then('I wait to receive a(n) {request_type}') do |request_type|
   step "I wait to receive 1 #{request_type}"
 end
 
@@ -65,7 +65,7 @@ end
 #
 # @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 {int} {word}') do |request_count, request_type|
+Then('I wait to receive {int} {request_type}') do |request_count, request_type|
   list = Maze::Server.list_for(request_type)
   assert_received_requests request_count, list, request_type
   list.sort_by_sent_at! request_count
@@ -78,7 +78,7 @@ end
 #
 # @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|
+Then('I wait to receive at least {int} {request_type}') do |request_count, request_type|
   list = Maze::Server.list_for(request_type)
   assert_received_requests request_count, list, request_type, false
 end
@@ -87,7 +87,7 @@ end
 #
 # @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|
+Then('I sort the {request_type} by the payload field {string}') do |request_type, field_path|
   list = Maze::Server.list_for(request_type)
   list.sort_by! field_path
 end
@@ -97,31 +97,24 @@ end
 #
 # @step_input min_received [Integer] The minimum amount of requests required to pass
 # @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|
+Then('I have received at least {int} {request_type}') do |min_received, request_type|
   list = Maze::Server.list_for(request_type)
   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.
 #
-# @step_input request_type [String] The type of request ('error', 'session', build, etc), or 'requests' to assert on all
-#   request types.
-Then('I should receive no {word}') do |request_type|
+# @step_input request_type [String] The type of request ('error', 'session', 'trace', sampling request', etc)
+Then('I should receive no {request_type}') 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_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_remaining, "#{list.size_remaining} #{request_type} received")
-  end
+  list = Maze::Server.list_for(request_type)
+  Maze.check.equal(0, list.size_remaining, "#{list.size_remaining} #{request_type} received")
 end
 
 # Moves to the next request
 #
 # @step_input request_type [String] The type of request (error, session, build, etc)
-Then('I discard the oldest {word}') do |request_type|
+Then('I discard the oldest {request_type}') do |request_type|
   raise "No #{request_type} to discard" if Maze::Server.list_for(request_type).current.nil?
 
   Maze::Server.list_for(request_type).next