webdriver-user-agent 7.2 → 7.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ef6b7eca083c27f5dc45d9e81854697a175c706a
+  data.tar.gz: 5f29a865c65c990681a69e5902dcdbfa99bf42e9
+SHA512:
+  metadata.gz: 88a77a7c2c8c2f5c67d3d9ba1418c0b6a8d65568e77482f59841f57d574392c47d70ee38224b40f04749c916834e1a0c16ed629ac9d6b840b54c1867d5aff527
+  data.tar.gz: 2f0e6a6de214e03ad8e6866e88ae40c4136adf9302e3d574e054e52afd432fb280f5cb02a544fed2989b6f443e3497057777173b07a27b55d00a89552955b879

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p429
+ruby-2.2.1

data/ChangeLog

@@ -1,3 +1,10 @@
+=== Version 7.3 / 2015-7-14    (Thanks samnissen)
+* Enhancements
+  * Allow users to override the browser screensize
+* Fixes
+  * Removed development puts commands
+  * Chrome no longer rejects using Javascript to rewize the window
+
 === Version 7.2 / 2014-12-12
 * Enhancements
   * Added iphone 5 and 6 variants (Thanks samnissen)

data/lib/webdriver-user-agent/browser_options.rb

@@ -9,6 +9,9 @@ module Webdriver
         options[:browser] ||= :firefox
         options[:agent] ||= :iphone
         options[:orientation] ||= :portrait
+        
+        options[:viewport_width], options[:viewport_height] = parse_viewport_sizes(options[:viewport_width], options[:viewport_height])
+        
         initialize_for_browser(user_agent_string)
       end
 
@@ -20,7 +23,7 @@ module Webdriver
       end
 
       def browser_options
-        options.except(:browser, :agent, :orientation, :user_agent_string)
+        options.except(:browser, :agent, :orientation, :user_agent_string, :viewport_width, :viewport_height)
       end
 
       private
@@ -42,6 +45,12 @@ module Webdriver
         end
         
       end
+      
+      def parse_viewport_sizes(width, height)
+        return ["0","0"] unless "#{width}".to_i > 0 && "#{height}".to_i > 0
+        
+        ["#{width}", "#{height}"]
+      end
     end
   end
 end

data/lib/webdriver-user-agent/devices.rb

@@ -8,7 +8,9 @@ module Webdriver
         YAML.load_file devices_file
       end
 
-      def resolution_for(device_name, orientation)
+      def resolution_for(device_name, orientation, user_width, user_height)
+        return [user_width.to_i, user_height.to_i] if ((user_width.to_i + user_height.to_i) > 1)
+        
         device = devices[device_name.downcase][orientation.downcase]
         [device[:width],device[:height]]
       end

data/lib/webdriver-user-agent/driver.rb

@@ -24,13 +24,14 @@ module Webdriver
           driver.close
           driver.switch_to.window driver.window_handles.first
         end
-        driver.execute_script("window.innerWidth = #{width}; window.innerHeight = #{height};")
+        target_size = Selenium::WebDriver::Dimension.new(width.to_i, height.to_i)
+        driver.manage.window.size = target_size
       end
 
       def build_driver_using(options)
         driver = Selenium::WebDriver.for options.browser, options.browser_options
         unless options.agent == :random
-          resize_inner_window(driver, *resolution_for(options.agent, options.orientation))
+          resize_inner_window(driver, *resolution_for(options.agent, options.orientation, options.viewport_width, options.viewport_height))
         end
         driver
       end

data/spec/webdriver-user-agent_spec.rb

@@ -6,65 +6,78 @@ require 'webdriver-user-agent'
 require 'selenium-webdriver'
 require 'watir-webdriver'
 
+CHROMEBROWSER_UICHROME_HEIGHT   = 72
+CHROMEBROWSER_UI_MINIMUM_HEIGHT = 200
+FIREFOXBROWSER_UICHROME_HEIGHT  = 79
+
 describe "webdriver user agent" do
   after :each do
     @driver.quit if @driver
   end
+  
+  # window.innerWidth and window.innerHeight
+  # do not accurately provide 
+  # browser widths and heights
+  # http://stackoverflow.com/a/8876069/1651458
 
   it "can create a new webdriver driver using firefox and iphone (portrait) by default" 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 window.innerWidth')).to eq(375) 
-  	expect(@driver.execute_script('return window.innerHeight')).to eq(559)
+  	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
 
   it "can create a new webdriver driver using chrome and iphone 6 plus (landscape)" do
   	@driver = Webdriver::UserAgent.driver(:browser => :chrome, :agent => :iphone6plus, :orientation => :landscape)
   	expect(@driver.browser).to eq(:chrome)
   	expect(@driver.execute_script('return navigator.userAgent')).to include 'iPhone'
-  	expect(@driver.execute_script('return window.innerWidth')).to eq(736) 
-  	expect(@driver.execute_script('return window.innerHeight')).to eq(414)
+  	expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).to eq(736)
+  	expect(@driver.execute_script('return Math.max(document.documentElement.clientHeight, window.innerHeight || 0)')).to eq(414 - CHROMEBROWSER_UICHROME_HEIGHT)
   end
 
   it "can create a new webdriver driver using chrome and iPad (landscape)" 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 window.innerWidth')).to eq(1024) 
-  	expect(@driver.execute_script('return window.innerHeight')).to eq(704)
+  	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 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 window.innerWidth')).to eq(480) 
-    expect(@driver.execute_script('return window.innerHeight')).to eq(196)
+    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 firefox and android tablet (portrait)" do
+  it "can create a new webdriver driver using chrome and android tablet (portrait)" do
     @driver = Webdriver::UserAgent.driver(:browser => :chrome, :agent => :android_tablet, :orientation => :portrait)
     expect(@driver.browser).to eq(:chrome)
     expect(@driver.execute_script('return navigator.userAgent')).to include 'Android'
-    expect(@driver.execute_script('return window.innerWidth')).to eq(768)
-    expect(@driver.execute_script('return window.innerHeight')).to eq(946)
+    expect(@driver.execute_script('return Math.max(document.documentElement.clientWidth, window.innerWidth || 0)')).to eq(768)
+    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 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 window.innerWidth')).not_to eq(320) 
-    expect(@driver.execute_script('return window.innerHeight')).not_to eq(356)
+    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
 
   it "can create a new webdriver driver using chrome and random 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 window.innerWidth')).not_to eq(320) 
-    expect(@driver.execute_script('return window.innerHeight')).not_to eq(356)
+    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
 
   it "can create a new webdriver driver using an existing firefox profile" do
@@ -73,19 +86,40 @@ 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 window.innerWidth')).to eq(375) 
-    expect(@driver.execute_script('return window.innerHeight')).to eq(559)
+    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')).not_to be_nil
+   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.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)
@@ -93,7 +127,4 @@ describe "webdriver user agent" do
     expect(@browser.url).to eq("about:blank") 
   end
 
-
-
-
-end
+end

data/webdriver-user-agent.gemspec

@@ -12,11 +12,11 @@ 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.2"
+  gem.version       = "7.3"
   gem.add_dependency 'selenium-webdriver'
   gem.add_dependency 'facets'
   gem.add_dependency 'json'
+  gem.add_dependency 'psych'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'watir-webdriver'
-
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webdriver-user-agent
 version: !ruby/object:Gem::Version
-  version: '7.2'
-  prerelease: 
+  version: '7.3'
 platform: ruby
 authors:
 - Alister Scott
@@ -10,86 +9,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: facets
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A helper gem to emulate populate device user agents and resolutions when
@@ -101,10 +104,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
 - ChangeLog
 - Gemfile
 - HISTORY.md
@@ -122,27 +125,26 @@ files:
 - webdriver-user-agent.gemspec
 homepage: https://github.com/alisterscott/webdriver-user-agent
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A helper gem to emulate populate device user agents and resolutions when
   using webdriver
 test_files: