webdriver-user-agent 7.3 → 7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef6b7eca083c27f5dc45d9e81854697a175c706a
-  data.tar.gz: 5f29a865c65c990681a69e5902dcdbfa99bf42e9
+  metadata.gz: ebfa0b02eb28f97547b5cfbdddd07cd6fe4340a5
+  data.tar.gz: 665d1e9598eaed543589057ca2ebbace6e0e0448
 SHA512:
-  metadata.gz: 88a77a7c2c8c2f5c67d3d9ba1418c0b6a8d65568e77482f59841f57d574392c47d70ee38224b40f04749c916834e1a0c16ed629ac9d6b840b54c1867d5aff527
-  data.tar.gz: 2f0e6a6de214e03ad8e6866e88ae40c4136adf9302e3d574e054e52afd432fb280f5cb02a544fed2989b6f443e3497057777173b07a27b55d00a89552955b879
+  metadata.gz: da3d4026092a697e09d2817dc7d2116bba3b1dadf01421483fa7e8d06aad03e38b4e5b3769bf8454bd4f8e297ac564077e538ff05a29af6e7c091926c357c879
+  data.tar.gz: a5512aec12f716e47000854cbca511d98a8663ffab9196a855f3946c8897047b0a8209a95bd68db207b00bd326474030c198c3a250255ad33b2ae6255bee4d80

data/ChangeLog

@@ -1,3 +1,7 @@
+=== Version 7.4 / 2016-1-6
+* Enhancements
+  * Added support for iPad Pro and iPhone 6/6s (Thanks samnissen)
+
 === Version 7.3 / 2015-7-14    (Thanks samnissen)
 * Enhancements
   * Allow users to override the browser screensize

data/lib/device-info/devices.yaml

@@ -1,4 +1,16 @@
-:iphone:
+# Desktop size sources
+# http://www.hobo-web.co.uk/best-screen-size/
+# https://en.wikipedia.org/wiki/Display_resolution#Common_display_resolutions
+# http://www.w3schools.com/browsers/browsers_display.asp
+:desktop:
+   :user_agent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_5) AppleWebKit/600.8.9 (KHTML, like Gecko) Version/8.0.8 Safari/600.8.9"
+   :portrait:
+     :width: 768
+     :height: 1024
+   :landscape:
+     :width: 1366
+     :height: 768
+:iphone_default: &iphone_default
    :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 8_1_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12B435 Safari/600.1.4"
    :portrait:
      :width: 375
@@ -6,24 +18,30 @@
    :landscape:
      :width: 667
      :height: 375
-:iphone6plus:
-  :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 8_1_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12B435 Safari/600.1.4"
+:iphone:
+   <<: *iphone_default
+:iphone6splus:
+  <<: *iphone_default
   :portrait:
     :width: 414
     :height: 628
   :landscape:
     :width: 736
     :height: 414
-:iphone6:
-  :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 8_1_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12B435 Safari/600.1.4"
+:iphone6s:
+  <<: *iphone_default
+:iphone6plus:
+  <<: *iphone_default
   :portrait:
-    :width: 375
-    :height: 559
+    :width: 414
+    :height: 628
   :landscape:
-    :width: 667
-    :height: 375
+    :width: 736
+    :height: 414
+:iphone6:
+  <<: *iphone_default
 :iphone5s:
-  :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 8_1_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12B435 Safari/600.1.4"
+  <<: *iphone_default
   :portrait:
     :width: 320
     :height: 460
@@ -31,7 +49,7 @@
     :width: 568
     :height: 212
 :iphone4s:
-  :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 8_1_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12B435 Safari/600.1.4"
+  <<: *iphone_default
   :portrait:
     :width: 320
     :height: 356
@@ -39,13 +57,21 @@
     :width: 480
     :height: 196
 :ipad:
-  :user_agent: "Mozilla/5.0(iPad; U; CPU OS 8_1_1 like Mac OS X) AppleWebKit/600.14 (KHTML, like Gecko) Version/8.0 Mobile/12B435 Safari/9537.53"
+  :user_agent: "Mozilla/5.0(iPad; U; CPU OS 8_1_1 like Mac OS X) AppleWebKit/600.14 (KHTML, like Gecko) Version/8.0 Mobile/12B435 Safari/600.1.4"
   :portrait:
     :width: 768
     :height: 960
   :landscape:
     :width: 1024
     :height: 704
+:ipad_pro:
+  :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"
+  :portrait:
+    :width: 1024
+    :height: 1302
+  :landscape:
+    :width: 1366
+    :height: 960
 :android_phone:
   :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"
   :portrait:

data/spec/webdriver-user-agent_spec.rb

@@ -14,9 +14,9 @@ describe "webdriver user agent" do
   after :each do
     @driver.quit if @driver
   end
