RDee 0.8 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 172c691a21baa5997beb5d750136ed2afc72bae0
-  data.tar.gz: 5daa937a078c5372b3936be8fb6bada94b794351
+  metadata.gz: '04889259fae611a4e82a6452441d2985b7aea701'
+  data.tar.gz: fff9ed349e53e614e59dcceb2bb3a3e274717c91
 SHA512:
-  metadata.gz: cd0680641d78a1f83e136af89ac01104afb475a20d49421d96b6fc0b861c865731f99ce07b0a9005a5ccefbd7689abd6bd7f457ddbdc89ec899ec3b1d1dc380d
-  data.tar.gz: 657f3528866f1f2d1aa4f79f0d2aeef1bbf35baf53b678f65f21836fb4c8cdd906196d19f090b582b2c250a6deede50a26a68d2a977e4bb7c9c0ffe8b5522915
+  metadata.gz: 3b612a6e7c7e96b669ce1089597c4a9f85cadb33de03b89496d7e83d00657c4dd44522964847314b04603ed249e3088c9fd9556f9d6b37d95e8a9bc160056b30
+  data.tar.gz: 61a8f13b4115cf55269c1b954a50099c8970de69da848cc0bba85e0869bc0a863c9b7af4bc2ddd488b1b35391d0230f8b5e621b1f3c0f909022835a0208751a9

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.2.4
-  - 2.3.1
+  - 2.3
+  - 2.4

data/ChangeLog

@@ -1,3 +1,8 @@
+=== Release 0.9 / 23 September 2017
+* Enhancements
+  * Full support for all Android devices
+  * Ability to set additional android capabilities via configuration
+
 === Release 0.8 / 3 August 2017
 * Enhancements
   * Forced net-http-persistent to be less than 3.0 to fix issue with older Windows systems

data/README.md

@@ -57,9 +57,9 @@ it will select whatever version is available.  It is up to you to make sure that
 and version combination are valid.
 
 For mobile the version is the version of the OS you require replacing the
-dot with an underscore.  For example, `:ios10_2` will use iOS 10.2.  You will
-provide the additional information like the device type as additional
-values.  See below.
+dot with an underscore.  For example, `:ios10_2` will use iOS 10.2 and `:android4_4`
+will use Android 4.4.  You will provide the additional information like the device type as 
+additional values.  See below.
 
 Following the version there is an underscore followed by the host os.  This value is also
 optional.  Currently the following host os values are available:
@@ -79,6 +79,7 @@ optional.  Currently the following host os values are available:
 | sierra | macOS 10.12 |
 | linux | Linux |
 | ios | 'iOS' |
+| android | 'Android' |
 
 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.
@@ -95,11 +96,12 @@ sent to a specific type of browser when it is used.  Here are examples:
 RDee.configure do | config |
   config.url = 'http://path.to.selenium.grid/wd/hub'
   config.persistent_http = true
-  config.chrome_options = { :switches => %w[--disable-extensions]}
-  config.firefox_options = { :switches => %w[--disable-popups]}
-  config.ie_options = { :switches => %w[--disable-popups]}
-  config.safari_options = { :switches => %w[--disable-popups]}
-  config.ios_options = { :switches => %w[--disable-popups]}
+  config.chrome_options = { :switches => %w[--disable-extensions] }
+  config.firefox_options = { :switches => %w[--disable-popups] }
+  config.ie_options = { :switches => %w[--disable-popups] }
+  config.safari_options = { :switches => %w[--disable-popups] }
+  config.ios_options = { :switches => %w[--disable-popups] }
+  config.android_options = { :switches => %w[--disable-popups] }
 end
 ````
 
@@ -110,13 +112,25 @@ Here is an example:
 
 ````ruby
 mobile_capabilities = {
-  appiumVersion: '1.6.3',
+  appiumVersion: '1.6.4',
   deviceName: 'iPhone Simulator',
   deviceOrientation: 'portrait'
 }
 RDee.watir_browser(target = :ios10_2, desired_capabilities: mobile_capabilities)
 ````
 
+For Android it is extremely simular:
+
+````ruby
+mobile_capabilities = {
+  appiumVersion: '1.6.4',
+  deviceName: 'Google Nexus 7 HD Emulator',
+  deviceOrientation: 'portrait'
+}
+RDee.watir_browser(target = :android4_4, desired_capabilities: mobile_capabilities)
+````
+
+
 Another way to specify these additional capabilities is to specify them in the configure
 block like this:
 
@@ -124,10 +138,15 @@ block like this:
 RDee.configure do | config |
   config.url = 'http://path.to.selenium.grid/wd/hub'
   config.ios_capabilities = {
-    appiumVersion:      '1.6.3',
+    appiumVersion:      '1.6.4',
     deviceName:         'iPhone Simulator',
     deviceOrientation:  'portrait'
   }
+  config.android_capabilities = {
+    appiumVersion:      '1.6.4',
+    deviceName:         'Google Nexus 7 HD Emulator',
+    deviceOrientation:  'portrait'
+  }
 end
 ````
 
@@ -137,14 +156,18 @@ Using the config allows us to set the values via environment variables without c
 RDee.configure do | config |
   config.url = 'http://path.to.selenium.grid/wd/hub'
   config.ios_capabilities = {
-    appiumVersion:      ENV['appiumVersion'],
-    deviceName:         ENV['deviceName'],
-    deviceOrientation:  ENV['deviceOrientation']
+    appiumVersion:      ENV['ios_appiumVersion'],
+    deviceName:         ENV['ios_deviceName'],
+    deviceOrientation:  ENV['ios_deviceOrientation']
+  }
+  config.android_capabilities = {
+    appiumVersion:      ENV['android_appiumVersion'],
+    deviceName:         ENV['android_deviceName'],
+    deviceOrientation:  ENV['android_deviceOrientation']
   }
 end
 ````
 
-
 To see what options you should use please look at the
 [Sauce Labs Configurator](https://wiki.saucelabs.com/display/DOCS/Platform+Configurator#/).
 

data/features/mobile_remote.feature

@@ -41,3 +41,10 @@ Feature: RDee should work well with mobile devices on a remote selenium grid
     And I go to the cheezyworld site
     And I select the first title link
     Then I should see the text from the first heading
+
+  @mobile
+  Scenario: Creating an Android browser on android 4.4
+    When I establish a mobile android browser for android4_4 on the remote machine using Watir
+    And I go to the cheezyworld site
+    And I select the first title link
+    Then I should see the text from the first heading

data/features/step_definitions/rdee_steps.rb

@@ -38,6 +38,18 @@ When(/^I establish an? mobile browser for (.+) on the remote machine using (.+)$
                        url: 'http://rdee:730071ad-7331-4d65-bd56-ec3ebfdd8232@ondemand.saucelabs.com:80/wd/hub'
 end
 
+When(/^I establish an? mobile android browser for (.+) on the remote machine using (.+)$/) do |browser, platform|
+  mobile_options = {
+      appiumVersion: '1.6.4',
+      deviceName: 'Google Nexus 7 HD Emulator',
+      deviceOrientation: 'portrait'
+  }
+  @browser = RDee.send "#{platform.downcase}_browser",
+                       browser.to_sym,
+                       desired_capabilities: mobile_options,
+                       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

data/lib/rdee/additional_options.rb

@@ -8,6 +8,7 @@ module RDee
       options.merge!(ie_options) if need_ie_options? target
       options.merge!(safari_options) if need_safari_options? target
       options.merge!(ios_options) if need_ios_options? target
+      options.merge!(android_options) if need_android_options? target
       options
     end
 
@@ -31,5 +32,9 @@ module RDee
       not ios_options.nil? and target.to_s.include? 'ios'
     end
 
+    def need_android_options?(target)
+      not android_options.nil? and target.to_s.include? 'android'
+    end
+
   end
 end

data/lib/rdee/browser_factory.rb

@@ -14,8 +14,8 @@ module RDee
 
     attr_accessor :url, :persistent_http
     attr_accessor :chrome_options, :firefox_options, :ie_options,
-                  :safari_options, :ios_options
-    attr_accessor :ios_capabilities
+                  :safari_options, :ios_options, :android_options
+    attr_accessor :ios_capabilities, :android_capabilities
 
     def watir_browser(target, options)
       platform, options = platform_and_options(target, options)

data/lib/rdee/desired_capabilities.rb

@@ -30,7 +30,6 @@ module RDee
               platformVersion: version,
               platformName: mobile_platform[platform],
               browserName: mobile_browsers[platform],
-              platform: :mac,
               javascript_enabled: true
           }.merge(existing_caps))
     end

data/lib/rdee/mobile_capabilities.rb

@@ -7,6 +7,7 @@ module RDee
     def additional_capabilities_for(target)
       caps = {}
       caps.merge!(ios_capabilities) if mobile_platform[target].eql?('iOS') and ios_capabilities
+      caps.merge!(android_capabilities) if mobile_platform[target].eql?('Android') and android_capabilities
       caps
     end
 

data/lib/rdee/mobile_devices.rb

@@ -13,13 +13,15 @@ module RDee
 
     def mobile_browsers
       @mobile_browsers ||= {
-        ios: 'Safari'
+        ios: 'Safari',
+        android: 'Browser'
       }
     end
 
     def mobile_platform
       @mobile_platform ||= {
-          ios: 'iOS'
+          ios: 'iOS',
+          android: 'Android'
       }
     end
     

data/lib/rdee/target_parser.rb

@@ -54,7 +54,8 @@ module RDee
           el_capitan: 'OS X 10.11',
           sierra: 'macOS 10.12',
           linux: 'Linux',
-          ios: 'iOS'
+          ios: 'iOS',
+          android: 'Android'
       }
     end
 

data/lib/rdee/version.rb

@@ -1,3 +1,3 @@
 module RDee
-  VERSION = "0.8"
+  VERSION = "0.9"
 end

data/spec/lib/moble_targets_spec.rb

@@ -15,7 +15,6 @@ describe 'Mobile targets' do
           platformVersion: '1.0',
           platformName: 'iOS',
           browserName: 'Safari',
-          platform: :mac,
           javascript_enabled: true
       }
     }
@@ -51,5 +50,41 @@ describe 'Mobile targets' do
       end
     end
   end
+
+  context 'when using Android' do
+    let(:caps) {
+      {
+          platformVersion: '1.0',
+          platformName: 'Android',
+          browserName: 'Browser',
+          javascript_enabled: true
+      }
+    }
+
+    it 'includes Android 4.4' do
+      caps[:platformVersion] = '4.4'
+      expect(capabilities).to receive(:new).with(caps)
+      RDee.watir_browser :android4_4, url: 'http://blah'
+    end
+
+    it 'should allow additional capabilities to be pass in via configuration' do
+      android_capabilities = {
+          appiumVersion: '1.6.4',
+          deviceName: 'Google Nexus 7 HD Emulator',
+          deviceOrientation: 'portrait'
+      }
+      RDee.configure do |config|
+        config.url = 'http://blah'
+        config.android_capabilities = android_capabilities
+      end
+      caps[:platformVersion] = '4.4'
+      expect(capabilities).to receive(:new).with(caps.merge(android_capabilities))
+      RDee.watir_browser :android4_4
+      RDee.configure do |config|
+        config.url = nil
+        config.android_capabilities = nil
+      end
+    end
+  end
 end
 

data/spec/lib/rd_spec.rb

@@ -194,5 +194,26 @@ describe RDee do
       end
     end
 
+    it "should allow users to add additional options for android by configuration" do
+      RDee.configure do |config|
+        config.android_options = {android_options: 'option'}
+      end
+      expect(watir_browser).to receive(:new).with(:android, android_options: 'option')
+      RDee.watir_browser(:android4_4)
+      RDee.configure do |config|
+        config.android_options = nil
+      end
+    end
+
+    it "should not add android_options when not using android" do
+      RDee.configure do |config|
+        config.android_options = {android_options: 'option'}
+      end
+      expect(watir_browser).to receive(:new).with(:firefox)
+      RDee.watir_browser(:firefox)
+      RDee.configure do |config|
+        config.android_options = nil
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: RDee
 version: !ruby/object:Gem::Version
-  version: '0.8'
+  version: '0.9'
 platform: ruby
 authors:
 - Jeffrey S. Morgan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2017-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir