bugsnag-maze-runner 9.5.0 → 9.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae769213765ead600bb5d24630e7ee9e64cb9cd4a0af662d907254aad577b325
-  data.tar.gz: '08c6383f74a282fc41e04e5d12828ca27506da7205bbc979992794edc468c242'
+  metadata.gz: f948d5bf3980cb7514127f60fbecb2ffdb4484c8d19a484e39ebccaaaebda535
+  data.tar.gz: efb5c22b4c81824d63c2762ea0792ad6316dc8744660042b4c1d6357eb8b7a5c
 SHA512:
-  metadata.gz: 995669002344c3dd20206512b9a3cd1efa17db026d2355b5db6f0e1e5b4f4911113b13f2366919468acf5ff5c9d49361e143bfa918596f08a406c78a4ea4cc40
-  data.tar.gz: 7bf1354e0233fc6f760bb2b6fa35827cb597cb005f3d80ee3f2f9182c3379186817fb5dca4bf248d6c65eaa83b4bd43282164e858e9b437ed1629deb4bf39b64
+  metadata.gz: 100b68e6b60360ea1a0bad3eb51c2b7e28fce9328e0ebc5a8bfeba089621714cfb834d7c4ae568f4c88c7399ff2e2b0fef351cbf8dd97397b3fb4da5cd39644b
+  data.tar.gz: ba9d6bbf2e966981d14be78688c119967278d662b5c0cc166fedba5302c829a3e9b2e93a0c4dfefc30893c5a9cebd09e1f7408de7c71ee7986d3fe89995eb748

data/lib/features/support/internal_hooks.rb

@@ -238,17 +238,21 @@ AfterAll do
   # Ensure the logger output is in the correct location
   Maze::Hooks::LoggerHooks.after_all
 
-  maze_output = File.join(Dir.pwd, 'maze_output')
-  maze_output_zip = File.join(Dir.pwd, 'maze_output.zip')
-  # zip a folder with files and subfolders
-  Zip::File.open(maze_output_zip, Zip::File::CREATE) do |zipfile|
-    Dir["#{maze_output}/**/**"].each do |file|
-      zipfile.add(file.sub(Dir.pwd + '/', ''), file)
+  if Maze.config.file_log
+    # create a zip file from the maze_output directory
+    maze_output = File.join(Dir.pwd, 'maze_output')
+    maze_output_zip = File.join(Dir.pwd, 'maze_output.zip')
+    
+    # zip a folder with files and subfolders
+    Zip::File.open(maze_output_zip, Zip::File::CREATE) do |zipfile|
+      Dir["#{maze_output}/**/**"].each do |file|
+        zipfile.add(file.sub(Dir.pwd + '/', ''), file)
+      end
     end
-  end
 
-  # Move the zip file to the maze_output folder
-  FileUtils.mv(maze_output_zip, maze_output)
+    # Move the zip file to the maze_output folder
+    FileUtils.mv(maze_output_zip, maze_output)
+  end
 
   metrics = Maze::MetricsProcessor.new(Maze::Server.metrics)
   metrics.process

data/lib/maze/bugsnag_config.rb

@@ -32,6 +32,7 @@ module Maze
             end
           end
           config.middleware.use(AssertErrorMiddleware)
+          config.middleware.use(AmbiguousErrorMiddleware)
           config.add_metadata(:'buildkite', metadata)
           config.project_root = Dir.pwd
         end
@@ -67,5 +68,25 @@ module Maze
         @middleware.call(report)
       end
     end
+
+    class AmbiguousErrorMiddleware
+      AMBIGUOUS_ERROR_CLASSES = [
+        'Selenium::WebDriver::Error::ServerError',
+        'Selenium::WebDriver::Error::UnknownError'
+      ]
+
+      def initialize(middleware)
+        @middleware = middleware
+      end
+
+      def call(report)
+        first_ex = report.raw_exceptions.first
+        if AMBIGUOUS_ERROR_CLASSES.include?(first_ex.class.name)
+          report.grouping_hash = first_ex.class.name.to_s + first_ex.message.to_s
+        end
+
+        @middleware.call(report)
+      end
+    end
   end
 end

data/lib/maze/client/appium/bs_devices.rb

@@ -84,10 +84,8 @@ module Maze
               'IOS_16' => make_ios_hash('iPhone 14', '16'),
               'IOS_15' => make_ios_hash('iPhone 11 Pro', '15'),
               'IOS_14' => make_ios_hash('iPhone 11', '14'),
-              'IOS_13' => make_ios_hash('iPhone 8', '13'),
+              'IOS_13' => make_ios_hash('iPhone 11', '13'),
               'IOS_12' => make_ios_hash('iPhone 8', '12'),
-              'IOS_11' => make_ios_hash('iPhone 8', '11'),
-              'IOS_10' => make_ios_hash('iPhone 7', '10')
             }
 
             # Specific Android devices
@@ -100,10 +98,8 @@ module Maze
 
             add_android 'Google Pixel 2', '9.0', hash                         # ANDROID_9_0_GOOGLE_PIXEL_2
             add_android 'Samsung Galaxy Note 9', '8.1', hash                  # ANDROID_8_1_SAMSUNG_GALAXY_NOTE_9
-            add_android 'Samsung Galaxy J7 Prime', '8.1', hash                # ANDROID_8_1_SAMSUNG_GALAXY_J7_PRIME
             add_android 'Samsung Galaxy Tab S4', '8.1', hash                  # ANDROID_8_1_SAMSUNG_GALAXY_TAB_S4
             add_android 'Samsung Galaxy Tab S3', '8.0', hash                  # ANDROID_8_0_SAMSUNG_GALAXY_TAB_S3
-            add_android 'Google Pixel 2', '8.0', hash                         # ANDROID_8_0_GOOGLE_PIXEL_2
             add_android 'Samsung Galaxy S9', '8.0', hash                      # ANDROID_8_0_SAMSUNG_GALAXY_S9
             add_android 'Samsung Galaxy S9 Plus', '8.0', hash                 # ANDROID_8_0_SAMSUNG_GALAXY_S9_PLUS
 
@@ -119,18 +115,6 @@ module Maze
             add_ios 'iPhone 14 Pro', '16.0', hash                             # IOS_16_0_IPHONE_14_PRO
             add_ios 'iPhone 14 Pro Max', '16.0', hash                         # IOS_16_0_IPHONE_14_PRO_MAX
 
-            add_ios 'iPhone 8 Plus', '11.0', hash                             # IOS_11_0_IPHONE_8_PLUS
-            add_ios 'iPhone X', '11.0', hash                                  # IOS_11_0_IPHONE_X
-            add_ios 'iPhone SE', '11.0', hash                                 # IOS_11_0_IPHONE_SE
-            add_ios 'iPhone 6', '11.0', hash                                  # IOS_11_0_IPHONE_6
-            add_ios 'iPhone 6S', '11.0', hash                                 # IOS_11_0_IPHONE_6S
-            add_ios 'iPhone 6S Plus', '11.0', hash                            # IOS_11_0_IPHONE_6S_PLUS
-            add_ios 'iPad 5th', '11.0', hash                                  # IOS_11_0_IPAD_5TH
-            add_ios 'iPad Mini 4', '11.0', hash                               # IOS_11_0_IPAD_MINI_4
-            add_ios 'iPad Pro 9.7 2016', '11.0', hash                         # IOS_11_0_IPAD_PRO_9_7_2016
-            add_ios 'iPad 6th', '11.0', hash                                  # IOS_11_0_IPAD_6TH
-            add_ios 'iPad Pro 12.9', '11.0', hash                             # IOS_11_0_IPAD_PRO_12_9
-
             hash
           end
         end

data/lib/maze/server.rb

@@ -15,6 +15,12 @@ module Maze
     DEFAULT_STATUS_CODE = 200
 
     class << self
+
+      # Records the previous command UUID sent to the test fixture
+      #
+      # @return [String] The UUID of the last command sent
+      attr_accessor :last_command_uuid
+
       # Sets the response delay generator.
       #
       # @param generator [Maze::Generator] The new generator

data/lib/maze/servlets/command_servlet.rb

@@ -19,17 +19,7 @@ module Maze
 
         if request.query.empty?
           # Non-idempotent mode - return the "current" command
-          commands = Maze::Server.commands
-
-          if commands.size_remaining == 0
-            response.body = NOOP_COMMAND
-            response.status = 200
-          else
-            command = commands.current
-            response.body = JSON.pretty_generate(command)
-            response.status = 200
-            commands.next
-          end
+          send_current_command(response)
         else
           # Idempotent mode
           after_uuid = request.query['after']
@@ -44,6 +34,21 @@ module Maze
         response.header['Access-Control-Allow-Origin'] = '*'
       end
 
+      def send_current_command(response)
+        commands = Maze::Server.commands
+
+        if commands.size_remaining == 0
+          response.body = NOOP_COMMAND
+          response.status = 200
+        else
+          command = commands.current
+          Server.last_command_uuid = command[:uuid]
+          response.body = JSON.pretty_generate(command)
+          response.status = 200
+          commands.next
+        end
+      end
+
       def command_after(uuid, response)
         commands = Maze::Server.commands
         if uuid.empty?
@@ -52,14 +57,20 @@ module Maze
           index = commands.all.find_index {|command| command[:uuid] == uuid }
         end
         if index.nil?
-          msg = "Request invalid - there is no command with a UUID of #{uuid} to follow on from"
-          $logger.error msg
-          response.body = msg
-          response.status = 400
+          # If the UUID given matches the last UUID sent by the server, we can assume the fixture has failed to reset
+          if uuid.eql?(Server.last_command_uuid)
+            send_current_command(response)
+          else
+            msg = "Request invalid - there is no command with a UUID of #{uuid} to follow on from"
+            $logger.error msg
+            response.body = msg
+            response.status = 400
+          end
         else
           if index + 1 < commands.size_all
             # Respond with the next command in the queue
             command = commands.get(index + 1)
+            Server.last_command_uuid = command[:uuid]
             command_json = JSON.pretty_generate(command)
             response.body = command_json
             response.status = 200

data/lib/maze.rb

@@ -7,7 +7,7 @@ require_relative 'maze/timers'
 # Glues the various parts of MazeRunner together that need to be accessed globally,
 # providing an alternative to the proliferation of global variables or singletons.
 module Maze
-  VERSION = '9.5.0'
+  VERSION = '9.7.0'
 
   class << self
     attr_accessor :check, :driver, :internal_hooks, :mode, :start_time, :dynamic_retry, :public_address,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bugsnag-maze-runner
 version: !ruby/object:Gem::Version
-  version: 9.5.0
+  version: 9.7.0
 platform: ruby
 authors:
 - Steve Kirkland
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-12 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -454,11 +454,11 @@ files:
 - lib/maze/wait.rb
 - lib/utils/deep_merge.rb
 - lib/utils/selenium_money_patch.rb
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -473,8 +473,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Bugsnag API request validation harness
 test_files: []