watir 6.7.0 → 6.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18ce4184fd15427b0f00abf58aa9d036fd37d13f
-  data.tar.gz: 85f6b2e47e10b5c4b89f3c7d138fc58e143834bb
+  metadata.gz: 4aa59f8349f178e00a119dabd2373320704441d6
+  data.tar.gz: f4ffc2c9fb5847ee662c43834a158121a9a2884c
 SHA512:
-  metadata.gz: 4f0159b01a4c1be3f0d3bddbd3b4a8d7d676aad75dc82a33441f7e5a4cd6e367833bca63050cc5256ba906f78a9784fef1c16d1cb21c5266fd0744018b76a149
-  data.tar.gz: 912dfa7b7f8bf53acc6734a771ed86c98b1c71c4b5e1858f911611e1751213fb9d319a14d2595d378f26fc5b33766764c0b3213f47bf1b518356faa78cd7d6fe
+  metadata.gz: addf993cd30bac3223c93a74f9a36c646c8e9d45e5478708ee6e35d1178a779e80f43313d194a770c356e8d763b7ffbdc628ebb30c703b4a15bf60e4b6bdf03f
+  data.tar.gz: e7d0f9e05ed00e04175622ec32322ef20f2e4cebdd12308c1a47c973e7ca4e9ba393309279395c0e72cb7f530673dd55ed8e150886a004ed6ba5f35bcc90dd28

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 6.7.1 (2017-08-16)
+
+* Fix bug preventing use of Firefox profiles (#625)
+
 ### 6.7.0 (2017-08-14)
 
 * Implement TableCell#column_header

data/lib/watir/capabilities.rb

@@ -58,7 +58,7 @@ module Watir
     end
 
     def process_browser_options
-      browser_options = @options.delete(:options)
+      browser_options = @options.delete(:options) || {}
 
       case @selenium_browser
       when :chrome
@@ -72,10 +72,15 @@ module Watir
           browser_options[:args] += ['--headless', '--disable-gpu']
         end
         @selenium_opts[:options] = browser_options if browser_options.is_a? Selenium::WebDriver::Chrome::Options
-        @selenium_opts[:options] ||= Selenium::WebDriver::Chrome::Options.new(browser_options) if browser_options
+        @selenium_opts[:options] ||= Selenium::WebDriver::Chrome::Options.new(browser_options)
       when :firefox
-        @selenium_opts[:options] = browser_options if browser_options.is_a? Selenium::WebDriver::Firefox::Options
-        @selenium_opts[:options] ||= Selenium::WebDriver::Firefox::Options.new(options) if browser_options
+        profile = @options.delete(:profile)
+        if browser_options.is_a? Selenium::WebDriver::Firefox::Options
+          @selenium_opts[:options] = browser_options
+          Watir.logger.deprecate 'Initializing Browser with both :profile and :option', ':profile as a key inside :option' if profile
+        end
+        @selenium_opts[:options] ||= Selenium::WebDriver::Firefox::Options.new(browser_options)
+        @selenium_opts[:options].profile = profile if profile
       when :safari
         Selenium::WebDriver::Safari.technology_preview! if @options.delete(:technology_preview)
       when :remote

data/spec/browser_spec.rb

@@ -74,6 +74,20 @@ describe Watir::Browser do
           end
         end
 
+        compliant_on :firefox do
+          it "accepts profile" do
+            home_page = WatirSpec.url_for("special_chars.html")
+            profile = Selenium::WebDriver::Firefox::Profile.new
+            profile['browser.startup.homepage'] = home_page
+            profile['browser.startup.page'] = 1
+            @opts.merge!(profile: profile)
+
+            @new_browser = WatirSpec.new_browser
+
+            expect(@new_browser.url).to eq home_page
+          end
+        end
+
         compliant_on :chrome do
           it "accepts browser options" do
             @opts.merge!(options: {emulation: {userAgent: 'foo;bar'}})

data/watir.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'watir'
-  s.version     = '6.7.0'
+  s.version     = '6.7.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Alex Rodionov', 'Titus Fortner']
   s.email       = ['p0deje@gmail.com', 'titusfortner@gmail.com']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 6.7.0
+  version: 6.7.1
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver