bugsnag-maze-runner 6.27.0 → 7.22.1

data/lib/maze/option/parser.rb

@@ -26,16 +26,25 @@ module Maze
             text ''
             text 'General options:'
 
+            opt Option::AWS_PUBLIC_IP,
+                'Intended for use on Buildkite with the Elastic CI Stack for CI.  Enables awareness of being run with a public IP address.',
+                type: :boolean,
+                default: false
+
             opt Option::ENABLE_RETRIES,
                 'Enables retrying failed scenarios when tagged',
                 type: :boolean,
                 default: true
 
             opt Option::ENABLE_BUGSNAG,
-                'Enables reporting to Bugsnag on scenario failure (Require MAZE_BUGSNAG_API_KEY)',
+                'Enables reporting to Bugsnag on scenario failure (requires MAZE_BUGSNAG_API_KEY)',
                 type: :boolean,
                 default: true
 
+            opt Option::REPEATER_API_KEY,
+                'Enables forwarding of all received POST requests to Bugsnag, using the API key provided.  MAZE_REPEATER_API_KEY may also be set.',
+                type: :string
+
             text ''
             text 'Server options:'
 
@@ -65,10 +74,6 @@ module Maze
             text ''
             text 'Appium options:'
 
-            opt Option::SEPARATE_SESSIONS,
-                'Start a new Appium session for each scenario',
-                type: :boolean,
-                default: false
             opt Option::FARM,
                 'Device farm to use: "bs" (BrowserStack) or "local"',
                 type: :string
@@ -79,9 +84,6 @@ module Maze
                 'Locate elements by accessibility id rather than id',
                 type: :boolean,
                 default: false
-            opt Option::RESILIENT,
-                'Use the resilient Appium driver',
-                default: false
             opt Option::CAPABILITIES,
                 'Additional desired Appium capabilities as a JSON string',
                 default: '{}'
@@ -95,7 +97,7 @@ module Maze
                 type: :string,
                 multi: true
             opt Option::BROWSER,
-                'Browser to use (an entry in browsers_<farm>.yml)',
+                'Browser to use (an entry in <farm>_browsers.yml)',
                 short: :none,
                 type: :string
             opt Option::USERNAME,
@@ -108,22 +110,20 @@ module Maze
                 'The Appium version to use',
                 type: :string
             opt Option::LIST_DEVICES,
-                'Lists the devices available for the configured device-farm, or all devices if none are specified',
+                'Lists the devices available for the configured device farm, or all devices if none are specified',
                 default: false
             opt Option::APP_BUNDLE_ID,
                 'The bundle identifier of the test application',
                 type: :string
+            opt Option::TUNNEL,
+                'Start the device farm secure tunnel',
+                default: true
 
             # SmartBear-only options
             opt Option::SB_LOCAL,
                 '(SB only) Path to the SBSecureTunnel binary. MAZE_SB_LOCAL env var or "/SBSecureTunnel" by default',
                 type: :string
 
-            # Sauce Labs-only options
-            opt Option::SL_LOCAL,
-                '(SL only) Path to the Sauce Connect binary. MAZE_SL_LOCAL env var or "/sauce-connect/bin/sc" by default',
-                type: :string
-
             # BrowserStack-only options
             opt Option::BS_LOCAL,
                 '(BS only) Path to the BrowserStackLocal binary. MAZE_BS_LOCAL env var or "/BrowserStackLocal" by default',
@@ -209,9 +209,6 @@ module Maze
         # @returns [Hash] The options hash with environment vars added
         def populate_environmental_defaults(options)
           case options.farm
-          when 'cbt'
-            options[Option::USERNAME] ||= ENV['CBT_USERNAME']
-            options[Option::ACCESS_KEY] ||= ENV['CBT_ACCESS_KEY']
           when 'bs'
             # Allow browser/device credentials to exist in separate accounts
             if options[Option::BROWSER]
@@ -221,19 +218,17 @@ module Maze
               options[Option::USERNAME] ||= ENV['BROWSER_STACK_DEVICES_USERNAME'] || ENV['BROWSER_STACK_USERNAME']
               options[Option::ACCESS_KEY] ||= ENV['BROWSER_STACK_DEVICES_ACCESS_KEY'] ||ENV['BROWSER_STACK_ACCESS_KEY']
             end
-          when 'sl'
-            options[Option::USERNAME] ||= ENV['SAUCE_LABS_USERNAME']
-            options[Option::ACCESS_KEY] ||= ENV['SAUCE_LABS_ACCESS_KEY']
           when 'bb'
             options[Option::USERNAME] ||= ENV['BITBAR_USERNAME']
             options[Option::ACCESS_KEY] ||= ENV['BITBAR_ACCESS_KEY']
             options[Option::TMS_URI] ||= ENV['MAZE_TMS_URI']
           end
+
+          options[Option::REPEATER_API_KEY] ||= ENV['MAZE_REPEATER_API_KEY']
           options[Option::SB_LOCAL] ||= ENV['MAZE_SB_LOCAL'] || '/SBSecureTunnel'
           options[Option::TMS_URI] ||= ENV['MAZE_TMS_URI']
           options[Option::TMS_TOKEN] ||= ENV['MAZE_TMS_TOKEN']
           options[Option::BS_LOCAL] ||= ENV['MAZE_BS_LOCAL'] || '/BrowserStackLocal'
-          options[Option::SL_LOCAL] ||= ENV['MAZE_SL_LOCAL'] || '/sauce-connect/bin/sc'
           options[Option::APPIUM_SERVER] ||= ENV['MAZE_APPIUM_SERVER'] || 'http://localhost:4723/wd/hub'
           options[Option::APPLE_TEAM_ID] ||= ENV['MAZE_APPLE_TEAM_ID']
           options[Option::UDID] ||= ENV['MAZE_UDID']

data/lib/maze/option/processor.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative '../option'
-require_relative '../browser_stack_devices'
 
 module Maze
   module Option
@@ -19,10 +18,12 @@ module Maze
           config.null_port = options[Maze::Option::NULL_PORT]
 
           # General options
+          config.aws_public_ip = options[Maze::Option::AWS_PUBLIC_IP]
           config.enable_retries = options[Maze::Option::ENABLE_RETRIES]
           config.enable_bugsnag = options[Maze::Option::ENABLE_BUGSNAG]
           config.tms_uri = options[Maze::Option::TMS_URI]
           config.tms_token = options[Maze::Option::TMS_TOKEN]
+          config.repeater_api_key = options[Maze::Option::REPEATER_API_KEY]
 
           # Document server options
           config.document_server_root = options[Maze::Option::DS_ROOT]
@@ -35,15 +36,11 @@ module Maze
           config.always_log = options[Maze::Option::ALWAYS_LOG]
 
           # General appium options
-          config.appium_session_isolation = options[Maze::Option::SEPARATE_SESSIONS]
           config.app = Maze::Helper.read_at_arg_file options[Maze::Option::APP]
-          config.resilient = options[Maze::Option::RESILIENT]
           farm = options[Maze::Option::FARM]
           config.farm = case farm
                         when nil then :none
-                        when 'cbt' then :cbt
                         when 'bs' then :bs
-                        when 'sl' then :sl
                         when 'bb' then :bb
                         when 'local' then :local
                         else
@@ -51,14 +48,11 @@ module Maze
                         end
           config.locator = options[Maze::Option::A11Y_LOCATOR] ? :accessibility_id : :id
           config.capabilities_option = options[Maze::Option::CAPABILITIES]
+          config.legacy_driver = !ENV['USE_LEGACY_DRIVER'].nil?
+          config.start_tunnel = options[Maze::Option::TUNNEL]
 
           # Farm specific options
           case config.farm
-          when :cbt
-            config.browser = options[Maze::Option::BROWSER]
-            config.sb_local = Maze::Helper.expand_path(options[Maze::Option::SB_LOCAL])
-            username = config.username = options[Maze::Option::USERNAME]
-            access_key = config.access_key = options[Maze::Option::ACCESS_KEY]
           when :bs
             device_option = options[Maze::Option::DEVICE]
             if device_option.nil? || device_option.empty?
@@ -71,46 +65,39 @@ module Maze
                 config.device = device_option
                 config.device_list = []
               end
-              config.os_version = Maze::BrowserStackDevices::DEVICE_HASH[config.device]['os_version'].to_f
+              if config.legacy_driver?
+                config.os_version = Maze::Client::Appium::BrowserStackDevices::DEVICE_HASH[config.device]['os_version'].to_f
+              else
+                config.os_version = Maze::Client::Appium::BrowserStackDevices::DEVICE_HASH[config.device]['platformVersion'].to_f
+              end
             end
             config.bs_local = Maze::Helper.expand_path(options[Maze::Option::BS_LOCAL])
             config.appium_version = options[Maze::Option::APPIUM_VERSION]
             username = config.username = options[Maze::Option::USERNAME]
             access_key = config.access_key = options[Maze::Option::ACCESS_KEY]
             config.appium_server_url = "http://#{username}:#{access_key}@hub-cloud.browserstack.com/wd/hub"
-          when :sl
-            device_option = options[Maze::Option::DEVICE]
-            if device_option.is_a?(Array)
-              config.device = device_option.first
-              config.device_list = device_option.drop(1)
-            else
-              config.device = device_option
-              config.device_list = []
-            end
-            config.browser = options[Maze::Option::BROWSER]
-            config.os = options[Maze::Option::OS]
-            config.os_version = options[Maze::Option::OS_VERSION].to_f
-            config.sl_local = Maze::Helper.expand_path(options[Maze::Option::SL_LOCAL])
-            config.appium_version = options[Maze::Option::APPIUM_VERSION]
-            username = config.username = options[Maze::Option::USERNAME]
-            access_key = config.access_key = options[Maze::Option::ACCESS_KEY]
-            config.appium_server_url = "https://#{username}:#{access_key}@ondemand.us-west-1.saucelabs.com/wd/hub"
           when :bb then
             config.username = options[Maze::Option::USERNAME]
             config.access_key = options[Maze::Option::ACCESS_KEY]
             config.tms_uri = options[Maze::Option::TMS_URI]
             device_option = options[Maze::Option::DEVICE]
-            if device_option.is_a?(Array)
-              config.device = device_option.first
-              config.device_list = device_option.drop(1)
+            if device_option.nil? || device_option.empty?
+              # BitBar Web
+              config.browser = options[Maze::Option::BROWSER]
             else
-              config.device = device_option
-              config.device_list = []
+              # BitBar Devices
+              if device_option.is_a?(Array)
+                config.device = device_option.first
+                config.device_list = device_option.drop(1)
+              else
+                config.device = device_option
+                config.device_list = []
+              end
             end
             config.os = options[Maze::Option::OS]
             config.os_version = options[Maze::Option::OS_VERSION]
             config.sb_local = Maze::Helper.expand_path(options[Maze::Option::SB_LOCAL])
-            config.appium_server_url = 'https://appium.bitbar.com/wd/hub'
+            config.appium_server_url = 'https://us-west-mobile-hub.bitbar.com/wd/hub'
             config.app_bundle_id = options[Maze::Option::APP_BUNDLE_ID]
           when :local then
             if options[Maze::Option::BROWSER]

data/lib/maze/option/validator.rb

@@ -2,7 +2,6 @@
 
 require 'yaml'
 require_relative '../option'
-require_relative '../browser_stack_devices'
 
 module Maze
   module Option
@@ -13,21 +12,32 @@ module Maze
       def validate(options)
         errors = []
 
+        #
         # Common options
+        #
+
+        # --farm
         farm = options[Option::FARM]
-        if farm && !%w[bs cbt sl local bb].include?(farm)
-          errors << "--#{Option::FARM} must be 'bs', 'cbt', 'sl', 'bb' or 'local' if provided"
+        if farm && !%w[bs local bb].include?(farm)
+          errors << "--#{Option::FARM} must be 'bs', 'bb' or 'local' if provided"
         end
 
+        # --capabilities
         begin
           JSON.parse(options[Option::CAPABILITIES])
         rescue JSON::ParserError
           errors << "--#{Option::CAPABILITIES} must be valid JSON (given #{options[Option::CAPABILITIES]})"
         end
 
+        # --repeater-api-key
+        key = options[Option::REPEATER_API_KEY]
+        key_regex = /^[0-9a-fA-F]{32}$/
+        if key && !key_regex.match?(key)
+          errors << "--#{Option::REPEATER_API_KEY} must be set to a 32-character hex value"
+        end
+
         # Farm specific options
         validate_bs options, errors if farm == 'bs'
-        validate_sl options, errors if farm == 'sl'
         validate_bitbar options, errors if farm == 'bb'
         validate_local options, errors if farm == 'local'
 
@@ -47,7 +57,7 @@ module Maze
           errors << "Either --#{Option::BROWSER} or --#{Option::DEVICE} must be specified"
         elsif browser
 
-          browsers = YAML.safe_load(File.read("#{__dir__}/../browsers_bs.yml"))
+          browsers = YAML.safe_load(File.read("#{__dir__}/../client/selenium/bs_browsers.yml"))
 
           unless browsers.include? browser
             browser_list = browsers.keys.join ', '
@@ -55,15 +65,14 @@ module Maze
           end
         elsif device
           device.each do |device_key|
-            next if Maze::BrowserStackDevices::DEVICE_HASH.key? device_key
-            errors << "Device type '#{device_key}' unknown on BrowserStack.  Must be one of #{Maze::BrowserStackDevices::DEVICE_HASH.keys}"
+            next if Maze::Client::Appium::BrowserStackDevices::DEVICE_HASH.key? device_key
+            errors << "Device type '#{device_key}' unknown on BrowserStack.  Must be one of #{Maze::Client::Appium::BrowserStackDevices::DEVICE_HASH.keys}"
           end
           # App
           app = Maze::Helper.read_at_arg_file options[Option::APP]
           if app.nil?
             errors << "--#{Option::APP} must be provided when running on a device"
           else
-            # TODO: What about Sauce Labs URLs?
             unless app.start_with?('bs://')
               app = Maze::Helper.expand_path app
               errors << "app file '#{app}' not found" unless File.exist?(app)
@@ -76,77 +85,39 @@ module Maze
         errors << "--#{Option::ACCESS_KEY} must be specified" if options[Option::ACCESS_KEY].nil?
       end
 
-      # Validates Sauce Labs options
-      def validate_sl(options, errors)
-        # SL local binary
-        sl_local = Maze::Helper.expand_path options[Option::SL_LOCAL]
-        errors << "Sauce Connect binary '#{sl_local}' not found" unless File.exist? sl_local
-
-        # Device
+      # Validates BitBar device options
+      def validate_bitbar(options, errors)
         browser = options[Option::BROWSER]
         device = options[Option::DEVICE]
-        os = options[Option::OS]
-        os_version = options[Option::OS_VERSION]
-        if browser.nil? && device.nil? && os.nil? && os_version.nil?
-          errors << 'A device or browser option must be specified'
-        elsif browser
-          errors << 'Browsers not yet implemented on Sauce Labs'
+
+        if ENV['BUILDKITE'] && browser
+          errors << "--#{Option::TMS_URI} must be specified when running on Buildkite" if options[Option::TMS_URI].nil?
         else
-          # App
+          errors << "--#{Option::USERNAME} must be specified" if options[Option::USERNAME].nil?
+          errors << "--#{Option::ACCESS_KEY} must be specified" if options[Option::ACCESS_KEY].nil?
+        end
+
+        # Device
+        if browser.nil? && device.empty?
+          errors << "Either --#{Option::BROWSER} or --#{Option::DEVICE} must be specified"
+        elsif browser
+          browsers = YAML.safe_load(File.read("#{__dir__}/../client/selenium/bb_browsers.yml"))
+
+          unless browsers.include? browser
+            browser_list = browsers.keys.join ', '
+            errors << "Browser type '#{browser}' unknown on BitBar.  Must be one of: #{browser_list}."
+          end
+        elsif device
           app = options[Option::APP]
           if app.nil?
             errors << "--#{Option::APP} must be provided when running on a device"
           else
-            uuid_regex = /\A[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}\z/
+            uuid_regex = /\A[0-9]+\z/
             unless uuid_regex.match? app
               app = Maze::Helper.expand_path app
               errors << "app file '#{app}' not found" unless File.exist?(app)
             end
           end
-
-          # OS
-          if options[Option::OS].nil?
-            errors << "--#{Option::OS} must be specified"
-          else
-            os = options[Option::OS].downcase
-            errors << 'os must be android or ios' unless %w[android ios].include? os
-          end
-
-          # OS Version
-          if options[Option::OS_VERSION].nil?
-            errors << "--#{Option::OS_VERSION} must be specified"
-          else
-            # Ensure OS version is a valid float so that notifier tests can perform numeric checks
-            # e.g 'Maze.config.os_version > 7'
-            unless /^[1-9][0-9]*(\.[0-9])?/.match? options[Option::OS_VERSION]
-              errors << "--#{Option::OS_VERSION} must be a valid version matching '/^[1-9][0-9]*(\\.[0-9])?/'"
-            end
-          end
-        end
-
-        # Credentials
-        errors << "--#{Option::USERNAME} must be specified" if options[Option::USERNAME].nil?
-        errors << "--#{Option::ACCESS_KEY} must be specified" if options[Option::ACCESS_KEY].nil?
-      end
-
-      # Validates BitBar device options
-      def validate_bitbar(options, errors)
-        if ENV['BUILDKITE']
-          errors << "--#{Option::TMS_URI} must be specified when running on Buildkite" if options[Option::TMS_URI].nil?
-        else
-          errors << "--#{Option::USERNAME} must be specified" if options[Option::USERNAME].nil?
-          errors << "--#{Option::ACCESS_KEY} must be specified" if options[Option::ACCESS_KEY].nil?
-        end
-
-        app = options[Option::APP]
-        if app.nil?
-          errors << "--#{Option::APP} must be provided when running on a device"
-        else
-          uuid_regex = /\A[0-9]+\z/
-          unless uuid_regex.match? app
-            app = Maze::Helper.expand_path app
-            errors << "app file '#{app}' not found" unless File.exist?(app)
-          end
         end
       end
 

data/lib/maze/option.rb

@@ -10,55 +10,53 @@ module Maze
 
     # Server options
     BIND_ADDRESS = 'bind-address'
-    PORT = 'port'
     NULL_PORT = 'null-port'
+    PORT = 'port'
 
     # Appium options
-    SEPARATE_SESSIONS = 'separate-sessions'
-    FARM = 'farm'
-    APP = 'app'
     A11Y_LOCATOR = 'a11y-locator'
-    RESILIENT = 'resilient'
+    APP = 'app'
     CAPABILITIES = 'capabilities'
+    FARM = 'farm'
 
     # Generic device farm options
-    USERNAME = 'username'
     ACCESS_KEY = 'access-key'
+    APP_BUNDLE_ID = 'app-bundle-id'
     APPIUM_VERSION = 'appium-version'
-    DEVICE = 'device'
     BROWSER = 'browser'
+    DEVICE = 'device'
+    LIST_DEVICES = 'list-devices'
     OS = 'os'
     OS_VERSION = 'os-version'
-    LIST_DEVICES = 'list-devices'
-    APP_BUNDLE_ID = 'app-bundle-id'
+    TUNNEL = 'tunnel'
+    USERNAME = 'username'
 
-    # CrossBrowserTesting/Bitbar options
+    # BitBar options
     SB_LOCAL = 'sb-local'
 
     # BrowserStack-only options
     BS_LOCAL = 'bs-local'
 
-    # Sauce Labs-only options
-    SL_LOCAL = 'sl-local'
-
     # BitBar-only options
     TMS_URI = 'tms-uri'
     TMS_TOKEN = 'tms-token'
 
     # Local-only options
-    APPIUM_SERVER = 'appium-server'
-    START_APPIUM = 'start-appium'
     APPIUM_LOGFILE = 'appium-logfile'
+    APPIUM_SERVER = 'appium-server'
     APPLE_TEAM_ID = 'apple-team-id'
+    START_APPIUM = 'start-appium'
     UDID = 'udid'
 
     # Logging options
+    ALWAYS_LOG = 'always-log'
     FILE_LOG = 'file-log'
     LOG_REQUESTS = 'log-requests'
-    ALWAYS_LOG = 'always-log'
 
-    # Runtime options
-    ENABLE_RETRIES = 'enable-retries'
+    # General options
+    AWS_PUBLIC_IP = 'aws-public-ip'
+    REPEATER_API_KEY = 'repeater-api-key'
     ENABLE_BUGSNAG = 'enable-bugsnag'
+    ENABLE_RETRIES = 'enable-retries'
   end
 end

data/lib/maze/plugins/cucumber_report_plugin.rb

@@ -88,7 +88,7 @@ module Maze
 
         begin
           http = Net::HTTP.new(uri.hostname, uri.port)
-          response = http.request(request)
+          http.request(request)
         rescue => e
           $logger.warn 'Report delivery attempt failed'
           $logger.warn e.message

data/lib/maze/plugins/error_code_plugin.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Maze
+  module Plugins
+    class ErrorCodePlugin < Cucumber::Core::Filter.new(:configuration)
+
+      def test_case(test_case)
+        configuration.on_event(:test_case_finished) do |event|
+
+          # Ensure we're in the correct test case, and the test failed
+          next unless event.test_case == test_case
+
+          error = event.result.failed? ? event.result.exception.class : nil
+          Maze::Hooks::ErrorCodeHook.last_test_error_class = error
+        end
+
+        super
+      end
+    end
+  end
+end

data/lib/maze/request_list.rb

@@ -10,12 +10,8 @@ module Maze
       @count = 0
     end
 
-    def empty?
-      @requests.empty?
-    end
-
     # The number of unprocessed/remaining requests in the list (not the total number actually held)
-    def size
+    def size_remaining
       @count
     end
 
@@ -78,5 +74,14 @@ module Maze
       sub_list.sort_by! { |r| DateTime.parse(r[:request][header]) }
       sub_list.each_with_index { |r, i| @requests[@current + i] = r }
     end
+
+    # Sorts the remaining elements of the list by the field given, if present in all of those elements
+    def sort_by!(key_path)
+      list = remaining
+
+      # Sort the list and overwrite in the main list
+      list.sort_by! { |r| Maze::Helper.read_key_path(r[:body], key_path) }
+      list.each_with_index { |r, i| @requests[@current + i] = r }
+    end
   end
 end

data/lib/maze/request_repeater.rb

@@ -0,0 +1,49 @@
+module Maze
+  # Repeats POST requests
+  module RequestRepeater
+
+    def do_POST(request, response)
+      repeat(request) if enabled?
+
+      super(request, response)
+    end
+
+    private
+
+    def enabled?
+      # enabled if the config option is on and this request type should be repeated
+      Maze.config.repeater_api_key && url_for_request_type
+    end
+
+    # @param request [HTTPRequest] The request to be repeated
+    def repeat(request)
+
+      # TODO Forwarding of internal errors to be considered later
+      return if request.header.keys.any? { |key| key.downcase == 'bugsnag-internal-error' }
+
+      url = url_for_request_type
+      http = Net::HTTP.new(url.host)
+      bugsnag_request = Net::HTTP::Post.new(url.path)
+
+      # Set all headers that are present
+      bugsnag_request.body = request.body
+      request.header.each {|key,value| bugsnag_request[key] = value }
+      bugsnag_request['bugsnag-api-key'] = Maze.config.repeater_api_key
+
+      # TODO Also overwrite apiKey in the payload, if present, recalculate the integrity header (handling
+      #   compressed payloads if the content-encoding header is set accordingly)
+
+      http.request(bugsnag_request)
+    end
+
+    def url_for_request_type
+      url = case @request_type
+            when :errors then 'https://notify.bugsnag.com/'
+            when :sessions then 'https://sessions.bugsnag.com/'
+            when :traces then 'https://otlp.bugsnag.com/v1/traces'
+            else return nil
+            end
+      URI.parse(url)
+    end
+  end
+end

data/lib/maze/retry_handler.rb

@@ -8,17 +8,6 @@ module Maze
   class RetryHandler
     class << self
 
-      # Errors which indicate a selenium/appium driver has crashed and needs to be restarted
-      DRIVER_ERRORS = [
-        Maze::Error::AppiumElementNotFoundError,
-
-        Selenium::WebDriver::Error::NoSuchElementError,
-        Selenium::WebDriver::Error::StaleElementReferenceError,
-        Selenium::WebDriver::Error::TimeoutError,
-        Selenium::WebDriver::Error::UnknownError,
-        Selenium::WebDriver::Error::WebDriverError
-      ].freeze
-
       # Acceptable tags to indicate a test should be restarted
       RETRY_TAGS = %w[@retry @retryable @retriable].freeze
 
@@ -32,7 +21,7 @@ module Maze
 
         if retry_on_driver_error?(event)
           $logger.warn "Retrying #{test_case.name} due to driver error: #{event.result.exception}"
-          if Maze.driver.is_a?(Maze::Driver::Appium) || Maze.driver.is_a?(Maze::Driver::ResilientAppium)
+          if Maze.driver.is_a?(Maze::Driver::Appium)
             Maze.driver.restart
           elsif Maze.driver.is_a?(Maze::Driver::Browser)
             Maze.driver.refresh
@@ -59,7 +48,9 @@ module Maze
       end
 
       def retry_on_driver_error?(event)
-        Maze.driver && DRIVER_ERRORS.include?(event.result.exception.class)
+        error_class = event.result.exception.class
+        maze_errors = Maze::Error::ERROR_CODES
+        Maze.driver && maze_errors.include?(error_class) && maze_errors[error_class][:retry]
       end
 
       def retry_on_tag?(test_case)