watir 6.6.1 → 6.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10cab1d1409ebe3bb8f7e249a6d3ee1a8b2523b1
-  data.tar.gz: a0c781ce798236ee4b2d9c87a37825c05b6f55d9
+  metadata.gz: f821e322222ce615fe8e9c02b6a5fcbf783c22e8
+  data.tar.gz: b822b4d6fb0de96a76ffcb7c61f33640ef24c724
 SHA512:
-  metadata.gz: d292a95a5839ccd31ae7f1696351af2e0e515faf2abcaa9cff723234b42cc9fa237b520be2ac152b09b70e31e2953f3ab61c5bee90cbccfaa1e94ced83f724d6
-  data.tar.gz: 46a0338d87dc84aab77d24931664a4fe9578826f9211c0a898abe1bf2ff4ebfaa9a3f52478b55acaa5b80095e4788874703c7e4612185a542cd38192f615fa17
+  metadata.gz: 933376823cd73c75e48a570972058dc32653ea54460fff9683073b42a19f242270f2eb6917bc108a9e8ddf84deabb390df6fb6e626f31b6fae55d4544e1da563
+  data.tar.gz: 8132f6f936389fa572d981581c4c8ab893ea76e796a042d1ee32c6516a58241df2c4091d3c795b0ec6eeb36ec0e8d69c17d61b9beae598eb1e1feec055ac0238

data/CHANGES.md

@@ -1,3 +1,7 @@
+### 6.6.2 (2017-08-08)
+
+* Fix bug preventing headless operation (#611)
+
 ### 6.6.1 (2017-08-07)
 
 * Support initializing browser with Selenium Options class (#606)

data/lib/watir/browser.rb

@@ -61,7 +61,7 @@ module Watir
       '#<%s:0x%x url=%s title=%s>' % [self.class, hash*2, url.inspect, title.inspect]
     rescue Errno::ECONNREFUSED
       '#<%s:0x%x closed=true>' % [self.class, hash*2]
-    rescue Selenium::WebDriver::Error::UnhandledAlertError
+    rescue Selenium::WebDriver::Error::UnhandledAlertError, Selenium::WebDriver::Error::UnexpectedAlertOpenError
       '#<%s:0x%x alert=true>' % [self.class, hash*2]
     end
     alias selector_string inspect

data/lib/watir/capabilities.rb

@@ -7,7 +7,7 @@ module Watir
       @browser = browser == :remote ? @options.delete(:browser).to_sym : browser.to_sym
       @selenium_browser = browser == :remote || options[:url] ? :remote : browser
 
-      @options = options
+      @options = options.dup
       @selenium_opts = {}
     end
 
@@ -58,12 +58,12 @@ module Watir
       when :chrome
         if @options.key?(:args)
           browser_options ||= {}
-          browser_options[:args] = @options.delete(:args)
+          browser_options[:args] = @options.delete(:args).dup
         end
         if @options.delete(:headless)
           browser_options ||= {}
-          browser_options[:args] << '--headless'
-          browser_options[:args] << '--disable-gpu'
+          browser_options[:args] ||= []
+          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
@@ -71,11 +71,11 @@ module Watir
         @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
       when :safari
-        @selenium_opts["safari.options"] = {'technologyPreview' => true} if @options[:technology_preview]
+        @selenium_opts["safari.options"] = {'technologyPreview' => true} if @options.delete(:technology_preview)
       when :remote
         if @browser == :chrome && @options.delete(:headless)
-          @options.delete(:args)
-          @options['chromeOptions'] = {'args' => ['--headless', '--disable-gpu']}
+          args = @options.delete(:args) || []
+          @options['chromeOptions'] = {'args' => args + ['--headless', '--disable-gpu']}
         end
       end
     end

data/lib/watirspec/implementation.rb

@@ -10,7 +10,8 @@ module WatirSpec
 
     def initialize_copy(orig)
       super
-      @browser_args = Marshal.load( Marshal.dump(@browser_args))
+      # Backward compatibility < Ruby 2.4
+      @browser_args = browser_args.map { |arg| arg.is_a?(Symbol) ? arg : arg.dup }
     end
 
     def browser_class
@@ -37,9 +38,10 @@ module WatirSpec
     def inspect_args
       hash = browser_args.last
       desired_capabilities = hash.delete(:desired_capabilities)
-      caps = desired_capabilities.send(:capabilities)
-      string = "\tdriver: #{browser_args.first}\n"
+      string = ''
       hash.each { |arg| string << "#{arg.inspect}\n" }
+      return "#{string} default capabilities" unless desired_capabilities
+
       string << "\tcapabilities:\n"
       caps.each { |k, v| string << "\t\t#{k}: #{v}\n"}
       hash[:desired_capabilities] = desired_capabilities

data/spec/watirspec/after_hooks_spec.rb

@@ -80,7 +80,7 @@ describe "Browser::AfterHooks" do
       end
     end
 
-    bug "Actions Endpoint Not Yet Implemented", :firefox do
+    bug "MoveTargetOutOfBoundsError", :firefox do
       it "runs after_hooks after Element#double_click" do
         browser.goto(WatirSpec.url_for("non_control_elements.html"))
         @page_after_hook = Proc.new { @yield = browser.title == "Non-control elements" }
@@ -124,16 +124,22 @@ describe "Browser::AfterHooks" do
       end
     end
 
-    bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1279211", :firefox do
-      not_compliant_on :safari, :headless do
-        it "raises UnhandledAlertError error when running error checks with alert present" do
-          url = WatirSpec.url_for("alerts.html")
-          @page_after_hook = Proc.new { browser.url }
-          browser.after_hooks.add @page_after_hook
-          browser.goto url
+    not_compliant_on :safari, :headless do
+      it "raises UnhandledAlertError error when running error checks with alert present" do
+        url = WatirSpec.url_for("alerts.html")
+        @page_after_hook = Proc.new { browser.url }
+        browser.after_hooks.add @page_after_hook
+        browser.goto url
+
+        not_compliant_on %i(local firefox) do
           expect { browser.button(id: "alert").click }.to raise_error(Selenium::WebDriver::Error::UnhandledAlertError)
-          browser.alert.ok
         end
+
+        deviates_on %i(local firefox) do
+          expect { browser.button(id: "alert").click }.to raise_error(Selenium::WebDriver::Error::UnexpectedAlertOpenError)
+        end
+
+        browser.alert.ok
       end
     end
 

data/spec/watirspec/elements/filefield_spec.rb

@@ -109,18 +109,20 @@ describe "FileField" do
 
   describe "#set" do
     not_compliant_on :safari do
-      it "is able to set a file path in the field and click the upload button and fire the onchange event" do
-        browser.goto WatirSpec.url_for("forms_with_input_elements.html")
+      bug "https://github.com/mozilla/geckodriver/issues/858", :firefox do
+        it "is able to set a file path in the field and click the upload button and fire the onchange event" do
+          browser.goto WatirSpec.url_for("forms_with_input_elements.html")
 
-        path = File.expand_path(__FILE__)
-        element = browser.file_field(name: "new_user_portrait")
+          path = File.expand_path(__FILE__)
+          element = browser.file_field(name: "new_user_portrait")
 
-        element.set path
+          element.set path
 
-        expect(element.value).to include(File.basename(path)) # only some browser will return the full path
-        expect(messages.first).to include(File.basename(path))
+          expect(element.value).to include(File.basename(path)) # only some browser will return the full path
+          expect(messages.first).to include(File.basename(path))
 
-        browser.button(name: "new_user_submit").click
+          browser.button(name: "new_user_submit").click
+        end
       end
 
       it "raises an error if the file does not exist" do
@@ -133,14 +135,16 @@ describe "FileField" do
 
   not_compliant_on :safari do
     describe "#value=" do
-      it "is able to set a file path in the field and click the upload button and fire the onchange event" do
-        browser.goto WatirSpec.url_for("forms_with_input_elements.html")
+      bug "https://github.com/mozilla/geckodriver/issues/858", :firefox do
+        it "is able to set a file path in the field and click the upload button and fire the onchange event" do
+          browser.goto WatirSpec.url_for("forms_with_input_elements.html")
 
-        path = File.expand_path(__FILE__)
-        element = browser.file_field(name: "new_user_portrait")
+          path = File.expand_path(__FILE__)
+          element = browser.file_field(name: "new_user_portrait")
 
-        element.value = path
-        expect(element.value).to include(File.basename(path)) # only some browser will return the full path
+          element.value = path
+          expect(element.value).to include(File.basename(path)) # only some browser will return the full path
+        end
       end
 
       not_compliant_on :internet_explorer do

data/spec/watirspec/elements/option_spec.rb

@@ -71,28 +71,26 @@ describe "Option" do
     end
   end
 
-  bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1255957", :firefox do
+  describe "#select" do
     not_compliant_on :safari do
-      describe "#select" do
-        it "selects the chosen option (page context)" do
-          browser.option(text: "Denmark").select
-          expect(browser.select_list(name: "new_user_country").selected_options.map(&:text)).to eq ["Denmark"]
-        end
-
-        it "selects the chosen option (select_list context)" do
-          browser.select_list(name: "new_user_country").option(text: "Denmark").select
-          expect(browser.select_list(name: "new_user_country").selected_options.map(&:text)).to eq ["Denmark"]
-        end
-
-        it "selects the option when found by text (page context)" do
-          browser.option(text: 'Sweden').select
-          expect(browser.option(text: 'Sweden')).to be_selected
-        end
-
-        it "selects the option when found by text (select_list context)" do
-          browser.select_list(name: 'new_user_country').option(text: 'Sweden').select
-          expect(browser.select_list(name: 'new_user_country').option(text: 'Sweden')).to be_selected
-        end
+      it "selects the chosen option (page context)" do
+        browser.option(text: "Denmark").select
+        expect(browser.select_list(name: "new_user_country").selected_options.map(&:text)).to eq ["Denmark"]
+      end
+
+      it "selects the chosen option (select_list context)" do
+        browser.select_list(name: "new_user_country").option(text: "Denmark").select
+        expect(browser.select_list(name: "new_user_country").selected_options.map(&:text)).to eq ["Denmark"]
+      end
+
+      it "selects the option when found by text (page context)" do
+        browser.option(text: 'Sweden').select
+        expect(browser.option(text: 'Sweden')).to be_selected
+      end
+
+      it "selects the option when found by text (select_list context)" do
+        browser.select_list(name: 'new_user_country').option(text: 'Sweden').select
+        expect(browser.select_list(name: 'new_user_country').option(text: 'Sweden')).to be_selected
       end
     end
 

data/spec/watirspec/elements/tr_spec.rb

@@ -35,7 +35,7 @@ describe "TableRow" do
   end
 
   describe "#click" do
-    bug "http://github.com/watir/watir/issues/issue/32", :internet_explorer, :chrome do
+    not_compliant_on :internet_explorer, :chrome, :firefox do
       it "fires the row's onclick event" do
         browser.tr(id: 'inner_first').click
         expect(messages).to include('tr')

data/spec/watirspec/window_switching_spec.rb

@@ -364,19 +364,17 @@ describe "Window" do
     end
 
     not_compliant_on :headless do
-      bug "https://github.com/SeleniumHQ/selenium/issues/2856", %i(remote firefox) do
-        it "should resize the window" do
-          initial_size = browser.window.size
-          browser.window.resize_to(
-              initial_size.width - 20,
-              initial_size.height - 20
-          )
+      it "should resize the window" do
+        initial_size = browser.window.size
+        browser.window.resize_to(
+            initial_size.width - 20,
+            initial_size.height - 20
+        )
 
-          new_size = browser.window.size
+        new_size = browser.window.size
 
-          expect(new_size.width).to eq initial_size.width - 20
-          expect(new_size.height).to eq initial_size.height - 20
-        end
+        expect(new_size.width).to eq initial_size.width - 20
+        expect(new_size.height).to eq initial_size.height - 20
       end
     end
 
@@ -397,21 +395,19 @@ describe "Window" do
 
     not_compliant_on :headless do
       compliant_on :window_manager do
-        bug "https://github.com/SeleniumHQ/selenium/issues/2856", :firefox do
-          it "should maximize the window" do
-            initial_size = browser.window.size
-            browser.window.resize_to(
-                initial_size.width,
-                initial_size.height - 20
-            )
-
-            browser.window.maximize
-            browser.wait_until { browser.window.size != initial_size }
-
-            new_size = browser.window.size
-            expect(new_size.width).to be >= initial_size.width
-            expect(new_size.height).to be > (initial_size.height - 20)
-          end
+        it "should maximize the window" do
+          initial_size = browser.window.size
+          browser.window.resize_to(
+              initial_size.width,
+              initial_size.height - 20
+          )
+
+          browser.window.maximize
+          browser.wait_until { browser.window.size != initial_size }
+
+          new_size = browser.window.size
+          expect(new_size.width).to be >= initial_size.width
+          expect(new_size.height).to be > (initial_size.height - 20)
         end
       end
     end

data/spec/watirspec_helper.rb

@@ -54,6 +54,13 @@ class LocalConfig
   end
 
   def add_guards
+    matching_guards = common_guards
+    matching_guards << :local
+    matching_guards << [:local, browser]
+    matching_guards
+  end
+
+  def common_guards
     matching_guards = [:webdriver]
 
     matching_guards << browser
@@ -121,7 +128,7 @@ class RemoteConfig < LocalConfig
   private
 
   def add_guards
-    matching_guards = super
+    matching_guards = common_guards
     matching_guards << :remote
     matching_guards << [:remote, browser]
     matching_guards

data/watir.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'watir'
-  s.version     = '6.6.1'
+  s.version     = '6.6.2'
   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.6.1
+  version: 6.6.2
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-07 00:00:00.000000000 Z
+date: 2017-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver