Merge pull request #1247 from bugsnag/tms/get-platform

Use Maze Runner helper routine

Gemfile

@@ -7,10 +7,10 @@ gem 'xcpretty'
 
 # A reference to Maze Runner is only needed for running tests locally and if committed it must be
 # portable for CI, e.g. a specific release.  However, leaving it commented out would mean quicker CI.
-gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v6.5.0'
+gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', tag: 'v6.6.2'
 
-# Use a development branch
-#gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', branch: 'tms/update-cucumber'
+# Use a specific branch
+#gem 'bugsnag-maze-runner', git: 'https://github.com/bugsnag/maze-runner', branch: 'master'
 
 # Locally, you can run against Maze Runner branches and uncommitted changes:
 #gem 'bugsnag-maze-runner', path: '../maze-runner'

Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/bugsnag/maze-runner
-  revision: fd33f19db2d0b03be857fecb55f1aa4d4033de6c
-  tag: v6.5.0
+  revision: 9efc4f0c876f050d34e0bef54be2599598076818
+  tag: v6.6.2
   specs:
-    bugsnag-maze-runner (6.5.0)
+    bugsnag-maze-runner (6.6.2)
       appium_lib (~> 11.2.0)
       bugsnag (~> 6.24)
       cucumber (~> 7.1)
@@ -41,7 +41,7 @@ GEM
       faye-websocket (~> 0.11.0)
       selenium-webdriver (~> 3.14, >= 3.14.1)
     atomos (0.1.3)
-    bugsnag (6.24.0)
+    bugsnag (6.24.1)
       concurrent-ruby (~> 1.0)
     builder (3.2.4)
     childprocess (3.0.0)

features/steps/app_steps.rb

@@ -3,8 +3,8 @@
 end
 
 When('I relaunch the app') do
-  case Maze.driver.capabilities['platformName']
-  when 'Mac'
+  case Maze::Helper.get_current_platform
+  when 'macos'
     app = Maze.driver.capabilities['app']
     system("killall #{app} > /dev/null && sleep 1")
     Maze.driver.get(app)
@@ -17,8 +17,8 @@
   # This step should only be used when the app has crashed, but the notifier needs a little
   # time to write the crash report before being forced to reopen.  From trials, 2s was not enough.
   sleep(5)
-  case Maze.driver.capabilities['platformName']
-  when 'Mac'
+  case Maze::Helper.get_current_platform
+  when 'macos'
     Maze.driver.get(Maze.driver.capabilities['app'])
   else
     Maze.driver.launch_app
@@ -48,10 +48,10 @@
 
 Then('the app is not running') do
   wait_for_true do
-    case Maze.driver.capabilities['platformName']
-    when 'iOS'
+    case Maze::Helper.get_current_platform
+    when 'ios'
       Maze.driver.app_state('com.bugsnag.iOSTestApp') == :not_running
-    when 'Mac'
+    when 'macos'
       `lsappinfo info -only pid -app com.bugsnag.macOSTestApp`.empty?
     else
       raise "Don't know how to query app state on this platform"

features/steps/cocoa_steps.rb

@@ -12,7 +12,7 @@
     step("I run \"#{event_type}\"")
   rescue StandardError
     # Ignore on macOS - AppiumForMac raises an error when clicking a button causes the app to crash
-    raise unless Maze.driver.capabilities['platformName'].eql?('Mac')
+    raise unless Maze::Helper.get_current_platform.eql?('macos')
 
     $logger.warn 'Ignoring error - this is normal for AppiumForMac if a button click causes the app to crash.'
   end
@@ -25,7 +25,7 @@
       Given I click the element "run_scenario"
     )
   rescue StandardError
-    raise unless Maze.driver.capabilities['platformName'].eql?('Mac')
+    raise unless Maze::Helper.get_current_platform.eql?('macos')
     $logger.info 'Ignored error raised by AppiumForMac when clicking run_scenario'
   end
   steps %(
@@ -52,7 +52,7 @@ def click_if_present(element)
 end
 
 When('I close the keyboard') do
-  unless Maze.driver.capabilities['platformName'].eql?('Mac')
+  unless Maze::Helper.get_current_platform.eql?('macos')
     click_if_present 'close_keyboard'
   end
 end
@@ -193,49 +193,52 @@ def check_device_model(field, list)
 end
 
 Then('the error is valid for the error reporting API') do
-  case Maze.driver.capabilities['platformName']
-  when 'iOS'
+  platform = Maze::Helper.get_current_platform
+  case platform
+  when 'ios'
     steps %(
       Then the error is valid for the error reporting API version "4.0" for the "iOS Bugsnag Notifier" notifier
       Then the breadcrumb timestamps are valid for the event
     )
-  when 'Mac'
+  when 'macos'
     steps %(
       Then the error is valid for the error reporting API version "4.0" for the "OSX Bugsnag Notifier" notifier
       Then the breadcrumb timestamps are valid for the event
     )
   else
-    raise 'Unknown platformName'
+    raise "Unknown platform: #{platform}"
   end
 end
 
 Then('the error is valid for the error reporting API ignoring breadcrumb timestamps') do
-  case Maze.driver.capabilities['platformName']
-  when 'iOS'
+  platform = Maze::Helper.get_current_platform
+  case platform
+  when 'ios'
     steps %(
       Then the error is valid for the error reporting API version "4.0" for the "iOS Bugsnag Notifier" notifier
     )
-  when 'Mac'
+  when 'macos'
     steps %(
       Then the error is valid for the error reporting API version "4.0" for the "OSX Bugsnag Notifier" notifier
     )
   else
-    raise 'Unknown platformName'
+    raise "Unknown platform: #{platform}"
   end
 end
 
 Then('the session is valid for the session reporting API') do
-  case Maze.driver.capabilities['platformName']
-  when 'iOS'
+  platform = Maze::Helper.get_current_platform
+  case platform
+  when 'ios'
     steps %(
       Then the session is valid for the session reporting API version "1.0" for the "iOS Bugsnag Notifier" notifier
     )
-  when 'Mac'
+  when 'macos'
     steps %(
       Then the session is valid for the session reporting API version "1.0" for the "OSX Bugsnag Notifier" notifier
     )
   else
-    raise 'Unknown platformName'
+    raise "Unknown platform: #{platform}"
   end
 end
 

features/support/env.rb

@@ -44,19 +44,19 @@
 end
 
 def skip_below(os, version)
-  skip_this_scenario("Skipping scenario") if Maze.driver.capabilities['platformName'] == os and Maze.config.os_version < version
+  skip_this_scenario("Skipping scenario") if Maze::Helper.get_current_platform == os and Maze.config.os_version < version
 end
 
 Before('@skip_below_ios_11') do |scenario|
-  skip_below('iOS', 11)
+  skip_below('ios', 11)
 end
 
 Before('@skip_below_ios_13') do |scenario|
-  skip_below('iOS', 13)
+  skip_below('ios', 13)
 end
 
 Before('@skip_macos') do |scenario|
-  skip_this_scenario("Skipping scenario") if Maze.driver.capabilities['platformName'] == 'Mac'
+  skip_this_scenario("Skipping scenario") if Maze::Helper.get_current_platform == 'macos'
 end
 
 # Skip stress tests unless STRESS_TEST env var is set