testcentricity_web 2.0.23 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63ec2f6b0773bbe8e2225961565c2aa8dd7de8aa
-  data.tar.gz: ba2ce39763b20736b2a25bae7896a4674003360d
+  metadata.gz: 449c4f5fd5eb44182009f95be69073a738d2580f
+  data.tar.gz: 8fdaf6943f6778d4c396f790281dd26bcf5962a7
 SHA512:
-  metadata.gz: 615b6576addedd45fa21d8441e355285e25e0ae9ea31a27a442955015986374b30c91045e71cbce09e631fcd0a004db4175f082d49d6049ab0949981a8fbc278
-  data.tar.gz: a083ae6997c6abb5b9572594581fbf5b31a92892a11531de55e1b63222402c79186c7538e140e17142688dd3535f2d6cee52dfadced9471efaae09b85a5fc7b9
+  metadata.gz: ae73029e5f1ee59f658851678dd0505ce3d6f2c9443fcfc0d8a49269155846b0d326a803e1286a60823fdc4c9ac3a800f20be2e9e7921c5e72d3989904c9bc61
+  data.tar.gz: 81fb0a83391716e45795a4b8e0e4dce570d9df7a0a6d2fc10811385e2d5487c540ca32b20f482d5626f7f8d2d8465861898c0ec40a755b199a5162c761fbb52a

data/README.md

@@ -22,6 +22,25 @@ locally hosted instances of Firefox 48 or greater requires Marionette (aka gecko
 feature incomplete and potentially unstable. More information can be found [here](https://github.com/teamcapybara/capybara/issues/1710).
 
 
+## What's New
+
+* Added device profiles for iPhone 8, iPhone 8 Plus, iPhone X devices running iOS 11
+* Added device profile for iPad Pro 10.5" with iOS 11
+* Updated iPhone 7 and iPhone 7 Plus profiles to iOS 10
+* Updated Google Pixel and Google Pixel XL profiles to Android 8
+* Added device profiles for iPhone 7 (iOS 10) with Mobile Chrome browser and iPad (iOS 10) with Mobile Chrome browser
+
+
+## What's Fixed
+
+* The `TestCentricity::WebDriverConnect.initialize_web_driver` method now sets the `Environ` object to the correct device connection states for local and
+cloud hosted browsers.
+* The `TestCentricity::WebDriverConnect.initialize_web_driver` method no longer calls `initialize_browser_size` when running tests against cloud hosted
+mobile web browser, which was resulting in Appium throwing exceptions for unsupported method calls.
+* The `TestCentricity::WebDriverConnect.set_webdriver_path` method now correctly sets the path for Chrome webDrivers when the `HOST_BROWSER` Environment
+Variable is set to `chrome`. Tests against locally hosted emulated mobile web browser running on a local instance of Chrome will now work correctly.
+
+
 ## Installation
 
 Add this line to your automation project's Gemfile:
@@ -198,14 +217,6 @@ Web pages are made up of UI elements like text fields, check boxes, combo boxes,
       button      :sign_up_button,     'button#registrationSignUp'
     end
 
-    
-Once your **Page Objects** have been instantiated, you can interact with the **UI Elements** in your **Page Objects**. An example is shown
-below:
-
-    login_page.user_id_field.set('snicklefritz')
-    login_page.password_field.set('Pa55w0rd')
-    login_page.login_button.click
-
 
 ### Adding Methods to your Page Object
 
@@ -723,8 +734,10 @@ mobile web browsers, the `WEB_BROWSER` Environment Variable must be set to one o
 
 `WEB_BROWSER`         | `HOST_BROWSER`       | **CSS Screen Dimensions** | **Default Orientation**  | **OS Version**
 ----------------------|----------------------|-----------|----------|---------
-`ipad`                |`firefox` or `chrome` |1024 x 768 |landscape |iOS 9.1
-`ipad_pro`            |`firefox` or `chrome` |1366 x 1024|landscape |iOS 9.1
+`ipad`                |`firefox` or `chrome` |1024 x 768 |landscape |iOS 10
+`ipad_pro`            |`firefox` or `chrome` |1366 x 1024|landscape |iOS 11
+`ipad_pro_10_5`       |`firefox` or `chrome` |1112 x 834 |landscape |iOS 11
+`ipad_chrome`         |`firefox` or `chrome` |1024 x 768 |landscape |iOS 10 - Mobile Chrome browser for iOS
 `android_tablet`      |`firefox` or `chrome` |1024 x 768 |landscape |Android 3.0
 `kindle_fire`         |`firefox` or `chrome` |1024 x 600 |landscape |
 `kindle_firehd7`      |`firefox` or `chrome` |800 x 480  |landscape |Fire OS 3
@@ -742,10 +755,14 @@ mobile web browsers, the `WEB_BROWSER` Environment Variable must be set to one o
 `iphone6_plus`        |`firefox` or `chrome` |414 x 736  |portrait  |iOS 9.1
 `iphone7`             |`firefox` or `chrome` |375 x 667  |portrait  |iOS 10
 `iphone7_plus`        |`firefox` or `chrome` |414 x 736  |portrait  |iOS 10
-`android_phone`       |`firefox` or `chrome` |320 x 480  |portrait  |Android 4.0.1
-`nexus6`              |`firefox` or `chrome` |411 x 731  |portrait  |Android 6.0.1
-`pixel`               |`firefox` or `chrome` |411 x 731  |portrait  |Android 7.1
-`pixel_xl`            |`firefox` or `chrome` |411 x 731  |portrait  |Android 7.1
+`iphone7_chrome`      |`firefox` or `chrome` |375 x 667  |portrait  |iOS 10 - Mobile Chrome browser for iOS
+`iphone8`             |`firefox` or `chrome` |375 x 667  |portrait  |iOS 11
+`iphone9_plus`        |`firefox` or `chrome` |414 x 736  |portrait  |iOS 11
+`iphonex`             |`firefox` or `chrome` |375 x 812  |portrait  |iOS 11
+`android_phone`       |`firefox` or `chrome` |320 x 480  |portrait  |Android 4
+`nexus6`              |`firefox` or `chrome` |411 x 731  |portrait  |Android 6
+`pixel`               |`firefox` or `chrome` |411 x 731  |portrait  |Android 8
+`pixel_xl`            |`firefox` or `chrome` |411 x 731  |portrait  |Android 8
 `samsung_galaxy_s4`   |`firefox` or `chrome` |360 x 640  |portrait  |Android 5.0.1
 `samsung_galaxy_s5`   |`firefox` or `chrome` |360 x 640  |portrait  |Android 6.0.1
 `samsung_galaxy_s6`   |`firefox` or `chrome` |360 x 640  |portrait  |Android 6.0.1
@@ -826,6 +843,7 @@ for information regarding the specific capabilities.
 `WEB_BROWSER`    | Must be set to `browserstack`
 `BS_USERNAME`    | Must be set to your BrowserStack account user name
 `BS_AUTHKEY`     | Must be set to your BrowserStack account access key
+`BS_OS`          | Must be set to `ios` or `android`
 `BS_BROWSER`     | Must be set to `iPhone`, `iPad`, or `android`
 `BS_PLATFORM`    | Must be set to `MAC` (for iOS) or `ANDROID`
 `BS_DEVICE`      | Refer to `device` capability in chart
@@ -963,6 +981,8 @@ service(s) that you intend to connect with.
     
     ipad:                WEB_BROWSER=ipad                HOST_BROWSER=firefox <%= mobile %>
     ipad_pro:            WEB_BROWSER=ipad_pro            HOST_BROWSER=firefox <%= mobile %>
+    ipad_pro_10_5:       WEB_BROWSER=ipad_pro_10_5       HOST_BROWSER=firefox <%= mobile %>
+    ipad_chrome:         WEB_BROWSER=ipad_chrome         HOST_BROWSER=firefox <%= mobile %>
     iphone:              WEB_BROWSER=iphone              HOST_BROWSER=firefox <%= mobile %>
     iphone4:             WEB_BROWSER=iphone4             HOST_BROWSER=firefox <%= mobile %>
     iphone5:             WEB_BROWSER=iphone5             HOST_BROWSER=firefox <%= mobile %>
@@ -970,6 +990,10 @@ service(s) that you intend to connect with.
     iphone6_plus:        WEB_BROWSER=iphone6_plus        HOST_BROWSER=firefox <%= mobile %>
     iphone7:             WEB_BROWSER=iphone7             HOST_BROWSER=firefox <%= mobile %>
     iphone7_plus:        WEB_BROWSER=iphone7_plus        HOST_BROWSER=firefox <%= mobile %>
+    iphone7_chrome:      WEB_BROWSER=iphone7_chrome      HOST_BROWSER=firefox <%= mobile %>
+    iphone8:             WEB_BROWSER=iphone8             HOST_BROWSER=firefox <%= mobile %>
+    iphone8_plus:        WEB_BROWSER=iphone8_plus        HOST_BROWSER=firefox <%= mobile %>
+    iphoneX:             WEB_BROWSER=iphonex             HOST_BROWSER=firefox <%= mobile %>
     android_phone:       WEB_BROWSER=android_phone       HOST_BROWSER=firefox <%= mobile %>
     nexus6:              WEB_BROWSER=nexus6              HOST_BROWSER=firefox <%= mobile %>
     android_tablet:      WEB_BROWSER=android_tablet      HOST_BROWSER=firefox <%= mobile %>
@@ -1070,7 +1094,7 @@ service(s) that you intend to connect with.
     bs_edge_win10:      --profile bs_win10 BS_BROWSER="Edge" BS_VERSION="13.0"
     
     # BrowserStack iOS mobile browser profiles
-    bs_iphone:          --profile bs_mobile BS_PLATFORM=MAC BS_BROWSER=iPhone
+    bs_iphone:          --profile bs_mobile BS_PLATFORM=MAC BS_OS=ios BS_BROWSER=iPhone
     bs_iphone6s_plus:   --profile bs_iphone BS_DEVICE="iPhone 6S Plus"
     bs_iphone6s:        --profile bs_iphone BS_DEVICE="iPhone 6S"
     bs_iphone6_plus:    --profile bs_iphone BS_DEVICE="iPhone 6 Plus"
@@ -1084,12 +1108,12 @@ service(s) that you intend to connect with.
     bs_ipad_mini:       --profile bs_ipad BS_DEVICE="iPad Mini 4"
     
     # BrowserStack iOS real device mobile browser profiles
-    bs_iphone_device:   --profile bs_mobile BS_BROWSER=iPhone BS_REAL_MOBILE="true"
+    bs_iphone_device:   --profile bs_mobile BS_BROWSER=iPhone BS_OS=ios BS_REAL_MOBILE="true"
     bs_iphone7_plus:    --profile bs_iphone_device BS_DEVICE="iPhone 7 Plus"
     bs_iphone7:         --profile bs_iphone_device BS_DEVICE="iPhone 7"
     
     # BrowserStack Android mobile browser profiles
-    bs_android:          --profile bs_mobile BS_PLATFORM=ANDROID BS_BROWSER=android
+    bs_android:          --profile bs_mobile BS_PLATFORM=ANDROID BS_BROWSER=android BS_OS=android
     bs_galaxy_s5:        --profile bs_android BS_DEVICE="Samsung Galaxy S5"
     bs_kindle_fire_hd89: --profile bs_android BS_DEVICE="Amazon Kindle Fire HD 8.9"
     bs_kindle_fire_hdx7: --profile bs_android BS_DEVICE="Amazon Kindle Fire HDX 7"
@@ -1100,8 +1124,9 @@ service(s) that you intend to connect with.
     bs_sony_xperia:      --profile bs_android BS_DEVICE="Sony Xperia Tipo"
     
     # BrowserStack Android real device mobile browser profiles
-    bs_android_device:   --profile bs_mobile BS_BROWSER=android BS_REAL_MOBILE="true"
-    bs_google_pixel:     --profile bs_android_device BS_DEVICE="Google Pixel"
+    bs_android_device:   --profile bs_mobile BS_BROWSER=android BS_OS=android BS_REAL_MOBILE="true"
+    bs_google_pixel8:    --profile bs_android_device BS_DEVICE="Google Pixel" BS_OS_VERSION="8.0"
+    bs_google_pixel71:   --profile bs_android_device BS_DEVICE="Google Pixel" BS_OS_VERSION="7.1"
     bs_nexus9:           --profile bs_android_device BS_DEVICE="Google Nexus 9"
     bs_nexus6:           --profile bs_android_device BS_DEVICE="Google Nexus 6"
     bs_galaxy_s7:        --profile bs_android_device BS_DEVICE="Samsung Galaxy S7"

data/lib/devices/devices.yml

@@ -39,14 +39,42 @@
   :css_width: 375
   :css_height: 667
   :default_orientation: portrait
-  :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) Version/10.0 Mobile/14A345 Safari/602.1"
+  :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/603.1.23 (KHTML, like Gecko) Version/10.0 Mobile/14E5239e Safari/602.1"
 :iphone7_plus:
   :name: "iPhone 7 Plus"
   :os: "ios"
   :css_width: 414
   :css_height: 736
   :default_orientation: portrait
-  :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) Version/10.0 Mobile/14A345 Safari/602.1"
+  :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/603.1.23 (KHTML, like Gecko) Version/10.0 Mobile/14E5239e Safari/602.1"
+:iphone7_chrome:
+  :name: "iPhone 7 - Chrome"
+  :os: "ios"
+  :css_width: 375
+  :css_height: 667
+  :default_orientation: portrait
+  :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) CriOS/56.0.2924.75 Mobile/14E5239e Safari/602.1"
+:iphone8:
+  :name: "iPhone 8"
+  :os: "ios"
+  :css_width: 375
+  :css_height: 667
+  :default_orientation: portrait
+  :user_agent: "Mozilla/5.0 (iPhone; CPU OS 11_0 like Mac OS X) AppleWebKit/604.1.25 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1"
+:iphone8_plus:
+  :name: "iPhone 8 Plus"
+  :os: "ios"
+  :css_width: 414
+  :css_height: 736
+  :default_orientation: portrait
+  :user_agent: "Mozilla/5.0 (iPhone; CPU OS 11_0 like Mac OS X) AppleWebKit/604.1.25 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1"
+:iphonex:
+  :name: "iPhone X"
+  :os: "ios"
+  :css_width: 375
+  :css_height: 812
+  :default_orientation: portrait
+  :user_agent: "Mozilla/5.0 (iPhone; CPU OS 11_0 like Mac OS X) AppleWebKit/604.1.25 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1"
 :android_phone:
   :name: "Generic Android phone"
   :os: "android"
@@ -88,14 +116,14 @@ nexus6:
   :css_width: 411
   :css_height: 731
   :default_orientation: portrait
-  :user_agent: "Mozilla/5.0 (Linux; Android 7.1; Pixel Build/NAE63H; xx-xx) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/53.0.2785.134 Mobile Safari/537.36"
+  :user_agent: "Mozilla/5.0 (Linux; Android 8.0.0; Pixel Build/OPP3.170518.006) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.66 Mobile Safari/537.36"
 :pixel_xl:
   :name: "Google Pixel XL phone"
   :os: "android"
   :css_width: 411
   :css_height: 731
   :default_orientation: portrait
-  :user_agent: "Mozilla/5.0 (Linux; Android 7.1; Pixel XL Build/NDE63N; xx-xx) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/54.0.2840.34 Mobile Safari/537.36"
+  :user_agent: "Mozilla/5.0 (Linux; Android 8.0.0; Pixel XL Build/OPR6.170623.012) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.116 Mobile Safari/537.36"
 :windows_phone8:
   :name: "Generic Windows 8 phone"
   :os: "windows"
@@ -130,14 +158,28 @@ nexus6:
   :css_width: 1024
   :css_height: 768
   :default_orientation: landscape
-  :user_agent: "Mozilla/5.0 (iPad; CPU OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/3B143 Safari/601.1"
+  :user_agent: "Mozilla/5.0 (iPad; CPU OS 10_3 like Mac OS X) AppleWebKit/603.1.23 (KHTML, like Gecko) Version/10.0 Mobile/14E5239e Safari/602.1"
 :ipad_pro:
   :name: "iPad Pro"
   :os: "ios"
   :css_width: 1366
   :css_height: 1024
   :default_orientation: landscape
-  :user_agent: "Mozilla/5.0 (iPad; CPU OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B137 Safari/601.1"
+  :user_agent: "Mozilla/5.0 (iPad; CPU OS 11_0 like Mac OS X) AppleWebKit/604.1.25 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1"
+:ipad_pro_10_5:
+  :name: "iPad Pro 10.5 in."
+  :os: "ios"
+  :css_width: 1112
+  :css_height: 834
+  :default_orientation: landscape
+  :user_agent: "Mozilla/5.0 (iPad; CPU OS 11_0 like Mac OS X) AppleWebKit/604.1.25 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1"
+:ipad_chrome:
+  :name: "iPad - Chrome"
+  :os: "ios"
+  :css_width: 1024
+  :css_height: 768
+  :default_orientation: landscape
+  :user_agent: "Mozilla/5.0 (iPad; CPU OS 10_3 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) CriOS/56.0.2924.75 Mobile/14E5239e Safari/602.1"
 :android_tablet:
   :name: "Generic Android tablet"
   :os: "android"

data/lib/testcentricity_web/version.rb

@@ -1,3 +1,3 @@
 module TestCentricityWeb
-  VERSION = '2.0.23'
+  VERSION = '2.1.0'
 end

data/lib/testcentricity_web/webdriver_helper.rb

@@ -83,6 +83,15 @@ module TestCentricity
       when :edge
         path_to_driver = 'windows/MicrosoftWebDriver.exe'
         Selenium::WebDriver::Edge.driver_path = File.join(project_path, base_path, path_to_driver)
+      else
+        if ENV['HOST_BROWSER'] && ENV['HOST_BROWSER'].downcase.to_sym == :chrome
+          if OS.osx?
+            path_to_driver = 'mac/chromedriver'
+          elsif OS.windows?
+            path_to_driver = 'windows/chromedriver.exe'
+          end
+          Selenium::WebDriver::Chrome.driver_path = File.join(project_path, base_path, path_to_driver)
+        end
       end
       puts "The webdriver path is: #{File.join(project_path, base_path, path_to_driver)}" unless path_to_driver.nil?
     end
@@ -123,7 +132,22 @@ module TestCentricity
     end
 
     def self.initialize_local_browser
+      if OS.osx?
+        Environ.os = 'OS X'
+      elsif OS.windows?
+        Environ.os = 'Windows'
+      end
+
       browser = ENV['WEB_BROWSER']
+
+      case browser.downcase.to_sym
+      when :firefox, :chrome, :ie, :safari, :edge
+        Environ.platform = :desktop
+      else
+        Environ.platform    = :mobile
+        Environ.device_type = Browsers.mobile_device_name(browser)
+      end
+
       Capybara.default_driver = :selenium
       Capybara.register_driver :selenium do |app|
         case browser.downcase.to_sym
@@ -131,8 +155,6 @@ module TestCentricity
           Capybara::Selenium::Driver.new(app, :browser => browser.to_sym)
         else
           user_agent = Browsers.mobile_device_agent(browser)
-          Environ.platform    = :mobile
-          Environ.device_type = Browsers.mobile_device_name(browser)
           ENV['HOST_BROWSER'] ? host_browser = ENV['HOST_BROWSER'].downcase.to_sym : host_browser = :firefox
           case host_browser
           when :firefox
@@ -151,32 +173,38 @@ module TestCentricity
     def self.initialize_browserstack
       browser = ENV['BS_BROWSER']
 
+      if ENV['BS_REAL_MOBILE'] || ENV['BS_PLATFORM']
+        Environ.platform    = :mobile
+        Environ.device      = true
+        Environ.device_type = ENV['BS_DEVICE']
+        Environ.device_os   = ENV['BS_OS']
+        Environ.device_orientation = ENV['ORIENTATION'] if ENV['ORIENTATION']
+
+      elsif ENV['BS_OS']
+        Environ.os = "#{ENV['BS_OS']} #{ENV['BS_OS_VERSION']}"
+      end
+
       endpoint = "http://#{ENV['BS_USERNAME']}:#{ENV['BS_AUTHKEY']}@hub-cloud.browserstack.com/wd/hub"
       Capybara.register_driver :browserstack do |app|
         capabilities = Selenium::WebDriver::Remote::Capabilities.new
 
-        if ENV['BS_OS']
-          capabilities['os'] = ENV['BS_OS']
+        if ENV['BS_REAL_MOBILE']
+          capabilities['device'] = ENV['BS_DEVICE']
+          capabilities['realMobile'] = true
           capabilities['os_version'] = ENV['BS_OS_VERSION']
-          Environ.os = "#{ENV['BS_OS']} #{ENV['BS_OS_VERSION']}"
-          capabilities['browser'] = browser || 'chrome'
-          capabilities['browser_version'] = ENV['BS_VERSION'] if ENV['BS_VERSION']
-          capabilities['resolution'] = ENV['RESOLUTION'] if ENV['RESOLUTION']
+
         elsif ENV['BS_PLATFORM']
           capabilities[:platform] = ENV['BS_PLATFORM']
           capabilities[:browserName] = browser
           capabilities['device'] = ENV['BS_DEVICE'] if ENV['BS_DEVICE']
-          Environ.platform    = :mobile
-          Environ.device      = true
-          Environ.device_type = ENV['BS_DEVICE']
-          Environ.device_orientation = ENV['ORIENTATION'] if ENV['ORIENTATION']
           capabilities['deviceOrientation'] = ENV['ORIENTATION'] if ENV['ORIENTATION']
-        elsif ENV['BS_REAL_MOBILE']
-          capabilities['device'] = ENV['BS_DEVICE']
-          capabilities['realMobile'] = true
-          Environ.platform    = :mobile
-          Environ.device      = true
-          Environ.device_type = ENV['BS_DEVICE']
+
+        elsif ENV['BS_OS']
+          capabilities['os'] = ENV['BS_OS']
+          capabilities['os_version'] = ENV['BS_OS_VERSION']
+          capabilities['browser'] = browser || 'chrome'
+          capabilities['browser_version'] = ENV['BS_VERSION'] if ENV['BS_VERSION']
+          capabilities['resolution'] = ENV['RESOLUTION'] if ENV['RESOLUTION']
         end
 
         capabilities['browserstack.timezone'] = ENV['TIME_ZONE'] if ENV['TIME_ZONE']
@@ -222,6 +250,15 @@ module TestCentricity
     def self.initialize_crossbrowser
       browser = ENV['CB_BROWSER']
 
+      if ENV['CB_OS']
+        Environ.os = ENV['CB_OS']
+        Environ.platform = :desktop
+      elsif ENV['CB_PLATFORM']
+        Environ.device_type = ENV['CB_PLATFORM']
+        Environ.device      = true
+        Environ.platform    = :mobile
+      end
+
       endpoint = "http://#{ENV['CB_USERNAME']}:#{ENV['CB_AUTHKEY']}@hub.crossbrowsertesting.com:80/wd/hub"
       Capybara.register_driver :crossbrowser do |app|
         capabilities = Selenium::WebDriver::Remote::Capabilities.new
@@ -234,9 +271,6 @@ module TestCentricity
           Environ.platform = :desktop
         elsif ENV['CB_PLATFORM']
           capabilities['os_api_name'] = ENV['CB_PLATFORM']
-          Environ.device_type = ENV['CB_PLATFORM']
-          Environ.device      = true
-          Environ.platform    = :mobile
         end
         Capybara::Selenium::Driver.new(app, :browser => :remote, :url => endpoint, :desired_capabilities => capabilities)
       end
@@ -284,6 +318,14 @@ module TestCentricity
     def self.initialize_saucelabs
       browser = ENV['SL_BROWSER']
 
+      if ENV['SL_OS']
+        Environ.platform = :desktop
+        Environ.os = ENV['SL_OS']
+      elsif ENV['SL_PLATFORM']
+        Environ.device_type = ENV['SL_DEVICE']
+        Environ.platform    = :mobile
+      end
+
       endpoint = "http://#{ENV['SL_USERNAME']}:#{ENV['SL_AUTHKEY']}@ondemand.saucelabs.com:80/wd/hub"
       Capybara.register_driver :saucelabs do |app|
         capabilities = Selenium::WebDriver::Remote::Capabilities.new
@@ -295,14 +337,11 @@ module TestCentricity
         capabilities['recordVideo'] = ENV['RECORD_VIDEO'] if ENV['RECORD_VIDEO']
         if ENV['SL_OS']
           capabilities['platform'] = ENV['SL_OS']
-          Environ.platform = :desktop
         elsif ENV['SL_PLATFORM']
           capabilities['platform'] = ENV['SL_PLATFORM']
           capabilities['deviceName'] = ENV['SL_DEVICE']
           capabilities['deviceType'] = ENV['SL_DEVICE_TYPE'] if ENV['SL_DEVICE_TYPE']
           capabilities['deviceOrientation'] = ENV['ORIENTATION'] if ENV['ORIENTATION']
-          Environ.device_type = ENV['SL_DEVICE']
-          Environ.platform    = :mobile
         end
 
         Capybara::Selenium::Driver.new(app, :browser => :remote, :url => endpoint, :desired_capabilities => capabilities)
@@ -317,6 +356,19 @@ module TestCentricity
     def self.initialize_testingbot
       browser = ENV['TB_BROWSER']
 
+      Environ.os = ENV['TB_OS']
+      if ENV['TB_PLATFORM']
+        if ENV['ORIENTATION']
+          Environ.device_orientation  = ENV['ORIENTATION']
+        end
+        Environ.device_os   = ENV['TB_PLATFORM']
+        Environ.device_type = ENV['TB_DEVICE']
+        Environ.device      = true
+        Environ.platform    = :mobile
+      else
+        Environ.platform    = :desktop
+      end
+
       ENV['TUNNELING'] ?
           endpoint = '@localhost:4445/wd/hub' :
           endpoint = '@hub.testingbot.com:4444/wd/hub'
@@ -331,15 +383,11 @@ module TestCentricity
         capabilities['platform'] = ENV['TB_OS']
         capabilities['record_video'] = ENV['RECORD_VIDEO'] if ENV['RECORD_VIDEO']
         if ENV['TB_PLATFORM']
-          Environ.device_orientation = ENV['ORIENTATION'] if ENV['ORIENTATION']
-          capabilities['orientation'] = ENV['ORIENTATION'] if ENV['ORIENTATION']
+          if ENV['ORIENTATION']
+             capabilities['orientation'] = ENV['ORIENTATION']
+          end
           capabilities['platformName'] = ENV['TB_PLATFORM']
           capabilities['deviceName'] = ENV['TB_DEVICE']
-          Environ.device_type = ENV['TB_DEVICE']
-          Environ.device      = true
-          Environ.platform    = :mobile
-        else
-          Environ.platform    = :desktop
         end
 
         Capybara::Selenium::Driver.new(app, :browser => :remote, :url => endpoint, :desired_capabilities => capabilities)

data/testcentricity_web.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |spec|
     The TestCentricity™ Web core generic framework for desktop and mobile web site testing implements a Page Object Model DSL
     for use with Cucumber, Capybara, and Selenium-Webdriver. The TestCentricity™ Web gem supports running automated tests
     against locally hosted desktop browsers (Firefox, Chrome, Safari, or IE), locally hosted emulated mobile browsers (iOS,
-    Android, Windows Phone, Blackberry) running within Firefox or Chrome, a "headless" browser (using Poltergeist and PhantomJS),
-    mobile Safari browsers on iOS device simulators (using Appium and XCode on OS X), or cloud hosted desktop or mobile
-    web browsers (using the BrowserStack, Sauce Labs, CrossBrowserTesting, or TestingBot services).}
+    Android, Windows Phone, Blackberry, Kindle Fire) running within an instance of Firefox or Chrome, a "headless" browser (using
+    Poltergeist and PhantomJS), mobile Safari browsers on iOS device simulators (using Appium and XCode on OS X), or cloud hosted
+    desktop or mobile web browsers (using the BrowserStack, Sauce Labs, CrossBrowserTesting, or TestingBot services).}
   spec.homepage      = ''
   spec.license       = 'BSD3'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testcentricity_web
 version: !ruby/object:Gem::Version
-  version: 2.0.23
+  version: 2.1.0
 platform: ruby
 authors:
 - A.J. Mrozinski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-12 00:00:00.000000000 Z
+date: 2017-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -181,9 +181,9 @@ description: |2-
       The TestCentricity™ Web core generic framework for desktop and mobile web site testing implements a Page Object Model DSL
       for use with Cucumber, Capybara, and Selenium-Webdriver. The TestCentricity™ Web gem supports running automated tests
       against locally hosted desktop browsers (Firefox, Chrome, Safari, or IE), locally hosted emulated mobile browsers (iOS,
-      Android, Windows Phone, Blackberry) running within Firefox or Chrome, a "headless" browser (using Poltergeist and PhantomJS),
-      mobile Safari browsers on iOS device simulators (using Appium and XCode on OS X), or cloud hosted desktop or mobile
-      web browsers (using the BrowserStack, Sauce Labs, CrossBrowserTesting, or TestingBot services).
+      Android, Windows Phone, Blackberry, Kindle Fire) running within an instance of Firefox or Chrome, a "headless" browser (using
+      Poltergeist and PhantomJS), mobile Safari browsers on iOS device simulators (using Appium and XCode on OS X), or cloud hosted
+      desktop or mobile web browsers (using the BrowserStack, Sauce Labs, CrossBrowserTesting, or TestingBot services).
 email:
 - testcentricity@gmail.com
 executables: []