RDee 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6913d8a2e54ddce805ddbff2545d301e242f3a88
-  data.tar.gz: 95255bf370f561c56c592debcb485fd5d76fda50
+  metadata.gz: ddc2af143bf017104810f95d5b674af152e7fdaf
+  data.tar.gz: 121b358d8be9e3ba33194c15cbbecbc1201eba96
 SHA512:
-  metadata.gz: e658f4076f85347f464ab3021d67f68f743b17c08e174b419905af9a8db31bae658ce71431536acd50d4ddfd7eb2dc3584f4a0106bb8eeead10a1cd28203bd42
-  data.tar.gz: 16209f4084c63e3a1ea3d7ae321133f511a366da5af8d3c3ef7c85e76b9a838590af49fecbe7fbe3d2beb9f9362709f3501ba405b385f62872de381818630df5
+  metadata.gz: 5af5672699a6d69f42eeedde245f1a00d49a71b6358faf1008841cc7991e227e54629e179ce9a2e229c59050532840265585df6d52bdcee2e57775b438df1341
+  data.tar.gz: d359d90e0d09aa3fdbe0e16bf5a941f5cdc20718536b40c6c2736a4dd3c7df72aa61fb743b943707d507f8143345b98cffb6ab21ab7404762d1d53406769aa65

data/.gitignore

@@ -3,6 +3,7 @@
 .bundle
 .config
 .yardoc
+.idea
 Gemfile.lock
 InstalledFiles
 _yardoc

data/ChangeLog

@@ -1,3 +1,10 @@
+=== Release 0.4 / 15 October 2016
+* Enhancements
+  * Added support for Yosemite
+  * Removed support for Snow Lepord
+  * Added support for El Capitan
+  * Added support for Windows 10
+
 === Release 0.3 / 8-September-2014
 * Enhancements
   * Added iPhone support

data/README.md

@@ -49,7 +49,7 @@ firefox30_win8
 ````
 
 The first part of the target determines what browser to use.  At the current time you can
-specify `firefox`, `chrome`, `ie`, or `safari`.  In the near future we will be supporting
+specify `firefox`, `chrome`, `ie`, `safari`, `phantomjs` or `iphone`.  In the near future we will be supporting more
 mobile platforms so stay tuned.
 
 Immediately following the browser is the version.  This is optional and if you do not specify
@@ -61,14 +61,22 @@ optional.  Currently the following host os values are available:
 
 | host | description |
 | --- | --- |
+| win10 | Windows 10 |
 | win81 | Windows 8.1 |
 | win8 | Windows 8 |
 | win7 | Windows 7 |
 | winxp | Windows XP |
-| snow_leopard | OS X 10.6 |
 | mountain_lion | OS X 10.8 |
 | mavricks | OS X 10.9 |
+| yosemite | OS X 10.10 |
+| el_capitan | OS X 10.11 |
 | linux | Linux |
+| ios60 | 'OS X 10.8'|
+| ios61 | 'OS X 10.8' |
+| ios70 | 'OS X 10.9' |
+| ios71 | 'OS X 10.9' |
+| ios80 | 'OS X 10.10' |
+| ios81 | 'OS X 10.10' |
 
 The host os value is typically used when running the tests on a Selenium Grid.  It is up to
 you to ensure that the host and requested browser combination exist on your grid.

data/features/environment_variable.feature

@@ -2,34 +2,39 @@ Feature: RDee should work well with browsers when target is set via environment
 
   Since I only have a Mac I will test Firefox, Chrome, and Safari
 
+  @firefox
   Scenario: Creating a Firefox browser with a variable using Selenium
     When I establish a Firefox browser with a variable using Selenium
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @firefox
   Scenario: Creating a Firefox browser with a variable using Watir
     When I establish a Firefox browser with a variable using Watir
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @chrome
   Scenario: Creating a Chrome browser with a variable using Selenium
     When I establish a Chrome browser with a variable using Selenium
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @chrome
   Scenario: Creating a Chrome browser with a variable using Watir
     When I establish a Chrome browser with a variable using Watir
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @safari
   Scenario: Creating a Safari browser with a variable using Selenium
     When I establish a Safari browser with a variable using Selenium
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @safari
   Scenario: Creating a Safari browser with a variable using Watir
     When I establish a Safari browser with a variable using Watir
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
-  

data/features/local_browsers.feature

@@ -2,34 +2,38 @@ Feature: RDee should work well with browsers on your local machine
 
   Since I only have a Mac I will test Firefox, Chrome, and Safari
 
+  @firefox
   Scenario: Creating a Firefox browser on the local machine using Selenium
     When I establish a Firefox browser on the local machine using Selenium
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @firefox
   Scenario: Creating a Firefox browser on the local machine using Watir
     When I establish a Firefox browser on the local machine using Watir
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @chrome
   Scenario: Creating a Chrome browser on the local machine using Selenium
     When I establish a Chrome browser on the local machine using Selenium
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @chrome
   Scenario: Creating a Chrome browser on the local machine using Watir
     When I establish a Chrome browser on the local machine using Watir
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @safari
   Scenario: Creating a Safari browser on the local machine using Selenium
     When I establish a Safari browser on the local machine using Selenium
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @safari
   Scenario: Creating a Safari browser on the local machine using Watir
     When I establish a Safari browser on the local machine using Watir
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
-
-  

data/features/mobile_remote.feature

@@ -1,26 +1,43 @@
 Feature: RDee should work well with mobile devices on a remote selenium grid
 
+  @mobile
+  Scenario: Creating an iPhone browser on ios 8.1
+    When I establish a iphone_ios81 browser on the remote machine using Selenium
+    And I go to the cheezyworld site
+    And I select the transformations link
+    Then I should see the text "Cucumber Transformations Screencast"
+
+  @mobile
+  Scenario: Creating an iPhone browser on ios 8.0
+    When I establish a iphone_ios80 browser on the remote machine using Selenium
+    And I go to the cheezyworld site
+    And I select the transformations link
+    Then I should see the text "Cucumber Transformations Screencast"
+
+  @mobile
   Scenario: Creating an iPhone browser on ios 7.1
     When I establish a iphone_ios71 browser on the remote machine using Selenium
     And I go to the cheezyworld site
     And I select the transformations link
     Then I should see the text "Cucumber Transformations Screencast"
 
+  @mobile
   Scenario: Creating an iPhone browser on ios 7.0
     When I establish a iphone_ios70 browser on the remote machine using Selenium
     And I go to the cheezyworld site
     And I select the transformations link
     Then I should see the text "Cucumber Transformations Screencast"
 
+  @mobile
   Scenario: Creating an iPhone browser on ios 6.1
     When I establish a iphone_ios61 browser on the remote machine using Selenium
     And I go to the cheezyworld site
     And I select the transformations link
     Then I should see the text "Cucumber Transformations Screencast"
 
+  @mobile
   Scenario: Creating an iPhone browser on ios 6.0
     When I establish a iphone_ios60 browser on the remote machine using Selenium
     And I go to the cheezyworld site
     And I select the transformations link
     Then I should see the text "Cucumber Transformations Screencast"
-

data/features/remote_browsers.feature

@@ -1,54 +1,67 @@
 Feature: RDee should work well with browsers on a remote selenium grid
 
-
+  @firefox
   Scenario: Creating a browser on the remote machine using Selenium
     When I establish a firefox browser on the remote machine using Selenium
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @firefox
   Scenario: Creating a browser on the remote machine using Watir
     When I establish a firefox browser on the remote machine using Watir
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @chrome
+  Scenario: Creating a browser on Windows 10
+    When I establish a chrome32_win10 browser on the remote machine using Watir
+    Then I should be able to perform a google search for cheezyworld
+    And I should be able to close the connection
+
+  @chrome
   Scenario: Creating a browser on Windows 8.1
     When I establish a chrome32_win81 browser on the remote machine using Watir
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @chrome
   Scenario: Creating a browser on Windows 8
     When I establish a chrome32_win8 browser on the remote machine using Watir
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @chrome
   Scenario: Creating a browser on Windows 7
     When I establish a chrome32_win7 browser on the remote machine using Watir
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @chrome
   Scenario: Creating a browser on Windows XP
     When I establish a chrome32_winxp browser on the remote machine using Watir
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
-  Scenario: Creating a browser on Snow Leopard
-    When I establish a chrome32_snow_leopard browser on the remote machine using Watir
+  @chrome
+  Scenario: Creating a browser on El Capitan
+    When I establish a chrome32_el_capitan browser on the remote machine using Watir
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @chrome
   Scenario: Creating a browser on Mountain Lion
     When I establish a chrome32_mountain_lion browser on the remote machine using Watir
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @chrome
   Scenario: Creating a browser on Mavricks
     When I establish a chrome32_mavricks browser on the remote machine using Watir
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
 
+  @chrome
   Scenario: Creating a browser on Linux
     When I establish a chrome32_linux browser on the remote machine using Watir
     Then I should be able to perform a google search for cheezyworld
     And I should be able to close the connection
-
-

data/lib/rdee.rb

@@ -1,6 +1,8 @@
 require 'rdee/version'
 require 'rdee/browser_factory'
 require 'rdee/target_parser'
+require 'rdee/desired_capabilities'
+require 'rdee/additional_options'
 
 #
 # RDee was designed to make it easy for your tests to switch between different browsers.  It

data/lib/rdee/additional_options.rb

@@ -0,0 +1,35 @@
+module RDee
+  module AdditionalOptions
+
+    def additional_options_for(target)
+      options = {}
+      options.merge!(chrome_options) if need_chrome_options? target
+      options.merge!(firefox_options) if need_firefox_options? target
+      options.merge!(ie_options) if need_ie_optons? target
+      options.merge!(safari_options) if need_safari_options? target
+      options.merge!(iphone_options) if need_iphone_options? target
+      options
+    end
+
+    def need_chrome_options?(target)
+      not chrome_options.nil? and target.to_s.include? 'chrome'
+    end
+
+    def need_firefox_options?(target)
+      not firefox_options.nil? and target.to_s.include? 'firefox'
+    end
+
+    def need_ie_optons?(target)
+      not ie_options.nil? and target.to_s.include? 'ie'
+    end
+
+    def need_safari_options?(target)
+      not safari_options.nil? and target.to_s.include? 'safari'
+    end
+
+    def need_iphone_options?(target)
+      not iphone_options.nil? and target.to_s.include? 'iphone'
+    end
+
+  end
+end

data/lib/rdee/browser_factory.rb

@@ -1,5 +1,7 @@
 require_relative 'target_parser'
 require_relative 'mobile_devices'
+require_relative 'desired_capabilities'
+require_relative 'additional_options'
 
 module RDee
   class ConnectionError < StandardError
@@ -7,6 +9,8 @@ module RDee
   
   class BrowserFactory
     include TargetParser
+    include DesiredCapabilities
+    include AdditionalOptions
 
     attr_accessor :url, :persistent_http, :chrome_options, :firefox_options,
     :ie_options, :safari_options, :iphone_options
@@ -53,55 +57,18 @@ module RDee
       target = ENV['RDEE_BROWSER'].to_sym if ENV['RDEE_BROWSER'] 
       platform, version, host = parse(target)
       options.merge! additional_options_for target
-      capabilities = capabilities(platform, version, host)
       options[:url] = url unless url.nil?
       if options.include? :url
+        options[:desired_capabilities] = capabilities(platform, version, host, options[:desired_capabilities])
         platform = :remote
-        options[:desired_capabilities] = capabilities
       end
       options[:http_client] = http_client if persistent_http or options.delete(:persistent_http)
       return platform, options
     end
 
-    def capabilities(platform, version, host)
-      capabilities = Selenium::WebDriver::Remote::Capabilities.send platform
-      capabilities.version = version unless version.nil?
-      capabilities.platform = host unless host.nil?
-      capabilities
-    end
-
     def http_client
       Selenium::WebDriver::Remote::Http::Persistent.new
     end
 
-    def additional_options_for(target)
-      options = {}
-      options.merge!(chrome_options) if need_chrome_options? target
-      options.merge!(firefox_options) if need_firefox_options? target
-      options.merge!(ie_options) if need_ie_optons? target
-      options.merge!(safari_options) if need_safari_options? target
-      options.merge!(iphone_options) if need_iphone_options? target
-      options
-    end
-
-    def need_chrome_options?(target)
-      not chrome_options.nil? and target.to_s.include? 'chrome'
-    end
-
-    def need_firefox_options?(target)
-      not firefox_options.nil? and target.to_s.include? 'firefox'
-    end
-
-    def need_ie_optons?(target)
-      not ie_options.nil? and target.to_s.include? 'ie'
-    end
-
-    def need_safari_options?(target)
-      not safari_options.nil? and target.to_s.include? 'safari'
-    end
-
-    def need_iphone_options?(target)
-      not iphone_options.nil? and target.to_s.include? 'iphone'
-    end
   end
 end

data/lib/rdee/desired_capabilities.rb

@@ -0,0 +1,14 @@
+module RDee
+  module DesiredCapabilities
+
+    def capabilities(platform, version, host, existing_capabilities)
+      capabilities = Selenium::WebDriver::Remote::Capabilities.send platform
+      capabilities.version = version unless version.nil?
+      capabilities.platform = host unless host.nil?
+      capabilities = existing_capabilities.merge(capabilities) if existing_capabilities
+      capabilities
+    end
+
+
+  end
+end

data/lib/rdee/target_parser.rb

@@ -8,7 +8,7 @@ module RDee
       target = target_for(value)
       version = version_for(value)
       host = host_for(value)
-      return  target, version, host
+      return target, version, host
     end
 
     private
@@ -38,23 +38,27 @@ module RDee
     end
 
     def mobile_version(value)
-      value.to_s.split(/_/).slice(1..-1)[0][-2,2].insert(1, '.')
+      value.to_s.split(/_/).slice(1..-1)[0][-2, 2].insert(1, '.')
     end
 
     def host_lookup
       @host_lookup ||= {
-        win81: 'Windows 8.1',
-        win8: 'Windows 8',
-        win7: 'Windows 7',
-        winxp: 'Windows XP',
-        snow_leopard: 'OS X 10.6',
-        mountain_lion: 'OS X 10.8',
-        mavricks: 'OS X 10.9',
-        linux: 'Linux',
-        ios60: 'OS X 10.8',
-        ios61: 'OS X 10.8',
-        ios70: 'OS X 10.9',
-        ios71: 'OS X 10.9'
+          win10: 'Windows 10',
+          win81: 'Windows 8.1',
+          win8: 'Windows 8',
+          win7: 'Windows 7',
+          winxp: 'Windows XP',
+          mountain_lion: 'OS X 10.8',
+          mavricks: 'OS X 10.9',
+          yosemite: 'OS X 10.10',
+          el_capitan: 'OS X 10.11',
+          linux: 'Linux',
+          ios60: 'OS X 10.8',
+          ios61: 'OS X 10.8',
+          ios70: 'OS X 10.9',
+          ios71: 'OS X 10.9',
+          ios80: 'OS X 10.10',
+          ios81: 'OS X 10.10'
       }
     end
 

data/lib/rdee/version.rb

@@ -1,3 +1,3 @@
 module RDee
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

data/spec/lib/rd_spec.rb

@@ -13,9 +13,9 @@ describe RDee do
 
     it "should catch and print exceptions that occur when establishing a connection" do
       expect(watir_browser).to receive(:new).and_raise(Exception, 'foo')
-      expect{ RDee.watir_browser }.to raise_error(RDee::ConnectionError, 'foo')
+      expect { RDee.watir_browser }.to raise_error(RDee::ConnectionError, 'foo')
     end
-end
+  end
 
   context "when getting a connection for Selenium" do
     let(:selenium_browser) { Selenium::WebDriver }
@@ -27,9 +27,9 @@ end
 
     it "should catch and print exceptions that occur when establishing a connection" do
       expect(selenium_browser).to receive(:for).and_raise(Exception, 'foo')
-      expect{ RDee.selenium_browser }.to raise_error(RDee::ConnectionError, 'foo')
+      expect { RDee.selenium_browser }.to raise_error(RDee::ConnectionError, 'foo')
     end
-end
+  end
 
   context "when using common functionality" do
     it "should use the BROWSER environment variable when present" do
@@ -82,7 +82,7 @@ end
     end
 
   end
-  
+
   context "when passing additional browser options" do
     it "should allow users to add additional options for chrome by configuration" do
       RDee.configure do |config|

data/spec/lib/target_parser_spec.rb

@@ -26,6 +26,11 @@ describe RDee::TargetParser do
     expect(version).to be_nil
   end
 
+  it "should parse the windows 10 host" do
+    target, version, host = parser.parse(:firefox30_win10)
+    expect(host).to eql 'Windows 10'
+  end
+
   it "should parse the windows 8.1 host" do
     target, version, host = parser.parse(:firefox30_win81)
     expect(host).to eql 'Windows 8.1'
@@ -46,9 +51,9 @@ describe RDee::TargetParser do
     expect(host).to eql 'Windows XP'
   end
 
-  it "should parse snow leopard" do
-    target, version, host = parser.parse(:firefox30_snow_leopard)
-    expect(host).to eql 'OS X 10.6'
+  it "should parse el capitan" do
+    target, version, host = parser.parse(:firefox30_el_capitan)
+    expect(host).to eql 'OS X 10.11'
   end
 
   it "should parse mountain lion" do

data/spec/lib/targets_spec.rb

@@ -211,13 +211,33 @@ describe "Supported browser combinations" do
       RDee.watir_browser :iphone_ios71, url: 'http://blah'
     end
 
-  end
+    it "includes iPhone with ios 8.0" do
+      expect(desired_capabilities).to receive(:version=).with('8.0')
+      expect(desired_capabilities).to receive(:platform=).with('OS X 10.10')
+      expect(watir_browser).to receive(:new).with(:remote, url: 'http://blah', desired_capabilities: anything())
+      RDee.watir_browser :iphone_ios80, url: 'http://blah'
+    end
+
+      it "includes iPhone with ios 8.1" do
+      expect(desired_capabilities).to receive(:version=).with('8.1')
+      expect(desired_capabilities).to receive(:platform=).with('OS X 10.10')
+      expect(watir_browser).to receive(:new).with(:remote, url: 'http://blah', desired_capabilities: anything())
+      RDee.watir_browser :iphone_ios81, url: 'http://blah'
+    end
+end
 
   context "for hosts" do
     before(:each) do
       allow(capabilities).to receive(:firefox).and_return(desired_capabilities)
     end
 
+    it "should properly identify Windows 10" do
+      expect(desired_capabilities).to receive(:version=).with('30')
+      expect(desired_capabilities).to receive(:platform=).with('Windows 10')
+      expect(watir_browser).to receive(:new)
+      RDee.watir_browser :firefox30_win10, url: 'http://blah'
+    end
+
     it "should properly identify Windows 8.1" do
       expect(desired_capabilities).to receive(:version=).with('30')
       expect(desired_capabilities).to receive(:platform=).with('Windows 8.1')
@@ -246,11 +266,11 @@ describe "Supported browser combinations" do
       RDee.watir_browser :firefox30_winxp, url: 'http://blah'
     end
 
-    it "should properly identify Snow Leopard" do
+    it "should properly identify El Capitan" do
       expect(desired_capabilities).to receive(:version=).with('30')
-      expect(desired_capabilities).to receive(:platform=).with('OS X 10.6')
+      expect(desired_capabilities).to receive(:platform=).with('OS X 10.11')
       expect(watir_browser).to receive(:new)
-      RDee.watir_browser :firefox30_snow_leopard, url: 'http://blah'
+      RDee.watir_browser :firefox30_el_capitan, url: 'http://blah'
     end
 
     it "should properly identify Mountain Lion" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: RDee
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Jeffrey S. Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2016-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -135,7 +135,9 @@ files:
 - features/support/pages/cheezyworld.rb
 - features/support/pages/google_search.rb
 - lib/rdee.rb
+- lib/rdee/additional_options.rb
 - lib/rdee/browser_factory.rb
+- lib/rdee/desired_capabilities.rb
 - lib/rdee/mobile_devices.rb
 - lib/rdee/target_parser.rb
 - lib/rdee/version.rb
@@ -164,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Dynamically create a connection for Selenium or Watir.