bugsnag-maze-runner 7.27.0 → 7.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2158a5376e4ff1d6c63a70eb138c33a2021aa7baff47f28882821e62a09fd0f
-  data.tar.gz: cd74c9cc69173584b6bf4c28a7fbaffdc3e115db09b38bfc507242f14726689e
+  metadata.gz: a557d4bf1f5d2518fef4116fe4bceecc5b28f78d585ab0926296105e5284ff49
+  data.tar.gz: 6e2c3eed0f98e66d586c64186a77917bb93aa4dbb7f2e0704ab42fa4abb05eb6
 SHA512:
-  metadata.gz: 541182a68461d87cb7e2dd118cb6418fec9c4f3f2624622673ea12d16e695b81fd10ad6398e6a04c1446096a4c67e0b067f003687d326053258c20c77fc3e0cb
-  data.tar.gz: f033d06ba478c06163397026626b180cabdcbf7f2b246878d7415905c0af8a3ca46c26a044dbbf111599cc0860445ace5c8eb89b74d3a0f1d94cb9be907e2573
+  metadata.gz: 194edc4175cb7e7d9c2816d749e2b97a56b97885511762345d2ecdce4c07be4bf2a9de82415f26c127f20b8a1fc5fa0256e84ffcedff74eaf5ad4d017c006f19
+  data.tar.gz: c2a7a1998c8c2fa628165f1961483e0986942be71ad599e72aad19351984a27c6284007037f7779834fd16e43f3905f8b316d2a1742546c90234f999bd734f1e

data/lib/features/support/internal_hooks.rb

@@ -44,12 +44,6 @@ BeforeAll do
   Maze.run_uuid = SecureRandom.uuid
   $logger.info "UUID for this run: #{Maze.run_uuid}"
 
-  # Determine public IP if enabled
-  if Maze.config.aws_public_ip
-    Maze.public_address = Maze::AwsPublicIp.new.address
-    $logger.info "Public address: #{Maze.public_address}"
-  end
-
   # Start mock server
   Maze::Server.start
   Maze::Server.set_response_delay_generator(Maze::Generator.new [Maze::Server::DEFAULT_RESPONSE_DELAY].cycle)
@@ -66,6 +60,18 @@ BeforeAll do
   # This must happen after any client hooks have run, so that they can set the server root
   Maze::DocumentServer.start unless Maze.config.document_server_root.nil?
 
+  # Determine public IP if enabled
+  if Maze.config.aws_public_ip
+    public_ip = Maze::AwsPublicIp.new
+    Maze.public_address = public_ip.address
+    $logger.info "Public address: #{Maze.public_address}"
+
+    unless Maze.config.document_server_root.nil?
+      Maze.public_document_server_address = public_ip.document_server_address
+      $logger.info "Public document server address: #{Maze.public_document_server_address}"
+    end
+  end
+
   # An initial setup for total success status
   $success = true
 end

data/lib/maze/aws_public_ip.rb

@@ -1,16 +1,31 @@
 module Maze
   # Determines the public IP address and port when running on Buildkite with the Elastic CI Stack for AWS
   class AwsPublicIp
-    attr_reader :address
+    attr_reader :host
+    attr_reader :port
+    attr_reader :document_server_port
+
+    def address
+      "#{@ip}:#{@port}"
+    end
+
+    def document_server_address
+      return nil if @document_server_port.nil?
+
+      "#{@ip}:#{@document_server_port}"
+    end
 
     def initialize
       # This class is only relevant on Buildkite
       return unless ENV['BUILDKITE']
 
-      ip = determine_public_ip
-      port = determine_public_port
+      @ip = determine_public_ip
+      @port = determine_public_port Maze.config.port
+
+      unless Maze.config.document_server_root.nil?
+        @document_server_port = determine_public_port Maze.config.document_server_port
+      end
 
-      @address = "#{ip}:#{port}"
     end
 
     # Determines the public IP address of the running AWS instance
@@ -20,8 +35,9 @@ module Maze
       `curl --silent -XGET http://169.254.169.254/latest/meta-data/public-ipv4`
     end
 
-    # Determines the external port of the running Docker container that's associated with the port of the mock server
-    def determine_public_port
+    # Determines the external port of the running Docker container that's associated with the port given
+    # @param local_port Local port to find the external port for
+    def determine_public_port(local_port)
       port = 0
       count = 0
       max_attempts = 30
@@ -35,7 +51,7 @@ module Maze
           begin
             json_string = result[0][0].strip
             json_result = JSON.parse(json_string)
-            port = json_result['NetworkSettings']['Ports']["#{Maze.config.port}/tcp"][0]['HostPort']
+            port = json_result['NetworkSettings']['Ports']["#{local_port}/tcp"][0]['HostPort']
           rescue StandardError
             $logger.error "Unable to parse public port from: #{json_string}"
             return 0

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

@@ -6,7 +6,7 @@ module Maze
           config = Maze.config
           config.app = Maze::Client::BitBarClientUtils.upload_app config.access_key,
                                                                   config.app
-          if Maze.config.start_tunnel
+          if Maze::Client::BitBarClientUtils.use_local_tunnel?
             Maze::Client::BitBarClientUtils.start_local_tunnel config.sb_local,
                                                                config.username,
                                                                config.access_key
@@ -26,19 +26,19 @@ module Maze
 
         def device_capabilities
           config = Maze.config
+          prefix = BitBarDevices.caps_prefix(config.appium_version)
           capabilities = {
-            'noReset' => true,
+            "#{prefix}noReset" => true,
+            "#{prefix}newCommandTimeout" => 0,
             'bitbar:options' => {
               # Some capabilities probably belong in the top level
               # of the hash, but BitBar picks them up from here.
               'apiKey' => config.access_key,
               'app' => config.app,
               'findDevice' => false,
-              'testTimeout' => 7200,
-              'newCommandTimeout' => 0
+              'testTimeout' => 7200
             }
           }
-          capabilities['appiumVersion'] = config.appium_version unless config.appium_version.nil?
           capabilities.deep_merge! dashboard_capabilities
           capabilities.deep_merge! BitBarDevices.get_available_device(config.device)
           capabilities.deep_merge! JSON.parse(config.capabilities_option)
@@ -61,7 +61,7 @@ module Maze
 
         def stop_session
           super
-          if Maze.config.start_tunnel
+          if Maze::Client::BitBarClientUtils.use_local_tunnel?
             Maze::Client::BitBarClientUtils.stop_local_tunnel
           end
         end

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

@@ -40,6 +40,8 @@ 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')
@@ -49,7 +51,7 @@ module Maze
                                 end
               make_android_hash(device_name, automation_name)
             when 'ios'
-              make_ios_hash(device_name)
+              make_ios_hash(device_name, prefix)
             else
               throw "Invalid device platform specified #{platform}"
             end
@@ -108,18 +110,21 @@ module Maze
             hash.freeze
           end
 
-          def make_ios_hash(device)
+          def make_ios_hash(device, prefix='')
             {
               'automationName' => 'XCUITest',
               'deviceName' => 'iPhone device',
               'platformName' => 'iOS',
+              "#{prefix}shouldTerminateApp" => 'true',
               'bitbar:options' => {
-                'noReset' => 'true',
-                'shouldTerminateApp' => 'true',
                 '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/bb_client_utils.rb

@@ -123,6 +123,10 @@ module Maze
           end
         end
 
+        def use_local_tunnel?
+          Maze.config.start_tunnel && !Maze.config.aws_public_ip
+        end
+
         # Starts the BitBar local tunnel
         #
         # @param sb_local [String] path to the SBSecureTunnel binary

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

@@ -4,11 +4,6 @@ module Maze
       class BitBarClient < BaseClient
         def start_session
           config = Maze.config
-          if ENV['BUILDKITE']
-            credentials = Maze::Client::BitBarClientUtils.account_credentials config.tms_uri
-            config.username = credentials[:username]
-            config.access_key = credentials[:access_key]
-          end
           capabilities = ::Selenium::WebDriver::Remote::Capabilities.new
           capabilities['bitbar_apiKey'] = config.access_key
           browsers = YAML.safe_load(File.read("#{__dir__}/bb_browsers.yml"))
@@ -16,9 +11,16 @@ module Maze
           capabilities.merge! JSON.parse(config.capabilities_option)
           config.capabilities = capabilities
 
-          Maze::Client::BitBarClientUtils.start_local_tunnel config.sb_local,
-                                                             config.username,
-                                                             config.access_key
+          if Maze::Client::BitBarClientUtils.use_local_tunnel?
+            if ENV['BUILDKITE']
+              credentials = Maze::Client::BitBarClientUtils.account_credentials config.tms_uri
+              capabilities['bitbar_apiKey'] = credentials[:access_key]
+            end
+
+            Maze::Client::BitBarClientUtils.start_local_tunnel config.sb_local,
+                                                               config.username,
+                                                               config.access_key
+          end
 
           selenium_url = Maze.config.selenium_server_url
           Maze.driver = Maze::Driver::Browser.new :remote, selenium_url, config.capabilities
@@ -36,8 +38,10 @@ module Maze
 
         def stop_session
           super
-          Maze::Client::BitBarClientUtils.stop_local_tunnel
-          Maze::Client::BitBarClientUtils.release_account(Maze.config.tms_uri) if ENV['BUILDKITE']
+          if Maze::Client::BitBarClientUtils.use_local_tunnel?
+            Maze::Client::BitBarClientUtils.stop_local_tunnel
+            Maze::Client::BitBarClientUtils.release_account(Maze.config.tms_uri) if ENV['BUILDKITE']
+          end
         end
       end
     end

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

@@ -48,6 +48,12 @@ edge_80:
   os: "windows"
   os_version: "11"
 
+edge_latest:
+  browser: "edge"
+  browser_version: "latest"
+  os: "windows"
+  os_version: "11"
+
 safari_6:
   browserName: "safari"
   browserVersion: "6"

data/lib/maze/option/processor.rb

@@ -80,6 +80,7 @@ module Maze
             config.username = options[Maze::Option::USERNAME]
             config.access_key = options[Maze::Option::ACCESS_KEY]
             config.tms_uri = options[Maze::Option::TMS_URI]
+            config.appium_version = options[Maze::Option::APPIUM_VERSION]
             device_option = options[Maze::Option::DEVICE]
             if device_option.nil? || device_option.empty?
               # BitBar Web

data/lib/maze.rb

@@ -7,10 +7,11 @@ 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 = '7.27.0'
+  VERSION = '7.29.0'
 
   class << self
-    attr_accessor :check, :driver, :internal_hooks, :mode, :start_time, :dynamic_retry, :public_address, :run_uuid
+    attr_accessor :check, :driver, :internal_hooks, :mode, :start_time, :dynamic_retry, :public_address,
+                  :public_document_server_address, :run_uuid
 
     def config
       @config ||= Maze::Configuration.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bugsnag-maze-runner
 version: !ruby/object:Gem::Version
-  version: 7.27.0
+  version: 7.29.0
 platform: ruby
 authors:
 - Steve Kirkland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber