testcentricity_web 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2100edbdb7c76973477b24ce275d367a891c2108
-  data.tar.gz: 5ccc3816ad3410aee17fa7c951a121cedf203f8c
+  metadata.gz: e42ac93ef15779ceee1ea3c82e998a92e0dbf2d0
+  data.tar.gz: ad99dbd1f03c653cba860d51cf5707fbe8f02532
 SHA512:
-  metadata.gz: 19137aed8261b00966dd2ea81325eb005ef7167d1086e837aab76d5e5d71d7c92a89990d2bf9eafb23c537784c165d667c5c0360c1fa5568159285c543f85036
-  data.tar.gz: 2b3c95326197d5910f78ed5a2c1eeabdd26a68b1286d1ac3f393f92e0f439b9f84d3c9f01bccf0d42c99ed21427056e57f9bb2a1ff4e5482b7097593240b8362
+  metadata.gz: 228a1e59a8bf01d884bbf8dcc76e6471adea078244f55ec8cb2cd8a7c2996a700b8e66fdd2e6494f4b3dcde23a391d6bd59641ad849f01840df2c0ff48418b97
+  data.tar.gz: 107ddf980a20d340dc348863e122305e5ab6cbe49f53926f1ad35fc307a6afeb08a1203d1130fd811f6233dd0153e7ed1f4f59910ad2b75841a88eff279f5035

data/lib/devices/devices.yml

@@ -0,0 +1,80 @@
+:iphone:
+  :css_width: 320
+  :css_height: 480
+  :default_orientation: portrait
+  :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1"
+:iphone4:
+  :css_width: 320
+  :css_height: 480
+  :default_orientation: portrait
+  :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1"
+:iphone5:
+  :css_width: 320
+  :css_height: 568
+  :default_orientation: portrait
+  :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1"
+:iphone6:
+  :css_width: 375
+  :css_height: 667
+  :default_orientation: portrait
+  :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1"
+:iphone6_plus:
+  :css_width: 414
+  :css_height: 736
+  :default_orientation: portrait
+  :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1"
+:android_phone:
+  :css_width: 320
+  :css_height: 480
+  :default_orientation: portrait
+  :user_agent: "Mozilla/5.0 (Linux; U; Android 4.0.1; en-us; sdk Build/ICS_MR0) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30"
+:windows_phone8:
+  :css_width: 320
+  :css_height: 480
+  :default_orientation: portrait
+  :user_agent: "Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 920)"
+:windows_phone7:
+  :css_width: 320
+  :css_height: 480
+  :default_orientation: portrait
+  :user_agent: "Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; NOKIA; Lumia 710)"
+:ipad:
+  :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"
+:ipad_pro:
+  :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"
+:android_tablet:
+  :css_width: 1024
+  :css_height: 768
+  :default_orientation: landscape
+  :user_agent: "Mozilla/5.0 (Linux; U; Android 3.0; en-us; GT-P7100 Build/HRI83) AppleWebkit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13"
+:kindle_fire:
+  :css_width: 1024
+  :css_height: 600
+  :default_orientation: landscape
+  :user_agent: "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-us; Silk/1.0.141.16-Gen4_11004310) AppleWebkit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16 Silk-Accelerated=true"
+:kindle_firehd7:
+  :css_width: 800
+  :css_height: 480
+  :default_orientation: landscape
+  :user_agent: "Mozilla/5.0 (Linux; U; en-us; KFTHWI Build/JDQ39) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.13 Safari/535.19 Silk-Accelerated=true"
+:kindle_firehd8:
+  :css_width: 1280
+  :css_height: 800
+  :default_orientation: landscape
+  :user_agent: "Mozilla/5.0 (Linux; U; en-us; KFAPWI Build/JDQ39) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.13 Safari/535.19 Silk-Accelerated=true"
+:surface:
+  :css_width: 1366
+  :css_height: 768
+  :default_orientation: landscape
+  :user_agent: "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; ARM; Trident/6.0; Touch)"
+:blackberry_playbook:
+  :css_width: 1024
+  :css_height: 600
+  :default_orientation: landscape
+  :user_agent: "Mozilla/5.0 (PlayBook; U; RIM Tablet OS 2.1.0; en-US) AppleWebKit/536.2+ (KHTML like Gecko) Version/7.2.1.0 Safari/536.2+"

data/lib/testcentricity_web/browser_helper.rb

@@ -1,3 +1,6 @@
+require 'yaml'
+
+
 module TestCentricity
   module Browsers
     include Capybara::DSL
@@ -81,21 +84,20 @@ module TestCentricity
     end
 
     def self.mobile_device_agent(device)
-      key = device.gsub(/\s+/, "").downcase.to_sym
-      devices = device_agents
-      agent_string = devices[key]
+      device_name = device.gsub(/\s+/, "").downcase.to_sym
+      device = get_devices[device_name]
+      agent_string = device[:user_agent]
       raise "Device '#{device}' is not defined" unless agent_string
       agent_string
     end
 
     def self.browser_size(browser, orientation)
-      key = browser.gsub(/\s+/, "").downcase.to_sym
-      sizes = device_sizes
-      browser_data = sizes[key]
-      if browser_data
-        width = browser_data[0]
-        height = browser_data[1]
-        default_orientation = browser_data[2]
+      device_name = browser.gsub(/\s+/, "").downcase.to_sym
+      device = get_devices[device_name]
+      if device
+        width = device[:css_width]
+        height = device[:css_height]
+        default_orientation = device[:default_orientation]
         if orientation
           (orientation.downcase.to_sym == default_orientation) ?
               size = [width, height] :
@@ -111,47 +113,8 @@ module TestCentricity
 
     private
 
-    def self.device_agents
-      devices = { :iphone              => "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1",
-                  :iphone4             => "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1",
-                  :iphone5             => "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1",
-                  :iphone6             => "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1",
-                  :iphone6_plus        => "Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1",
-                  :ipad                => "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",
-                  :ipad_pro            => "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",
-                  :android_phone       => "Mozilla/5.0 (Linux; U; Android 4.0.1; en-us; sdk Build/ICS_MR0) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
-                  :android_tablet      => "Mozilla/5.0 (Linux; U; Android 3.0; en-us; GT-P7100 Build/HRI83) AppleWebkit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13",
-                  :kindle_fire         => "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-us; Silk/1.0.141.16-Gen4_11004310) AppleWebkit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16 Silk-Accelerated=true",
-                  :kindle_firehd7      => "Mozilla/5.0 (Linux; U; en-us; KFTHWI Build/JDQ39) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.13 Safari/535.19 Silk-Accelerated=true",
-                  :kindle_firehd8      => "Mozilla/5.0 (Linux; U; en-us; KFAPWI Build/JDQ39) AppleWebKit/535.19 (KHTML, like Gecko) Silk/3.13 Safari/535.19 Silk-Accelerated=true",
-                  :windows_phone10     => "Mozilla/5.0 (Windows Phone 10.0; Android 4.2.1; DEVICE INFO) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Mobile Safari/537.36 Edge/12.0",
-                  :windows_phone8      => "Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 920)",
-                  :windows_phone7      => "Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; NOKIA; Lumia 710)",
-                  :surface             => "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; ARM; Trident/6.0; Touch)",
-                  :blackberry_playbook => "Mozilla/5.0 (PlayBook; U; RIM Tablet OS 2.1.0; en-US) AppleWebKit/536.2+ (KHTML like Gecko) Version/7.2.1.0 Safari/536.2+"
-      }
-      devices
-    end
-
-    def self.device_sizes
-      sizes = { :iphone              => [320,  480,  :portrait],
-                :iphone4             => [320,  480,  :portrait],
-                :iphone5             => [320,  568,  :portrait],
-                :iphone6             => [375,  667,  :portrait],
-                :iphone6_plus        => [414,  736,  :portrait],
-                :android_phone       => [320,  480,  :portrait],
-                :windows_phone8      => [320,  480,  :portrait],
-                :windows_phone7      => [320,  480,  :portrait],
-                :ipad                => [1024, 768,  :landscape],
-                :ipad_pro            => [1366, 1024, :landscape],
-                :android_tablet      => [1024, 768,  :landscape],
-                :kindle_fire         => [1024, 600,  :landscape],
-                :kindle_firehd7      => [800,  480,  :landscape],
-                :kindle_firehd8      => [1280, 800,  :landscape],
-                :surface             => [1366, 768,  :landscape],
-                :blackberry_playbook => [1024, 600,  :landscape]
-      }
-      sizes
+    def self.get_devices
+      YAML.load_file File.expand_path("../../devices/devices.yml", __FILE__)
     end
   end
 end

data/lib/testcentricity_web/elements/image.rb

@@ -19,19 +19,19 @@ module TestCentricity
       object_not_found_exception(obj, nil)
       obj.native.attribute('complete')
     end
-  end
 
-  # Wait until the image is fully loaded, or until the specified wait time has expired.
-  #
-  # @param seconds [Integer or Float] wait time in seconds
-  # @example
-  #   company_logo_image.wait_until_loaded(5)
-  #
-  def wait_until_loaded(seconds = nil)
-    timeout = seconds.nil? ? Capybara.default_max_wait_time : seconds
-    wait = Selenium::WebDriver::Wait.new(timeout: timeout)
-    wait.until { is_loaded? }
-  rescue
-    raise "Image #{@locator} failed to load within #{timeout} seconds" unless is_loaded?
+    # Wait until the image is fully loaded, or until the specified wait time has expired.
+    #
+    # @param seconds [Integer or Float] wait time in seconds
+    # @example
+    #   company_logo_image.wait_until_loaded(5)
+    #
+    def wait_until_loaded(seconds = nil)
+      timeout = seconds.nil? ? Capybara.default_max_wait_time : seconds
+      wait = Selenium::WebDriver::Wait.new(timeout: timeout)
+      wait.until { is_loaded? }
+    rescue
+      raise "Image #{@locator} failed to load within #{timeout} seconds" unless is_loaded?
+    end
   end
 end

data/lib/testcentricity_web/version.rb

@@ -1,3 +1,3 @@
 module TestCentricityWeb
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testcentricity_web
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - A.J. Mrozinski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -166,6 +166,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/devices/devices.yml
 - lib/testcentricity_web.rb
 - lib/testcentricity_web/browser_helper.rb
 - lib/testcentricity_web/data_objects_helper.rb