saucer 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5f21ddff0974db9cf6930a8344d010b8aa2a7c6
-  data.tar.gz: 4488033e1b91513f46917806312a5ef4368b2cc8
+  metadata.gz: f2dbf2b0339d94beec378bedf4fb5fff20c07ccf
+  data.tar.gz: 73e0fe1bdd5e8fb93f25dc06505073ccec501347
 SHA512:
-  metadata.gz: 7b37864310312c7a204e314f951a17800e37dc654e6218b397af0d4a562234be8fb53ade2638594c017d490aa83bb378fddfa9bf1bb8b3a576f555ad4c0c8abb
-  data.tar.gz: 9a575731b71aa3e1b326b635d4b369c6ea068a8581c32f71846b5567e1d35bff419f4de60e6385a9940a2573ef6cc5b7b07a82ac516257b53d82ca4333206442
+  metadata.gz: 1c7f46751be467415cea49ebcb1b0251ccb5e5d55c107804da909caf3204242a8ea2e2bc030180ba1ff3f606c0b83c6fa6e9e4b9ff8bea04a8a5ce72bb2db510
+  data.tar.gz: 8b59759a69338cd7fef28f71408ba78990d13e913ed947e4e23938b192c6b8d0daedcec44a49eb709838ef3df5ce8694ad42772589e1c29d1c2fcbde7b8e98bf

data/lib/saucer/config/common.rb

@@ -8,11 +8,12 @@ module Saucer
                     avoid_proxy public record_video video_upload_on_pass record_screenshots
                     record_logs capture_html priority webdriver_remote_quiet_exceptions).freeze
 
-      attr_reader :config_params, :username, :access_key
+      attr_reader :config_params, :username, :access_key, :url
 
       def initialize(opts = {})
         @username = opts.delete(:username) || ENV['SAUCE_USERNAME']
         @access_key = opts.delete(:access_key) || ENV['SAUCE_ACCESS_KEY']
+        @url = opts.delete(:url) || "https://#{@username}:#{@access_key}@ondemand.saucelabs.com:443/wd/hub"
 
         @opts = opts
         @config_params = CONFIG_PARAMS

data/lib/saucer/config/selenium.rb

@@ -17,15 +17,19 @@ module Saucer
       end
 
       def capabilities
-        caps = @config_params.each_with_object({}) do |param, hash|
-          hash[param] = @opts[param] if @opts.key?(param)
-          hash[param] ||= ENV[param.to_s] if ENV[param.to_s]
+        caps = @opts[:desired_capabilities]
+        caps ||= begin
+          caps = @config_params.each_with_object({}) do |param, hash|
+            hash[param] = @opts[param] if @opts.key?(param)
+            hash[param] ||= ENV[param.to_s] if ENV[param.to_s]
+          end
+          browser_name = @opts[:browser_name] || :chrome
+          ::Selenium::WebDriver::Remote::Capabilities.send(browser_name, caps)
         end
-        @sauce = Sauce.new.to_hash
 
+        @sauce = Sauce.new.to_hash
         caps[:"sauce:data"] = @sauce.to_hash
-        browser_name = @opts[:browser_name] || :chrome
-        ::Selenium::WebDriver::Remote::Capabilities.send(browser_name, caps)
+        caps
       end
     end
 

data/lib/saucer/driver.rb

@@ -4,8 +4,12 @@ module Saucer
     attr_reader :driver, :config
 
     def initialize(opt = {})
-      caps = opt[:desired_capabilities] || {}
-      @config = Config::Selenium.new(caps)
+      unless opt[:desired_capabilities].is_a? Selenium::WebDriver::Remote::Capabilities
+        opts = opt[:desired_capabilities] || {}
+        browser = opt.key?(:browser_name) ? opt[:browser_name].downcase.to_sym : :chrome
+        opt[:desired_capabilities] = Selenium::WebDriver::Remote::Capabilities.send(browser, opts)
+      end
+      @config = Config::Selenium.new(opt)
 
       opt[:url] = @config.url
       opt[:desired_capabilities] = @config.capabilities

data/lib/saucer/version.rb

@@ -1,3 +1,3 @@
 module Saucer
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saucer
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Titus Fortner