-  
+
   # window.innerWidth and window.innerHeight
-  # do not accurately provide 
+  # do not accurately provide
   # browser widths and heights
   # http://stackoverflow.com/a/8876069/1651458
 
@@ -24,7 +24,7 @@ describe "webdriver user agent" do
   	@driver = Webdriver::UserAgent.driver
   	expect(@driver.browser).to eq(:firefox)
   	expect(@driver.execute_script('return navigator.userAgent')).to include 'iPhone'
-  	expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).to eq(375) 
+  	expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).to eq(375)
   	expect(@driver.execute_script('return Math.max(document.documentElement.clientHeight, window.innerHeight || 0)')).to eq(559 - FIREFOXBROWSER_UICHROME_HEIGHT)
   end
 
@@ -40,20 +40,45 @@ describe "webdriver user agent" do
   	@driver = Webdriver::UserAgent.driver(:browser => :chrome, :agent => :iPad, :orientation => :landscape)
   	expect(@driver.browser).to eq(:chrome)
   	expect(@driver.execute_script('return navigator.userAgent')).to include 'iPad'
-  	expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).to eq(1024) 
+  	expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).to eq(1024)
   	expect(@driver.execute_script('return Math.max(document.documentElement.clientHeight, window.innerHeight || 0)')).to eq(704 - CHROMEBROWSER_UICHROME_HEIGHT)
   end
-  
+
+  it "can create a new webdriver driver using chrome and iPad Pro (portrait)" do
+    # Testing the height will fail if your monitor is not tall enough.
+    # For instance, a 15" MacBook Pro cannot be.
+    # This will determine if your monitor is tall enough.
+    # Optionally, you can override with an environment variable:
+    # `I_HAVE_A_TALL_MONITOR=true rspec spec/this_file.rb`
+    width = 800; height = 1302
+    @driver = Webdriver::UserAgent.driver(:viewport_width => "#{width}", :viewport_height => height, :agent => :desktop)
+    browser_max_height = @driver.execute_script('return Math.max(document.documentElement.clientHeight, window.innerHeight || 0)')
+    @you_have_a_tall_monitor = (browser_max_height > (1302 - CHROMEBROWSER_UICHROME_HEIGHT))
+    @you_have_a_tall_monitor = true if ("#{ENV['I_HAVE_A_TALL_MONITOR']}".downcase == 'true')
+    @driver.quit if @driver
+    # Back to your regularly scheduled test.
+
+  	@driver = Webdriver::UserAgent.driver(:browser => :chrome, :agent => :ipad_pro, :orientation => :portrait)
+  	expect(@driver.browser).to eq(:chrome)
+  	expect(@driver.execute_script('return navigator.userAgent')).to include 'iPad'
+  	expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).to eq(1024)
+
+    # See above
+    if @you_have_a_tall_monitor
+  	   expect(@driver.execute_script('return Math.max(document.documentElement.clientHeight, window.innerHeight || 0)')).to eq(1302 - CHROMEBROWSER_UICHROME_HEIGHT)
+     end
+  end
+
   it "can create a new webdriver driver using firefox and android phone (landscape)" do
     @driver = Webdriver::UserAgent.driver(:browser => :chrome, :agent => :android_phone, :orientation => :landscape)
     expect(@driver.browser).to eq(:chrome)
     expect(@driver.execute_script('return navigator.userAgent')).to include 'Android'
-    expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).to eq(480) 
-    
+    expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).to eq(480)
+
     # Chrome is apparently setting some kind of minimum height
     # As seen on Chrome v42 on OS X Yosimite
     expect(@driver.execute_script('return Math.max(document.documentElement.clientHeight, window.innerHeight || 0)')).to eq(CHROMEBROWSER_UI_MINIMUM_HEIGHT)
-    
+
   end
 
   it "can create a new webdriver driver using chrome and android tablet (portrait)" do
@@ -64,11 +89,19 @@ describe "webdriver user agent" do
     expect(@driver.execute_script('return Math.max(document.documentElement.clientHeight, window.innerHeight || 0)')).to eq(873 - CHROMEBROWSER_UICHROME_HEIGHT)
   end
 
+  it "can create a new webdriver driver using firefox and desktop (landscape)" do
+    @driver = Webdriver::UserAgent.driver(:browser => :firefox, :agent => :desktop, :orientation => :landscape)
+    expect(@driver.browser).to eq(:firefox)
+    expect(@driver.execute_script('return navigator.userAgent')).to include 'Mac OS X'
+    expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).to eq(1366)
+    expect(@driver.execute_script('return Math.max(document.documentElement.clientHeight, window.innerHeight || 0)')).to eq(768 - FIREFOXBROWSER_UICHROME_HEIGHT)
+  end
+
    it "can create a new webdriver driver using firefox and random user agent" do
     @driver = Webdriver::UserAgent.driver(:agent => :random)
     expect(@driver.browser).to eq(:firefox)
     expect(@driver.execute_script('return navigator.userAgent')).not_to be_nil
-    expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).not_to eq(320) 
+    expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).not_to eq(320)
     expect(@driver.execute_script('return Math.max(document.documentElement.clientHeight, window.innerHeight || 0)')).not_to eq(356 - FIREFOXBROWSER_UICHROME_HEIGHT)
   end
 
@@ -76,7 +109,7 @@ describe "webdriver user agent" do
     @driver = Webdriver::UserAgent.driver(:browser => :chrome, :agent => :random)
     expect(@driver.browser).to eq(:chrome)
     expect(@driver.execute_script('return navigator.userAgent')).not_to be_nil
-    expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).not_to eq(320) 
+    expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).not_to eq(320)
     expect(@driver.execute_script('return Math.max(document.documentElement.clientHeight, window.innerHeight || 0)')).not_to eq(356 - CHROMEBROWSER_UICHROME_HEIGHT)
   end
 
@@ -86,45 +119,37 @@ describe "webdriver user agent" do
     @driver = Webdriver::UserAgent.driver(:browser => :firefox, :profile => profile)
     expect(@driver.browser).to eq(:firefox)
     expect(@driver.execute_script('return navigator.userAgent')).to include 'iPhone'
-    expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).to eq(375) 
+    expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).to eq(375)
     expect(@driver.execute_script('return Math.max(document.documentElement.clientHeight, window.innerHeight || 0)')).to eq(559 - FIREFOXBROWSER_UICHROME_HEIGHT)
-    expect(@driver.title).to eq('hello')
   end
-  
+
   it "can create a new webdriver driver using firefox and user-specified user agent" do
    @driver = Webdriver::UserAgent.driver(:user_agent_string => "Mozilla/4.0 (compatible; MSIE 5.5b1; Mac_PowerPC)")
    expect(@driver.browser).to eq(:firefox)
    expect(@driver.execute_script('return navigator.userAgent')).to include 'Mac_PowerPC'
-   
+
    @browser = Watir::Browser.new @driver
-   expect(@browser.url).to eq("about:blank") 
  end
-  
+
   it "can create a new webdriver driver using firefox and user-specified viewport sizes (string or int)" do
     width = 800
     height = 600
-    
+
     @driver = Webdriver::UserAgent.driver(:viewport_width => "#{width}", :viewport_height => height, :agent => :iphone6)
     expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).to eq(800)
     expect(@driver.execute_script('return Math.max(document.documentElement.clientHeight, window.innerHeight || 0)')).to eq(600 - FIREFOXBROWSER_UICHROME_HEIGHT)
-
-    @browser = Watir::Browser.new @driver
-    expect(@browser.url).to eq("about:blank")
  end
-  
+
   it "can create a new webdriver driver, handling for nonsense height and widths" do
     @driver = Webdriver::UserAgent.driver(:viewport_width => "abc", :agent => :iphone6)
-    expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).to eq(375) 
+    expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).to eq(375)
   	expect(@driver.execute_script('return Math.max(document.documentElement.clientHeight, window.innerHeight || 0)')).to eq(559 - FIREFOXBROWSER_UICHROME_HEIGHT)
-   
-    @browser = Watir::Browser.new @driver
-    expect(@browser.url).to eq("about:blank")
  end
 
   it "can allow using selenium driver for watir browser" do
     @driver = Webdriver::UserAgent.driver(:browser => :firefox, :agent => :iphone, :orientation => :portrait)
     @browser = Watir::Browser.new @driver
-    expect(@browser.url).to eq("about:blank") 
+    expect(@browser.url).to include("mozilla.org")
   end
 
 end

data/webdriver-user-agent.gemspec

@@ -12,7 +12,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "webdriver-user-agent"
   gem.require_paths = ["lib"]
-  gem.version       = "7.3"
+  gem.version       = "7.4"
+  gem.requirements << 'chromedriver, v2.20'
+  # chromedriver v2.19 causes
+    # Selenium::WebDriver::Error::NoSuchDriverError: no such session errors
   gem.add_dependency 'selenium-webdriver'
   gem.add_dependency 'facets'
   gem.add_dependency 'json'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webdriver-user-agent
 version: !ruby/object:Gem::Version
-  version: '7.3'
+  version: '7.4'
 platform: ruby
 authors:
 - Alister Scott
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -140,7 +140,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- chromedriver, v2.20
 rubyforge_project: 
 rubygems_version: 2.4.6
 signing_key: