RDee 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ee57a488781369377cdc08a2c8ef183d0d599ad
-  data.tar.gz: b93f7f13abec8499bd2b559bf719fb8a177a7ce5
+  metadata.gz: 6913d8a2e54ddce805ddbff2545d301e242f3a88
+  data.tar.gz: 95255bf370f561c56c592debcb485fd5d76fda50
 SHA512:
-  metadata.gz: 8535d8b60f972c6d1b52a97b4b0b3dcd6057672825e96f927c4ef1ee83fe20334ea90d2090a56f06a61100f9c32347239a940fe232822f57204b8b181fafc326
-  data.tar.gz: 4695865cee85acaa708296d9fd2ca3db5a6d36e5e4321f6e6e1a54a86d3ce5d2cc85575c937ad76feaf1df9614d62ccb0240d058821501f4b4a08df3c740d6e8
+  metadata.gz: e658f4076f85347f464ab3021d67f68f743b17c08e174b419905af9a8db31bae658ce71431536acd50d4ddfd7eb2dc3584f4a0106bb8eeead10a1cd28203bd42
+  data.tar.gz: 16209f4084c63e3a1ea3d7ae321133f511a366da5af8d3c3ef7c85e76b9a838590af49fecbe7fbe3d2beb9f9362709f3501ba405b385f62872de381818630df5

data/ChangeLog

@@ -1,3 +1,7 @@
+=== Release 0.3 / 8-September-2014
+* Enhancements
+  * Added iPhone support
+
 === Release 0.2 / 18-August-2014
 * Enhancements
   * Printing and raising exception when browser connection cannot be established

data/features/mobile_remote.feature

@@ -0,0 +1,26 @@
+Feature: RDee should work well with mobile devices on a remote selenium grid
+
+  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"
+
+  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"
+
+  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"
+
+  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

@@ -0,0 +1,54 @@
+Feature: RDee should work well with browsers on a remote selenium grid
+
+
+  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
+
+  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
+
+  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
+
+  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
+
+  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
+
+  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
+    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 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
+
+  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
+
+  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/features/step_definitions/rdee_steps.rb

@@ -8,6 +8,11 @@ When(/^I establish a (.+) browser with a variable using (.+)$/) do |browser, pla
   ENV.delete 'RDEE_BROWSER'
 end
 
+When(/^I establish a (.+) browser on the remote machine using (.+)$/) do |browser, platform|
+  @browser = RDee.send "#{platform.downcase}_browser",
+  browser.to_sym, url: 'http://rdee:730071ad-7331-4d65-bd56-ec3ebfdd8232@ondemand.saucelabs.com:80/wd/hub'
+end
+
 Then(/^I should be able to perform a google search for cheezyworld$/) do
   visit(GoogleSearch) do |page|
     page.perform_search
@@ -20,3 +25,15 @@ end
 Then(/^I should be able to close the connection$/) do
   @browser.close
 end
+
+When(/^I go to the cheezyworld site$/) do
+  visit CheezyWorld
+end
+
+When(/^I select the transformations link$/) do
+  on(CheezyWorld).transformations_element.click
+end
+
+Then(/^I should see the text "(.*?)"$/) do |message|
+  expect(@current_page.text).to include message
+end

data/features/support/pages/cheezyworld.rb

@@ -0,0 +1,8 @@
+class CheezyWorld
+  include PageObject
+
+  page_url 'http://cheezyworld.com'
+
+  h2(:transformations, class: 'post-title')
+  
+end

data/features/support/pages/google_search.rb

@@ -4,9 +4,11 @@ class GoogleSearch
   page_url 'http://google.com'
 
   text_field(:criteria, name: 'q')
+  button(:search, name: 'btnG')
 
   def perform_search
     self.criteria = 'cheezyworld'
+    search
   end
   
 end

data/lib/rdee.rb

@@ -89,7 +89,7 @@ module RDee
   end
 
   def self.selenium_browser(target = :firefox, options = {})
-    factory.watir_browser(target, options)
+    factory.selenium_browser(target, options)
   end
 
   def self.configure

data/lib/rdee/browser_factory.rb

@@ -1,6 +1,5 @@
 require_relative 'target_parser'
-
-
+require_relative 'mobile_devices'
 
 module RDee
   class ConnectionError < StandardError
@@ -10,7 +9,7 @@ module RDee
     include TargetParser
 
     attr_accessor :url, :persistent_http, :chrome_options, :firefox_options,
-    :ie_options, :safari_options
+    :ie_options, :safari_options, :iphone_options
 
     def watir_browser(target, options)
       platform, options = platform_and_options(target, options)
@@ -81,6 +80,7 @@ module RDee
       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
 
@@ -99,5 +99,9 @@ module RDee
     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/mobile_devices.rb

@@ -0,0 +1,17 @@
+
+module RDee
+  module MobileDevices
+
+    def mobile?(value)
+      mobile_targets.include? target_for(value)
+    end
+
+    
+    def mobile_targets
+      @mobile_targets ||= [
+        :iphone
+      ]
+    end
+    
+  end
+end

data/lib/rdee/target_parser.rb

@@ -1,9 +1,11 @@
+require_relative 'mobile_devices'
 
 module RDee
   module TargetParser
+    include MobileDevices
 
     def parse(value)
-      target = target_for(value).to_sym
+      target = target_for(value)
       version = version_for(value)
       host = host_for(value)
       return  target, version, host
@@ -14,11 +16,12 @@ module RDee
     def target_for(value)
       target = value.to_s.split(/\d+/)[0]
       target = target.split('_')[0] if target.include? '_'
-      target
+      target.to_sym
     end
 
     def version_for(value)
-      version = value.to_s.gsub(target_for(value), '').split(/_/)[0]
+      version = mobile_version(value) if mobile?(value)
+      version = browser_version(value) unless mobile?(value)
       unless version.nil?
         version = nil if version.empty?
       end
@@ -30,6 +33,14 @@ module RDee
       host_lookup[host.join('_').to_sym] if host
     end
 
+    def browser_version(value)
+      value.to_s.gsub(target_for(value).to_s, '').split(/_/)[0]
+    end
+
+    def mobile_version(value)
+      value.to_s.split(/_/).slice(1..-1)[0][-2,2].insert(1, '.')
+    end
+
     def host_lookup
       @host_lookup ||= {
         win81: 'Windows 8.1',
@@ -39,8 +50,13 @@ module RDee
         snow_leopard: 'OS X 10.6',
         mountain_lion: 'OS X 10.8',
         mavricks: 'OS X 10.9',
-        linux: 'Linux'
+        linux: 'Linux',
+        ios60: 'OS X 10.8',
+        ios61: 'OS X 10.8',
+        ios70: 'OS X 10.9',
+        ios71: 'OS X 10.9'
       }
     end
+
   end
 end

data/lib/rdee/version.rb

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

data/spec/lib/rd_spec.rb

@@ -172,5 +172,27 @@ end
       end
     end
 
+    it "should allow users to add additional options for iPhone by configuration" do
+      RDee.configure do |config|
+        config.iphone_options = {iphone_options: 'option'}
+      end
+      expect(watir_browser).to receive(:new).with(:iphone, iphone_options: 'option')
+      RDee.watir_browser(:iphone_ios70)
+      RDee.configure do |config|
+        config.iphone_options = nil
+      end
+    end
+
+    it "shoudl not add iphone_options when not using iPhone" do
+      RDee.configure do |config|
+        config.iphone_options = {iphone_options: 'option'}
+      end
+      expect(watir_browser).to receive(:new).with(:firefox)
+      RDee.watir_browser(:firefox)
+      RDee.configure do |config|
+        config.iphone_options = nil
+      end
+    end
+
   end
 end

data/spec/lib/target_parser_spec.rb

@@ -66,6 +66,26 @@ describe RDee::TargetParser do
     expect(host).to eql 'Linux'
   end
 
