bugsnag-maze-runner 8.7.1 → 8.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc04491f5a2ab05764c7622bb6d863770d693401a4fa3886ebd6b61e9de8abf5
-  data.tar.gz: d312dd4d44a914d5318c70064ab7c3418d89ac825ad23e946e242009446df9d8
+  metadata.gz: 03c53d6f8594ce559c2f2fb6296617d9b9f18227220b3a1148f297de154b8d60
+  data.tar.gz: 3ce0a4585f6caac3ed1291f8a9ca8921926dbe551dd298ea6d8c8299136a67c5
 SHA512:
-  metadata.gz: 5fb2614e973afa9c02d39cf5bb7d61bec9230872a46c0daea9817a36974c2dee5daeeaef0bcc26ba7c679f976e7ea1ee008188d5c35e3b6a9b2dbd00b2c6bd05
-  data.tar.gz: ba90b23423c04f27c6d4def29a85a73fe07ae106f8dbbb8a32aa0d76c6d3c16b0428878913f4cf3010694ce91c72ce409da195b2db10a4561a8194eb9303b629
+  metadata.gz: cf7ef0e05814ee96ddcc363de952c0f56cce6c98721ef3bf79ad7ade296d7390d5dc513efb1ac83645aba734a957c685fea9290d4980cf0de5986544340d34ae
+  data.tar.gz: 7a967300d0dfcba750dfbce12c31a70e3793d98c822d35de70ec9838658e8436bad3962668bd70a50ff087236c74b174332b899406e906f42cbdf2475b643aea

data/lib/maze/bugsnag_config.rb

@@ -21,6 +21,7 @@ module Maze
             'pipeline': ENV['BUILDKITE_PIPELINE_NAME'],
             'repo': ENV['BUILDKITE_REPO'],
             'build url': ENV['BUILDKITE_BUILD_URL'],
+            'job url': ENV['BUILDKITE_BUILD_URL'] + "#" + ENV['BUILDKITE_JOB_ID'],
             'branch': ENV['BUILDKITE_BRANCH'],
             'builder': ENV['BUILDKITE_BUILD_CREATOR'],
             'message': ENV['BUILDKITE_MESSAGE'],

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

@@ -30,10 +30,11 @@ module Maze
 
         def device_capabilities
           config = Maze.config
-          prefix = BitBarDevices.caps_prefix(config.appium_version)
           capabilities = {
-            "#{prefix}noReset" => true,
-            "#{prefix}newCommandTimeout" => 600,
+            'appium:options' => {
+              'noReset' => true,
+              'newCommandTimeout' => 600
+            },
             'bitbar:options' => {
               # Some capabilities probably belong in the top level
               # of the hash, but BitBar picks them up from here.

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

@@ -41,18 +41,11 @@ module Maze
             Maze.config.os = platform
             Maze.config.os_version = platform_version.to_f.floor
 
-            prefix = caps_prefix(Maze.config.appium_version)
-
             case platform
             when 'android'
-              automation_name = if platform_version.start_with?('5')
-                                  'UiAutomator1'
-                                else
-                                  'UiAutomator2'
-                                end
-              make_android_hash(device_name, automation_name, prefix)
+              make_android_hash(device_name)
             when 'ios'
-              make_ios_hash(device_name, prefix)
+              make_ios_hash(device_name)
             else
               throw "Invalid device platform specified #{platform}"
             end
@@ -98,34 +91,35 @@ module Maze
             end
           end
 
-          def make_android_hash(device, automation_name, prefix='appium:')
+          def make_android_hash(device)
             hash = {
-              'automationName' => automation_name,
               'platformName' => 'Android',
               'deviceName' => 'Android Phone',
+              'appium:options' => {
+                'automationName' => 'UiAutomator2',
+                'autoGrantPermissions' => true,
+                'uiautomator2ServerInstallTimeout' => 60000
+              },
               'bitbar:options' => {
-                "#{prefix}autoGrantPermissions" => true,
                 'device' => device,
               }
             }
             hash.freeze
           end
 
-          def make_ios_hash(device, prefix='appium:')
+          def make_ios_hash(device)
             {
-              'automationName' => 'XCUITest',
-              'deviceName' => 'iPhone device',
               'platformName' => 'iOS',
-              "#{prefix}shouldTerminateApp" => 'true',
+              'deviceName' => 'iPhone device',
+              'appium:options' => {
+                'automationName' => 'XCUITest',
+                'shouldTerminateApp' => 'true'
+              },
               'bitbar:options' => {
                 'device' => device
               }
             }.freeze
           end
-
-          def caps_prefix(appium_version)
-            appium_version.nil? || (appium_version.to_i >= 2) ? 'appium:' : ''
-          end
         end
       end
     end

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

@@ -79,6 +79,7 @@ module Maze
               'ANDROID_7' => make_android_hash('Google Pixel', '7.1'),
 
               # iOS devices
+              'IOS_17' => make_ios_hash('iPhone 15', '17'),
               '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'),
@@ -110,6 +111,9 @@ module Maze
             add_android 'Samsung Galaxy S8', '7.0', hash                      # ANDROID_7_0_SAMSUNG_GALAXY_S8
 
             # Specific iOS devices
+            add_ios 'iPhone 15', '17.0', hash                                 # IOS_17_0_IPHONE_15
+            add_ios 'iPhone 12 Pro', '17.0', hash                             # IOS_17_0_IPHONE_12_PRO
+
             add_ios 'iPhone 14 Plus', '16.0', hash                            # IOS_16_0_IPHONE_14_PLUS
             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

data/lib/maze/client/selenium/bb_browsers.yml

@@ -1,22 +1,14 @@
-chrome_latest:
+chrome:
   platform: 'Windows'
   osVersion: '11'
   browserName: 'chrome'
-  version: 'latest'
   resolution: '1920x1080'
 
-chrome_108:
-  platform: 'Windows'
-  osVersion: '11'
-  browserName: 'chrome'
-  version: '108'
-  resolution: '1920x1080'
-
-chrome_107:
+chrome_latest:
   platform: 'Windows'
   osVersion: '11'
   browserName: 'chrome'
-  version: '107'
+  version: 'latest'
   resolution: '1920x1080'
 
 chrome_72:
@@ -33,53 +25,17 @@ chrome_43:
   version: '43'
   resolution: '1920x1080'
 
-firefox_latest:
-  platform: 'Windows'
-  osVersion: '11'
-  browserName: 'firefox'
-  version: 'latest'
-  resolution: '1920x1080'
-
-firefox_107:
+firefox:
   platform: 'Windows'
   osVersion: '11'
   browserName: 'firefox'
-  version: '107'
   resolution: '1920x1080'
 
-firefox_106:
-  platform: 'Windows'
-  osVersion: '11'
-  browserName: 'firefox'
-  version: '106'
-  resolution: '1920x1080'
-
-firefox_105:
-  platform: 'Windows'
-  osVersion: '11'
-  browserName: 'firefox'
-  version: '105'
-  resolution: '1920x1080'
-
-firefox_104:
-  platform: 'Windows'
-  osVersion: '11'
-  browserName: 'firefox'
-  version: '104'
-  resolution: '1920x1080'
-
-firefox_103:
-  platform: 'Windows'
-  osVersion: '11'
-  browserName: 'firefox'
-  version: '103'
-  resolution: '1920x1080'
-
-firefox_102:
+firefox_latest:
   platform: 'Windows'
   osVersion: '11'
   browserName: 'firefox'
-  version: '102'
+  version: 'latest'
   resolution: '1920x1080'
 
 firefox_78:
@@ -96,6 +52,12 @@ ie_11:
   version: '11'
   resolution: '1920x1080'
 
+edge:
+  platform: 'Windows'
+  osVersion: '11'
+  browserName: 'MicrosoftEdge'
+  resolution: '1920x1080'
+
 edge_latest:
   platform: 'Windows'
   osVersion: '11'

data/lib/maze/client/selenium/bb_client.rb

@@ -8,8 +8,10 @@ module Maze
           capabilities['bitbar_apiKey'] = config.access_key
           browsers = YAML.safe_load(File.read("#{__dir__}/bb_browsers.yml"))
           capabilities.merge! BitBarClientUtils.dashboard_capabilities
+          capabilities['version'] = config.browser_version unless config.browser_version.nil?
           capabilities.merge! browsers[config.browser]
           capabilities.merge! JSON.parse(config.capabilities_option)
+          capabilities['bitbar:options']['testTimeout'] = 900
           config.capabilities = capabilities
 
           if Maze::Client::BitBarClientUtils.use_local_tunnel?
@@ -20,6 +22,8 @@ module Maze
           end
 
           selenium_url = Maze.config.selenium_server_url
+
+          $logger.trace "Starting Selenium driver with capabilities: #{config.capabilities.to_json}"
           Maze.driver = Maze::Driver::Browser.new :remote, selenium_url, config.capabilities
           Maze.driver.start_driver
         end

data/lib/maze/client/selenium/bs_browsers.yml

@@ -138,6 +138,12 @@ ios_16:
   osVersion: "16"
   realMobile: true
 
+ios_17:
+  device: "iPhone 15"
+  os: "ios"
+  osVersion: "17"
+  realMobile: true
+
 android_4:
   browserName: "Android Browser"
   device: "Google Nexus 5"

data/lib/maze/configuration.rb

@@ -134,6 +134,9 @@ module Maze
     # Test browser type
     attr_accessor :browser
 
+    # Test browser version
+    attr_accessor :browser_version
+
     # Appium version to use
     attr_accessor :appium_version
 

data/lib/maze/macos_utils.rb

@@ -4,11 +4,11 @@ module Maze
   class MacosUtils
     class << self
       def capture_screen(scenario)
-        path = File.join(File.join(Dir.pwd, 'maze_output'), 'failed', Maze::Helper.to_friendly_filename(scenario.name))
-        FileUtils.makedirs(path)
+        path = Maze::MazeOutput.new(scenario).output_folder
+        FileUtils.makedirs(path) unless File.exist?(path)
 
-        system("/usr/sbin/screencapture #{path}/#{Maze::Helper.to_friendly_filename(scenario.name)}-screenshot.jpg")
+        system('/usr/sbin/screencapture', "#{path}/#{Maze::Helper.to_friendly_filename(scenario.name)}-screenshot.jpg")
       end
     end
   end
-end
+end

data/lib/maze/maze_output.rb

@@ -97,8 +97,6 @@ module Maze
       end
     end
 
-    private
-
     # Determines the output folder for the scenario
     def output_folder
       folder1 = File.join(Dir.pwd, 'maze_output')

data/lib/maze/option/parser.rb

@@ -122,6 +122,10 @@ module Maze
                 'Browser to use (an entry in <farm>_browsers.yml)',
                 short: :none,
                 type: :string
+            opt Option::BROWSER_VERSION,
+                'Browser version to use (applies to entries in <farm>_browsers.yml that do not include a version)',
+                short: :none,
+                type: :string
             opt Option::USERNAME,
                 'Device farm username. Consumes env var from environment based on farm set',
                 short: :none,

data/lib/maze/option/processor.rb

@@ -83,6 +83,7 @@ module Maze
             if device_option.nil? || device_option.empty?
               # BitBar Web
               config.browser = options[Maze::Option::BROWSER]
+              config.browser_version = options[Maze::Option::BROWSER_VERSION]
             else
               # BitBar Devices
               if device_option.is_a?(Array)

data/lib/maze/option/validator.rb

@@ -99,7 +99,11 @@ module Maze
         elsif browser
           browsers = YAML.safe_load(File.read("#{__dir__}/../client/selenium/bb_browsers.yml"))
 
-          unless browsers.include? browser
+          if browsers.include? browser
+            if options[Option::BROWSER_VERSION].nil? && !browsers[browser].include?('version')
+              errors << "--#{Option::BROWSER_VERSION} must be specified for browser '#{browser}'"
+            end
+          else
             browser_list = browsers.keys.join ', '
             errors << "Browser type '#{browser}' unknown on BitBar.  Must be one of: #{browser_list}."
           end

data/lib/maze/option.rb

@@ -24,6 +24,7 @@ module Maze
     APP_BUNDLE_ID = 'app-bundle-id'
     APPIUM_VERSION = 'appium-version'
     BROWSER = 'browser'
+    BROWSER_VERSION = 'browser-version'
     DEVICE = 'device'
     LIST_DEVICES = 'list-devices'
     OS = 'os'

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 = '8.7.1'
+  VERSION = '8.9.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: 8.7.1
+  version: 8.9.0
 platform: ruby
 authors:
 - Steve Kirkland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber