testcentricity_web 2.1.10 → 2.2.0

data/lib/testcentricity_web/environment.rb

@@ -29,8 +29,10 @@ module TestCentricity
     attr_accessor :test_environment
     attr_accessor :browser
     attr_accessor :browser_size
+    attr_accessor :session_state
     attr_accessor :os
     attr_accessor :device
+    attr_accessor :device_name
     attr_accessor :device_type
     attr_accessor :device_os
     attr_accessor :device_orientation
@@ -114,6 +116,14 @@ module TestCentricity
       @browser_size
     end
 
+    def self.session_state=(session_state)
+      @session_state = session_state
+    end
+
+    def self.session_state
+      @session_state
+    end
+
     # @deprecated Please use {#os=} instead
     def self.set_os(os)
       warn "[DEPRECATION] 'TestCentricity::Environ.set_os' is deprecated.  Please use 'Environ.os =' instead."
@@ -149,13 +159,21 @@ module TestCentricity
     end
 
     def self.device_type=(type)
-      @device_type = type.downcase
+      @device_type = type.downcase.to_sym
     end
 
     def self.device_type
       @device_type
     end
 
+    def self.device_name=(name)
+      @device_name = name
+    end
+
+    def self.device_name
+      @device_name
+    end
+
     def self.device_os=(os)
       @device_os = os.downcase.to_sym
     end

data/lib/testcentricity_web/page_sections_helper.rb

@@ -11,6 +11,10 @@ module TestCentricity
     attr_accessor :parent
     attr_accessor :parent_list
     attr_accessor :list_index
+    attr_accessor :locator_type
+
+    XPATH_SELECTORS = ['//', '[@', '[contains(@']
+    CSS_SELECTORS   = ['#', ':nth-child(', ':nth-of-type(', '^=', '$=', '*=']
 
     def initialize(name, parent, locator, context)
       @name         = name
@@ -19,6 +23,18 @@ module TestCentricity
       @context      = context
       @parent_list  = nil
       @list_index   = nil
+
+      is_xpath = XPATH_SELECTORS.any? { |selector| @locator.include?(selector) }
+      is_css = CSS_SELECTORS.any? { |selector| @locator.include?(selector) }
+      if is_xpath && !is_css
+        @locator_type = :xpath
+      elsif is_css && !is_xpath
+        @locator_type = :css
+      elsif !is_css && !is_xpath
+        @locator_type = :css
+      else
+        raise "Cannot determine type of locator for PageSection '#{@name}' - locator = #{@locator}"
+      end
     end
 
     def get_locator
@@ -31,9 +47,10 @@ module TestCentricity
       unless @parent_list.nil?
         locator = "#{@parent_list.get_locator}|#{locator}"
         unless @list_index.nil?
-          if locator.include?('/')
+          case @locator_type
+          when :xpath
             locator = "(#{locator})[#{@list_index}]"
-          else
+          when :css
             locator = "#{locator}:nth-of-type(#{@list_index})"
           end
         end
@@ -46,6 +63,10 @@ module TestCentricity
       end
     end
 
+    def get_locator_type
+      @locator_type
+    end
+
     def set_list_index(list, index = 1)
       @parent_list = list unless list.nil?
       @list_index  = index
@@ -792,19 +813,10 @@ module TestCentricity
 
     def find_section
       locator = get_locator
-      tries ||= 2
-      attributes = [:id, :xpath, :css]
-      type = attributes[tries]
-      case type
-      when :css
-        locator = locator.delete('|')
-      when :xpath
-        locator = locator.delete('|')
-      end
-      obj = page.find(type, locator, :wait => 0.1)
-      [obj, type]
+      locator = locator.delete('|')
+      obj = page.find(@locator_type, locator, :wait => 0.1)
+      [obj, @locator_type]
     rescue
-      retry if (tries -= 1) > 0
       [nil, nil]
     end
   end

data/lib/testcentricity_web/ui_elements_helper.rb

@@ -23,7 +23,10 @@ module TestCentricity
     include Test::Unit::Assertions
 
     attr_reader   :parent, :locator, :context, :type, :name
-    attr_accessor :alt_locator
+    attr_accessor :alt_locator, :locator_type
+
+    XPATH_SELECTORS = ['//', '[@', '[contains(@']
+    CSS_SELECTORS   = ['#', ':nth-child(', ':nth-of-type(', '^=', '$=', '*=']
 
     def initialize(name, parent, locator, context)
       @name        = name
@@ -32,6 +35,22 @@ module TestCentricity
       @context     = context
       @type        = nil
       @alt_locator = nil
+      set_locator_type
+    end
+
+    def set_locator_type(locator = nil)
+      locator = @locator if locator.nil?
+      is_xpath = XPATH_SELECTORS.any? { |selector| locator.include?(selector) }
+      is_css = CSS_SELECTORS.any? { |selector| locator.include?(selector) }
+      if is_xpath && !is_css
+        @locator_type = :xpath
+      elsif is_css && !is_xpath
+        @locator_type = :css
+      elsif !is_css && !is_xpath
+        @locator_type = :css
+      else
+        raise "Cannot determine type of locator for UIElement '#{@name}' - locator = #{locator}"
+      end
     end
 
     def get_object_type
@@ -66,8 +85,8 @@ module TestCentricity
     #   basket_link.click
     #
     def click
-      obj, = find_element
-      object_not_found_exception(obj, nil)
+      obj, type = find_element
+      object_not_found_exception(obj, type)
       begin
         obj.click
       rescue
@@ -81,8 +100,8 @@ module TestCentricity
     #   file_image.double_click
     #
     def double_click
-      obj, = find_element
-      object_not_found_exception(obj, nil)
+      obj, type = find_element
+      object_not_found_exception(obj, type)
       page.driver.browser.action.double_click(obj.native).perform
     end
 
@@ -92,8 +111,8 @@ module TestCentricity
     #   basket_item_image.right_click
     #
     def right_click
-      obj, = find_element
-      object_not_found_exception(obj, nil)
+      obj, type = find_element
+      object_not_found_exception(obj, type)
       page.driver.browser.action.context_click(obj.native).perform
     end
 
@@ -111,8 +130,8 @@ module TestCentricity
     end
 
     def set(value)
-      obj, = find_element
-      object_not_found_exception(obj, nil)
+      obj, type = find_element
+      object_not_found_exception(obj, type)
       obj.set(value)
     end
 
@@ -123,8 +142,8 @@ module TestCentricity
     #   comment_field.send_keys(:enter)
     #
     def send_keys(*keys)
-      obj, = find_element
-      object_not_found_exception(obj, nil)
+      obj, type = find_element
+      object_not_found_exception(obj, type)
       obj.send_keys(*keys)
     end
 
@@ -164,7 +183,11 @@ module TestCentricity
         invisible = !obj.visible? if exists
       end
       # the object is visible if it exists and it is not invisible
-      exists && !invisible ? true : false
+      if exists && !invisible
+        true
+      else
+        false
+      end
     end
 
     # Is UI object hidden (not visible)?
@@ -194,8 +217,8 @@ module TestCentricity
     #   login_button.disabled?
     #
     def disabled?
-      obj, = find_element
-      object_not_found_exception(obj, nil)
+      obj, type = find_element
+      object_not_found_exception(obj, type)
       obj.disabled?
     end
 
@@ -285,8 +308,8 @@ module TestCentricity
     end
 
     def get_value(visible = true)
-      obj, = find_element(visible)
-      object_not_found_exception(obj, nil)
+      obj, type = find_element(visible)
+      object_not_found_exception(obj, type)
       case obj.tag_name.downcase
       when 'input', 'select', 'textarea'
         obj.value
@@ -312,35 +335,37 @@ module TestCentricity
     #   basket_link.hover
     #
     def hover
-      obj, = find_element
-      object_not_found_exception(obj, nil)
+      obj, type = find_element
+      object_not_found_exception(obj, type)
       obj.hover
     end
 
     def drag_by(right_offset, down_offset)
-      obj, = find_element
-      object_not_found_exception(obj, nil)
+      obj, type = find_element
+      object_not_found_exception(obj, type)
+      page.driver.browser.action.click_and_hold(obj.native).perform
+      sleep(1)
       obj.drag_by(right_offset, down_offset)
     end
 
     def drag_and_drop(target, right_offset = nil, down_offset = nil)
-      source, = find_element
-      object_not_found_exception(source, nil)
+      source, type = find_element
+      object_not_found_exception(source, type)
       page.driver.browser.action.click_and_hold(source.native).perform
-      sleep(0.5)
+      sleep(1)
       target_drop, = target.find_element
       page.driver.browser.action.move_to(target_drop.native, right_offset.to_i, down_offset.to_i).release.perform
     end
 
     def get_attribute(attrib)
-      obj, = find_element(false)
-      object_not_found_exception(obj, nil)
+      obj, type = find_element(false)
+      object_not_found_exception(obj, type)
       obj[attrib]
     end
 
     def get_native_attribute(attrib)
-      obj, = find_element(false)
-      object_not_found_exception(obj, nil)
+      obj, type = find_element(false)
+      object_not_found_exception(obj, type)
       obj.native.attribute(attrib)
     end
 
@@ -354,43 +379,17 @@ module TestCentricity
     def find_object(visible = true)
       @alt_locator.nil? ? obj_locator = @locator : obj_locator = @alt_locator
       parent_section = @context == :section && !@parent.get_locator.nil?
-      if parent_section
-        attributes = [:id, :ignore_parent_xpath, :ignore_parent_css, :xpath_css, :css_xpath, :xpath, :css]
-        tries ||= 6
-      else
-        attributes = [:id, :xpath, :css]
-        tries ||= 2
-      end
+      parent_section ? tries ||= 2 : tries ||= 1
 
-      type = attributes[tries]
-      if parent_section
+      if parent_section && tries > 1
         parent_locator = @parent.get_locator
-        case type
-        when :css
-          parent_locator = parent_locator.gsub('|', ' ')
-          obj = page.find(:css, parent_locator, :wait => 0.01).find(:css, obj_locator, :wait => 0.01, :visible => visible)
-        when :xpath
-          parent_locator = parent_locator.delete('|')
-          obj = page.find(:xpath, "#{parent_locator}#{obj_locator}", :wait => 0.01, :visible => visible)
-        when :css_xpath
-          type = :xpath
-          parent_locator = parent_locator.gsub('|', ' ')
-          obj = page.find(:css, parent_locator, :wait => 0.01).find(:xpath, obj_locator, :wait => 0.01, :visible => visible)
-        when :xpath_css
-          type = :css
-          parent_locator = parent_locator.gsub('|', ' ')
-          obj = page.find(:xpath, parent_locator, :wait => 0.01).find(:css, obj_locator, :wait => 0.01, :visible => visible)
-        when :ignore_parent_css
-          type = :css
-          obj = page.find(:css, obj_locator, :wait => 0.01, :visible => visible)
-        when :ignore_parent_xpath
-          type = :xpath
-          obj = page.find(:xpath, obj_locator, :wait => 0.01, :visible => visible)
-        end
+        parent_locator = parent_locator.gsub('|', ' ')
+        parent_locator_type = @parent.get_locator_type
+        obj = page.find(parent_locator_type, parent_locator, :wait => 0.01).find(@locator_type, obj_locator, :wait => 0.01, :visible => visible)
       else
-        obj = page.find(type, obj_locator, :wait => 0.01, :visible => visible)
+        obj = page.find(@locator_type, obj_locator, :wait => 0.01, :visible => visible)
       end
-      [obj, type]
+      [obj, @locator_type]
     rescue
       retry if (tries -= 1) > 0
       [nil, nil]

data/lib/testcentricity_web/version.rb

@@ -1,3 +1,3 @@
 module TestCentricityWeb
-  VERSION = '2.1.10'
+  VERSION = '2.2.0'
 end

data/lib/testcentricity_web/webdriver_helper.rb

@@ -6,6 +6,8 @@ module TestCentricity
   module WebDriverConnect
     include Capybara::DSL
 
+    attr_accessor :webdriver_path
+
     def self.initialize_web_driver(app_host = nil)
       Capybara.app_host = app_host unless app_host.nil?
       browser = ENV['WEB_BROWSER']
@@ -14,7 +16,7 @@ module TestCentricity
       Environ.platform    = :desktop
       Environ.browser     = browser
       Environ.device      = false
-      Environ.device_type = 'browser'
+      Environ.device_name = 'browser'
 
       case browser.downcase.to_sym
       when :appium
@@ -50,6 +52,7 @@ module TestCentricity
         initialize_browser_size
       end
 
+      Environ.session_state = :running
       puts "Using #{Environ.browser} browser via #{context}"
     end
 
@@ -57,7 +60,7 @@ module TestCentricity
       Capybara.app_host = url
     end
 
-    # Set the WebDriver path for Chrome, IE, or Edge browsers
+    # Set the WebDriver path for Chrome, Firefox, IE, or Edge browsers
     def self.set_webdriver_path(project_path)
       path_to_driver = nil
       # check for existence of /webdrivers or /features/support/drivers folders
@@ -76,31 +79,75 @@ module TestCentricity
         elsif OS.windows?
           path_to_driver = 'windows/chromedriver.exe'
         end
-        Selenium::WebDriver::Chrome.driver_path = File.join(project_path, base_path, path_to_driver)
+        @webdriver_path = File.join(project_path, base_path, path_to_driver)
+        Selenium::WebDriver::Chrome.driver_path = @webdriver_path
       # when :firefox
       #   if OS.osx?
       #     path_to_driver = 'mac/geckodriver'
       #   elsif OS.windows?
       #     path_to_driver = 'windows/geckodriver.exe'
       #   end
-      #   Selenium::WebDriver::Firefox.driver_path = File.join(project_path, base_path, path_to_driver)
+      #   @webdriver_path = File.join(project_path, base_path, path_to_driver)
+      #   Selenium::WebDriver::Firefox.driver_path = @webdriver_path
       when :ie
         path_to_driver = 'windows/IEDriverServer.exe'
-        Selenium::WebDriver::IE.driver_path = File.join(project_path, base_path, path_to_driver)
+        @webdriver_path = File.join(project_path, base_path, path_to_driver)
+        Selenium::WebDriver::IE.driver_path = @webdriver_path
       when :edge
         path_to_driver = 'windows/MicrosoftWebDriver.exe'
-        Selenium::WebDriver::Edge.driver_path = File.join(project_path, base_path, path_to_driver)
+        @webdriver_path = File.join(project_path, base_path, path_to_driver)
+        Selenium::WebDriver::Edge.driver_path = @webdriver_path
       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'
+        if ENV['HOST_BROWSER']
+          case ENV['HOST_BROWSER'].downcase.to_sym
+          when :chrome
+            if OS.osx?
+              path_to_driver = 'mac/chromedriver'
+            elsif OS.windows?
+              path_to_driver = 'windows/chromedriver.exe'
+            end
+            @webdriver_path = File.join(project_path, base_path, path_to_driver)
+            Selenium::WebDriver::Chrome.driver_path = @webdriver_path
+          # when :firefox
+          #   if OS.osx?
+          #     path_to_driver = 'mac/geckodriver'
+          #   elsif OS.windows?
+          #     path_to_driver = 'windows/geckodriver.exe'
+          #   end
+          #   @webdriver_path = File.join(project_path, base_path, path_to_driver)
+          #   Selenium::WebDriver::Firefox.driver_path = @webdriver_path
           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?
+      puts "The webdriver path is: #{@webdriver_path}" unless path_to_driver.nil?
+    end
+
+    def self.initialize_browser_size
+      # tile browser windows if running in multiple parallel threads and BROWSER_TILE environment variable is true
+      if ENV['PARALLEL'] && ENV['BROWSER_TILE']
+        thread = ENV['TEST_ENV_NUMBER'].to_i
+        if thread > 1
+          Browsers.set_browser_window_position(100 * thread - 1, 100 * thread - 1)
+          sleep(1)
+        end
+      else
+        Browsers.set_browser_window_position(50, 50)
+        sleep(1)
+      end
+
+      browser = Environ.browser.to_s
+      if Environ.is_desktop?
+        if ENV['BROWSER_SIZE'] == 'max'
+          Browsers.maximize_browser
+        elsif ENV['BROWSER_SIZE']
+          Browsers.set_browser_window_size(ENV['BROWSER_SIZE'])
+        else
+          Browsers.set_browser_window_size(Browsers.browser_size(browser, ENV['ORIENTATION']))
+        end
+      elsif Environ.is_mobile? && !Environ.is_device?
+        Browsers.set_browser_window_size(Browsers.browser_size(browser, ENV['ORIENTATION']))
+      end
+      Environ.session_state = :running
     end
 
     private
@@ -108,7 +155,7 @@ module TestCentricity
     def self.initialize_appium
       Environ.device      = true
       Environ.platform    = :mobile
-      Environ.device_type = ENV['APP_DEVICE']
+      Environ.device_name = ENV['APP_DEVICE']
       Environ.device_os   = ENV['APP_PLATFORM_NAME']
       Environ.device_orientation = ENV['ORIENTATION'] if ENV['ORIENTATION']
       Capybara.default_driver = :appium
@@ -148,48 +195,113 @@ module TestCentricity
       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)
+        when :firefox, :chrome, :ie, :safari, :edge
+          Environ.platform = :desktop
+        else
+          Environ.platform    = :mobile
+          Environ.device_name = Browsers.mobile_device_name(browser)
       end
 
       Capybara.default_driver = :selenium
       Capybara.register_driver :selenium do |app|
         case browser.downcase.to_sym
-        when :ie, :safari, :edge
-          Capybara::Selenium::Driver.new(app, :browser => browser.to_sym)
+          when :ie, :safari, :edge
+            Capybara::Selenium::Driver.new(app, :browser => browser.to_sym)
+
+          when :firefox
+            if ENV['LOCALE']
+              profile = Selenium::WebDriver::Firefox::Profile.new
+              profile['intl.accept_languages'] = ENV['LOCALE']
+              Capybara::Selenium::Driver.new(app, :profile => profile)
+            else
+              Capybara::Selenium::Driver.new(app, :browser => :firefox)
+            end
+
+          when :chrome
+            ENV['LOCALE'] ? args = ['--disable-infobars', "--lang=#{ENV['LOCALE']}"] : args = ['--disable-infobars']
+            Capybara::Selenium::Driver.new(app, :browser => :chrome, :args => args)
 
-        when :firefox
-          if ENV['LOCALE']
-            profile = Selenium::WebDriver::Firefox::Profile.new
-            profile['intl.accept_languages'] = ENV['LOCALE']
-            Capybara::Selenium::Driver.new(app, :profile => profile)
           else
-            Capybara::Selenium::Driver.new(app, :browser => :firefox)
-          end
+            user_agent = Browsers.mobile_device_agent(browser)
+            ENV['HOST_BROWSER'] ? host_browser = ENV['HOST_BROWSER'].downcase.to_sym : host_browser = :firefox
+            case host_browser
+              when :firefox
+                profile = Selenium::WebDriver::Firefox::Profile.new
+                profile['general.useragent.override'] = user_agent
+                profile['intl.accept_languages'] = ENV['LOCALE'] if ENV['LOCALE']
+                Capybara::Selenium::Driver.new(app, :profile => profile)
+
+              when :chrome
+                ENV['LOCALE'] ?
+                    args = ["--user-agent='#{user_agent}'", "--lang=#{ENV['LOCALE']}", '--disable-infobars'] :
+                    args = ["--user-agent='#{user_agent}'", '--disable-infobars']
+                Capybara::Selenium::Driver.new(app, :browser => :chrome, :args => args)
+            end
+        end
+      end
+    end
 
-        when :chrome
-          ENV['LOCALE'] ? args = ['--disable-infobars', "--lang=#{ENV['LOCALE']}"] : args = ['--disable-infobars']
-          Capybara::Selenium::Driver.new(app, :browser => :chrome, :args => args)
+    def self.new_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
-          user_agent = Browsers.mobile_device_agent(browser)
-          ENV['HOST_BROWSER'] ? host_browser = ENV['HOST_BROWSER'].downcase.to_sym : host_browser = :firefox
-          case host_browser
+          Environ.platform    = :mobile
+          Environ.device_name = Browsers.mobile_device_name(browser)
+      end
+
+      Capybara.default_driver = :selenium
+      Capybara.register_driver :selenium do |app|
+        case browser.downcase.to_sym
+          when :ie, :safari, :edge
+            Capybara::Selenium::Driver.new(app, browser: browser.to_sym)
           when :firefox
             profile = Selenium::WebDriver::Firefox::Profile.new
-            profile['general.useragent.override'] = user_agent
+            profile['browser.download.dir'] = '/tmp/webdriver-downloads'
+            profile['browser.download.folderList'] = 2
+            profile['browser.helperApps.neverAsk.saveToDisk'] = 'text/csv, application/x-msexcel, application/excel, application/x-excel, application/vnd.ms-excel, image/png, image/jpeg, text/html, text/plain, application/pdf, application/octet-stream'
+            profile['pdfjs.disabled'] = true
             profile['intl.accept_languages'] = ENV['LOCALE'] if ENV['LOCALE']
-            Capybara::Selenium::Driver.new(app, :profile => profile)
-
+            options = Selenium::WebDriver::Firefox::Options.new(profile: profile)
+            if @webdriver_path.blank?
+              Capybara::Selenium::Driver.new(app, browser: :firefox, options: options)
+            else
+              Capybara::Selenium::Driver.new(app, browser: :firefox, options: options, driver_path: @webdriver_path)
+            end
           when :chrome
-            ENV['LOCALE'] ?
-                args = ["--user-agent='#{user_agent}'", "--lang=#{ENV['LOCALE']}", '--disable-infobars'] :
-                args = ["--user-agent='#{user_agent}'", '--disable-infobars']
-            Capybara::Selenium::Driver.new(app, :browser => :chrome, :args => args)
-          end
+            options = Selenium::WebDriver::Chrome::Options.new
+            options.add_argument('--disable-infobars')
+            options.add_argument("--lang=#{ENV['LOCALE']}") if ENV['LOCALE']
+            Capybara::Selenium::Driver.new(app, browser: :chrome, options: options)
+          else
+            user_agent = Browsers.mobile_device_agent(browser)
+            ENV['HOST_BROWSER'] ? host_browser = ENV['HOST_BROWSER'].downcase.to_sym : host_browser = :firefox
+            case host_browser
+              when :firefox
+                profile = Selenium::WebDriver::Firefox::Profile.new
+                profile['general.useragent.override'] = user_agent
+                profile['intl.accept_languages'] = ENV['LOCALE'] if ENV['LOCALE']
+                options = Selenium::WebDriver::Firefox::Options.new(profile: profile)
+                if @webdriver_path.blank?
+                  Capybara::Selenium::Driver.new(app, browser: :firefox, options: options)
+                else
+                  Capybara::Selenium::Driver.new(app, browser: :firefox, options: options, driver_path: @webdriver_path)
+                end
+              when :chrome
+                options = Selenium::WebDriver::Chrome::Options.new
+                options.add_argument('--disable-infobars')
+                options.add_argument("--user-agent='#{user_agent}'")
+                options.add_argument("--lang=#{ENV['LOCALE']}") if ENV['LOCALE']
+                Capybara::Selenium::Driver.new(app, browser: :chrome, options: options)
+            end
         end
       end
     end
@@ -200,9 +312,10 @@ module TestCentricity
       if ENV['BS_REAL_MOBILE'] || ENV['BS_PLATFORM']
         Environ.platform    = :mobile
         Environ.device      = true
-        Environ.device_type = ENV['BS_DEVICE']
+        Environ.device_name = ENV['BS_DEVICE']
         Environ.device_os   = ENV['BS_OS']
         Environ.device_orientation = ENV['ORIENTATION'] if ENV['ORIENTATION']
+        Environ.device_type = ENV['DEVICE_TYPE'] if ENV['DEVICE_TYPE']
 
       elsif ENV['BS_OS']
         Environ.os = "#{ENV['BS_OS']} #{ENV['BS_OS_VERSION']}"
@@ -262,7 +375,7 @@ module TestCentricity
           capabilities['javascriptEnabled'] = 'true'
           capabilities['cleanSession'] = 'true'
         end
-        Capybara::Selenium::Driver.new(app, :browser => :remote, :url => endpoint, :desired_capabilities => capabilities)
+        Capybara::Selenium::Driver.new(app, browser: :remote, url: endpoint, desired_capabilities: capabilities)
       end
 
       Environ.browser = browser
@@ -278,9 +391,10 @@ module TestCentricity
         Environ.os = ENV['CB_OS']
         Environ.platform = :desktop
       elsif ENV['CB_PLATFORM']
-        Environ.device_type = ENV['CB_PLATFORM']
+        Environ.device_name = ENV['CB_PLATFORM']
         Environ.device      = true
         Environ.platform    = :mobile
+        Environ.device_type = ENV['DEVICE_TYPE'] if ENV['DEVICE_TYPE']
       end
 
       endpoint = "http://#{ENV['CB_USERNAME']}:#{ENV['CB_AUTHKEY']}@hub.crossbrowsertesting.com:80/wd/hub"
@@ -296,7 +410,7 @@ module TestCentricity
         elsif ENV['CB_PLATFORM']
           capabilities['os_api_name'] = ENV['CB_PLATFORM']
         end
-        Capybara::Selenium::Driver.new(app, :browser => :remote, :url => endpoint, :desired_capabilities => capabilities)
+        Capybara::Selenium::Driver.new(app, browser: :remote, url: endpoint, desired_capabilities: capabilities)
       end
 
       Environ.browser = browser
@@ -317,12 +431,12 @@ module TestCentricity
       Capybara.default_driver = :poltergeist
       Capybara.register_driver :poltergeist do |app|
         options = {
-            :js_errors => true,
-            :timeout => 120,
-            :debug => false,
-            :phantomjs_options => ['--load-images=no', '--disk-cache=false'],
-            :inspector => true,
-            :window_size => [width, height]
+            js_errors:         true,
+            timeout:           120,
+            debug:             false,
+            phantomjs_options: ['--load-images=no', '--disk-cache=false'],
+            inspector:         true,
+            window_size:       [width, height]
         }
         Capybara::Poltergeist::Driver.new(app, options)
       end
@@ -333,7 +447,7 @@ module TestCentricity
       endpoint = ENV['REMOTE_ENDPOINT'] || 'http://127.0.0.1:4444/wd/hub'
       capabilities = Selenium::WebDriver::Remote::Capabilities.send(browser.downcase.to_sym)
       Capybara.register_driver :remote_browser do |app|
-        Capybara::Selenium::Driver.new(app, :browser => :remote, :url => endpoint, :desired_capabilities => capabilities)
+        Capybara::Selenium::Driver.new(app, browser: :remote, url: endpoint, desired_capabilities: capabilities)
       end
       Capybara.current_driver = :remote_browser
       Capybara.default_driver = :remote_browser
@@ -346,7 +460,7 @@ module TestCentricity
         Environ.platform = :desktop
         Environ.os = ENV['SL_OS']
       elsif ENV['SL_PLATFORM']
-        Environ.device_type = ENV['SL_DEVICE']
+        Environ.device_name = ENV['SL_DEVICE']
         Environ.platform    = :mobile
       end
 
@@ -368,7 +482,7 @@ module TestCentricity
           capabilities['deviceOrientation'] = ENV['ORIENTATION'] if ENV['ORIENTATION']
         end
 
-        Capybara::Selenium::Driver.new(app, :browser => :remote, :url => endpoint, :desired_capabilities => capabilities)
+        Capybara::Selenium::Driver.new(app, browser: :remote, url: endpoint, desired_capabilities: capabilities)
       end
 
       Environ.browser = browser
@@ -386,9 +500,10 @@ module TestCentricity
           Environ.device_orientation  = ENV['ORIENTATION']
         end
         Environ.device_os   = ENV['TB_PLATFORM']
-        Environ.device_type = ENV['TB_DEVICE']
+        Environ.device_name = ENV['TB_DEVICE']
         Environ.device      = true
         Environ.platform    = :mobile
+        Environ.device_type = ENV['DEVICE_TYPE'] if ENV['DEVICE_TYPE']
       else
         Environ.platform    = :desktop
       end
@@ -414,7 +529,7 @@ module TestCentricity
           capabilities['deviceName'] = ENV['TB_DEVICE']
         end
 
-        Capybara::Selenium::Driver.new(app, :browser => :remote, :url => endpoint, :desired_capabilities => capabilities)
+        Capybara::Selenium::Driver.new(app, browser: :remote, url: endpoint, desired_capabilities: capabilities)
       end
 
       Environ.browser = browser
@@ -423,29 +538,5 @@ module TestCentricity
       Capybara.run_server = false
 
     end
-
-    def self.initialize_browser_size
-      # tile browser windows if running in multiple parallel threads and BROWSER_TILE environment variable is true
-      if ENV['PARALLEL'] && ENV['BROWSER_TILE']
-        thread = ENV['TEST_ENV_NUMBER'].to_i
-        if thread > 1
-          Browsers.set_browser_window_position(100 * thread - 1, 100 * thread - 1)
-          sleep(1)
-        end
-      end
-
-      browser = Environ.browser.to_s
-      if Environ.is_desktop?
-        if ENV['BROWSER_SIZE'] == 'max'
-          Browsers.maximize_browser
-        elsif ENV['BROWSER_SIZE']
-          Browsers.set_browser_window_size(ENV['BROWSER_SIZE'])
-        else
-          Browsers.set_browser_window_size(Browsers.browser_size(browser, ENV['ORIENTATION']))
-        end
-      elsif Environ.is_mobile? && !Environ.is_device?
-        Browsers.set_browser_window_size(Browsers.browser_size(browser, ENV['ORIENTATION']))
-      end
-    end
   end
 end