+  it "should parse ios60 for iphone" do
+    target, version, host = parser.parse(:iphone_ios60)
+    expect(host).to eql 'OS X 10.8'
+  end
+
+  it "should parse ios70 for iphone" do
+    target, version, host = parser.parse(:iphone_ios70)
+    expect(host).to eql 'OS X 10.9'
+  end
+
+  it "should parse ios71 for iphone" do
+    target, version, host = parser.parse(:iphone_ios71)
+    expect(host).to eql 'OS X 10.9'
+  end
+
+  it "should parse ios61 for iphone" do
+    target, version, host = parser.parse(:iphone_ios61)
+    expect(host).to eql 'OS X 10.8'
+  end
+
   it "should cleanly handle an invalid host" do
     target, version, host = parser.parse(:firefox30_foobar)
     expect(host).to be_nil

data/spec/lib/targets_spec.rb

@@ -177,6 +177,42 @@ describe "Supported browser combinations" do
     end
   end
 
+  context "for iPhone" do
+    
+    before(:each) do
+      allow(capabilities).to receive(:iphone).and_return(desired_capabilities)
+    end
+
+    it "includes iPhone with ios 6.0" do
+      expect(desired_capabilities).to receive(:version=).with('6.0')
+      expect(desired_capabilities).to receive(:platform=).with('OS X 10.8')
+      expect(watir_browser).to receive(:new).with(:remote, url: 'http://blah', desired_capabilities: anything())
+      RDee.watir_browser :iphone_ios60, url: 'http://blah'
+    end
+
+    it "includes iPhone with ios 6.1" do
+      expect(desired_capabilities).to receive(:version=).with('6.1')
+      expect(desired_capabilities).to receive(:platform=).with('OS X 10.8')
+      expect(watir_browser).to receive(:new).with(:remote, url: 'http://blah', desired_capabilities: anything())
+      RDee.watir_browser :iphone_ios61, url: 'http://blah'
+    end
+
+    it "includes iPhone with ios 7.0" do
+      expect(desired_capabilities).to receive(:version=).with('7.0')
+      expect(desired_capabilities).to receive(:platform=).with('OS X 10.9')
+      expect(watir_browser).to receive(:new).with(:remote, url: 'http://blah', desired_capabilities: anything())
+      RDee.watir_browser :iphone_ios70, url: 'http://blah'
+    end
+
+    it "includes iPhone with ios 7.1" do
+      expect(desired_capabilities).to receive(:version=).with('7.1')
+      expect(desired_capabilities).to receive(:platform=).with('OS X 10.9')
+      expect(watir_browser).to receive(:new).with(:remote, url: 'http://blah', desired_capabilities: anything())
+      RDee.watir_browser :iphone_ios71, url: 'http://blah'
+    end
+
+  end
+
   context "for hosts" do
     before(:each) do
       allow(capabilities).to receive(:firefox).and_return(desired_capabilities)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: RDee
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Jeffrey S. Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -128,11 +128,15 @@ files:
 - cucumber.yml
 - features/environment_variable.feature
 - features/local_browsers.feature
+- features/mobile_remote.feature
+- features/remote_browsers.feature
 - features/step_definitions/rdee_steps.rb
 - features/support/env.rb
+- features/support/pages/cheezyworld.rb
 - features/support/pages/google_search.rb
 - lib/rdee.rb
 - lib/rdee/browser_factory.rb
+- lib/rdee/mobile_devices.rb
 - lib/rdee/target_parser.rb
 - lib/rdee/version.rb
 - rdee.gemspec
@@ -167,11 +171,13 @@ summary: Dynamically create a connection for Selenium or Watir.
 test_files:
 - features/environment_variable.feature
 - features/local_browsers.feature
+- features/mobile_remote.feature
+- features/remote_browsers.feature
 - features/step_definitions/rdee_steps.rb
 - features/support/env.rb
+- features/support/pages/cheezyworld.rb
 - features/support/pages/google_search.rb
 - spec/lib/rd_spec.rb
 - spec/lib/target_parser_spec.rb
 - spec/lib/targets_spec.rb
 - spec/spec_helper.rb
-has_rdoc: