webdriver-user-agent 7.1 → 7.2

data/ChangeLog

@@ -1,3 +1,8 @@
+=== Version 7.2 / 2014-12-12
+* Enhancements
+  * Added iphone 5 and 6 variants (Thanks samnissen)
+  * Added ability to pass options user agent (Thanks samnissen)
+
 === Version 7.1 / 2014-3-2
 * Enhancements
   * Added ipad 7 device support (Thanks Matthwe Fleeger)

data/README.md

@@ -39,15 +39,15 @@ provides a UserAgent.driver method to return a new web-driver with user agent an
 
 	require 'selenium-webdriver'
 	require 'webdriver-user-agent'
-	driver = UserAgent.driver(:browser => :chrome, :agent => :iphone, :orientation => :landscape)
+	driver = Webdriver::UserAgent.driver(:browser => :chrome, :agent => :iphone, :orientation => :landscape)
 	driver.get 'http://tiffany.com'
 	driver.current_url.should == 'http://m.tiffany.com/International.aspx'
 
 ### Example using random user agent
 
-	require 'selenium-webdriber'
+	require 'selenium-webdriver'
 	require 'webdriver-user-agent'
-	driver = UserAgent.driver(:agent => :random)
+	driver = Webdriver::UserAgent.driver(:agent => :random)
 	driver.execute_script('return navigator.userAgent')
 	# random agent like "Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:0.9.2) Gecko/20010726 Netscape6/6.1"
 
@@ -55,8 +55,8 @@ provides a UserAgent.driver method to return a new web-driver with user agent an
 
 	require 'watir-webdriver'
 	require 'webdriver-user-agent'
-	driver = UserAgent.driver(:browser => :chrome, :agent => :iphone, :orientation => :landscape)
-	browser = Watir::Browser.new driver
+	driver = Webdriver::UserAgent.driver(:browser => :chrome, :agent => :iphone, :orientation => :landscape)
+	browser = Watir::Browser.new(driver)
 	browser.goto 'tiffany.com'
 	browser.url.should == 'http://m.tiffany.com/International.aspx'
 

data/lib/device-info/devices.yaml

@@ -1,27 +1,51 @@
 :iphone:
-  :user_agent: "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_2 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8H7 Safari/6533.18.5"
+   :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
+     :height: 559
+   :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"
+  :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"
+  :portrait:
+    :width: 375
+    :height: 559
+  :landscape:
+    :width: 667
+    :height: 375
+: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"
+  :portrait:
+    :width: 320
+    :height: 460
+  :landscape:
+    :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"
   :portrait:
     :width: 320
     :height: 356
   :landscape:
     :width: 480
     :height: 196
-:ipad_seven:
-  :user_agent: "Mozilla/5.0 (iPad; CPU OS 6_1_3 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10B329 Safari/8536.25"
-  :portrait:
-    :width: 768
-    :height: 946
-  :landscape:
-    :width: 1024
-    :height: 690
 :ipad:
-  :user_agent: "Mozilla/5.0(iPad; U; CPU OS 5_0 like Mac OS X; en-us) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3"
+  :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"
   :portrait:
     :width: 768
-    :height: 946
+    :height: 960
   :landscape:
     :width: 1024
-    :height: 690
+    :height: 704
 :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/lib/webdriver-user-agent/browser_options.rb

@@ -20,7 +20,7 @@ module Webdriver
       end
 
       def browser_options
-        options.except(:browser, :agent, :orientation)
+        options.except(:browser, :agent, :orientation, :user_agent_string)
       end
 
       private

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

@@ -10,7 +10,8 @@ module Webdriver
       include Devices
 
       def for(opts)
-        user_agent_string = agent_string_for opts[:agent]
+        user_agent_string   = opts[:user_agent_string]
+        user_agent_string ||= agent_string_for opts[:agent]
         options = BrowserOptions.new(opts, user_agent_string)
         build_driver_using options
       end

data/spec/webdriver-user-agent_spec.rb

@@ -13,67 +13,84 @@ describe "webdriver user agent" do
 
   it "can create a new webdriver driver using firefox and iphone (portrait) by default" do
   	@driver = Webdriver::UserAgent.driver
-  	@driver.browser.should == :firefox
-  	@driver.execute_script('return navigator.userAgent').should include 'iPhone'
-  	@driver.execute_script('return window.innerWidth').should == 320 
-  	@driver.execute_script('return window.innerHeight').should == 356
+  	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)
+  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)
   end
 
   it "can create a new webdriver driver using chrome and iPad (landscape)" do
   	@driver = Webdriver::UserAgent.driver(:browser => :chrome, :agent => :iPad, :orientation => :landscape)
-  	@driver.browser.should == :chrome
-  	@driver.execute_script('return navigator.userAgent').should include 'iPad'
-  	@driver.execute_script('return window.innerWidth').should == 1024 
-  	@driver.execute_script('return window.innerHeight').should == 690
+  	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)
   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)
-    @driver.browser.should == :chrome
-    @driver.execute_script('return navigator.userAgent').should include 'Android'
-    @driver.execute_script('return window.innerWidth').should == 480 
-    @driver.execute_script('return window.innerHeight').should == 196
+    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)
   end
 
   it "can create a new webdriver driver using firefox and android tablet (portrait)" do
     @driver = Webdriver::UserAgent.driver(:browser => :chrome, :agent => :android_tablet, :orientation => :portrait)
-    @driver.browser.should == :chrome
-    @driver.execute_script('return navigator.userAgent').should include 'Android'
-    @driver.execute_script('return window.innerWidth').should == 768
-    @driver.execute_script('return window.innerHeight').should == 946
+    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)
   end
 
    it "can create a new webdriver driver using firefox and random user agent" do
     @driver = Webdriver::UserAgent.driver(:agent => :random)
-    @driver.browser.should == :firefox
-    @driver.execute_script('return navigator.userAgent').should_not be_nil
-    @driver.execute_script('return window.innerWidth').should_not == 320 
-    @driver.execute_script('return window.innerHeight').should_not == 356
+    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)
   end
 
   it "can create a new webdriver driver using chrome and random user agent" do
     @driver = Webdriver::UserAgent.driver(:browser => :chrome, :agent => :random)
-    @driver.browser.should == :chrome
-    @driver.execute_script('return navigator.userAgent').should_not be_nil
-    @driver.execute_script('return window.innerWidth').should_not == 320 
-    @driver.execute_script('return window.innerHeight').should_not == 356
+    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)
   end
 
   it "can create a new webdriver driver using an existing firefox profile" do
     profile = Selenium::WebDriver::Firefox::Profile.new
     profile['browser.startup.homepage'] = "data:text/html,<title>hello</title>"
     @driver = Webdriver::UserAgent.driver(:browser => :firefox, :profile => profile)
-    @driver.browser.should == :firefox
-    @driver.execute_script('return navigator.userAgent').should include 'iPhone'
-    @driver.execute_script('return window.innerWidth').should == 320 
-    @driver.execute_script('return window.innerHeight').should == 356
-    @driver.title.should == 'hello'
+    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.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
+   
+   @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
-    @browser.url.should == "about:blank" 
+    expect(@browser.url).to eq("about:blank") 
   end
 
 

data/webdriver-user-agent.gemspec

@@ -12,7 +12,7 @@ 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.1"
+  gem.version       = "7.2"
   gem.add_dependency 'selenium-webdriver'
   gem.add_dependency 'facets'
   gem.add_dependency 'json'

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: webdriver-user-agent
 version: !ruby/object:Gem::Version
-  version: '7.1'
+  version: '7.2'
+  prerelease: 
 platform: ruby
 authors:
 - Alister Scott
@@ -9,76 +10,86 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2014-12-12 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: 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
@@ -111,26 +122,27 @@ 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: 2.0.14
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A helper gem to emulate populate device user agents and resolutions when
   using webdriver
 test_files:

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 246376dd09fe9eac558fb372804af885dd6003c7
-  data.tar.gz: 55dbadaf04794351c98dd424ac3d070beed31bfb
-SHA512:
-  metadata.gz: 6028660e13b8adbadcc1d4aafab55ead2b6293ed694381981ec8f6d48d39ecc29a380e21f60fe036a6d09b547183cf592b9af65741515e47af56a2b288b0a319
-  data.tar.gz: e3b2392dcfa301994b381d46cc26e26491e5170fae94d772ce85614d39d273d923ec7c2e5eedb750cb25d7963f59d1ee18f14b2ab220e1e298464f0c429d4968