RubyGems - capybara - Versions diffs - 2.16.1 → 2.17.0 - Mend

capybara 2.16.1 → 2.17.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (29) hide show

checksums.yaml +4 -4
data/History.md +14 -1
data/lib/capybara/minitest.rb +3 -1
data/lib/capybara/minitest/spec.rb +3 -1
data/lib/capybara/queries/current_path_query.rb +1 -1
data/lib/capybara/queries/text_query.rb +1 -1
data/lib/capybara/rspec/matchers.rb +50 -1
data/lib/capybara/selenium/node.rb +27 -4
data/lib/capybara/session.rb +4 -6
data/lib/capybara/session/config.rb +8 -0
data/lib/capybara/spec/public/test.js +2 -2
data/lib/capybara/spec/session/assert_text.rb +8 -0
data/lib/capybara/spec/session/has_all_selectors_spec.rb +69 -0
data/lib/capybara/spec/session/has_current_path_spec.rb +6 -0
data/lib/capybara/spec/session/has_link_spec.rb +4 -4
data/lib/capybara/spec/session/has_none_selectors_spec.rb +76 -0
data/lib/capybara/spec/session/has_select_spec.rb +2 -2
data/lib/capybara/spec/session/node_spec.rb +19 -5
data/lib/capybara/spec/session/select_spec.rb +1 -0
data/lib/capybara/spec/spec_helper.rb +5 -3
data/lib/capybara/spec/views/with_hover.erb +5 -0
data/lib/capybara/spec/views/with_html.erb +4 -0
data/lib/capybara/spec/views/with_js.erb +7 -0
data/lib/capybara/version.rb +1 -1
data/spec/capybara_spec.rb +1 -1
data/spec/minitest_spec.rb +9 -1
data/spec/minitest_spec_spec.rb +9 -1
data/spec/selenium_spec_chrome.rb +8 -4
metadata +13 -5

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 94085614fef28d8c100eac0e0e11e213f0bb89ab487bb538a864da3b2ec21951
-  data.tar.gz: b61bc9c51db0e61c730bd14e3d593ff9885e45178403dd5200a368f3e67fc8e2
+  metadata.gz: 5f913df68a0c00ede749cba87a0b229ff28e9e6b8f8f45bbbbd07577729f1c6a
+  data.tar.gz: 37a3fdfec9dc3cab859eae2300819d4691c1f20ccb05acf98807e7e287796c98
 SHA512:
-  metadata.gz: 465a59847ac6f986ab374e6a84c678078c8804a60341c9ecd52625cf86e1041d98629806a4e4dc08531337e9db8190dfdbea3e64e40387ad3f16bb5a1d42cf09
-  data.tar.gz: 43a4b4aaead1b7a66058269e5f8ea3f09782a2c7766c0bb7cd4c3e7f56abe7b852fe28859d3ef746135798e73b86c8c72dde7fdabce57f2765b58639c232b1e8
+  metadata.gz: 1edbf3df7b7357bbb96937c10eecffa5afa6ead2c119b0607bae820973702197de1536ec540968100d00355d07227c1f531f793156d645124d9f1a0250802996
+  data.tar.gz: e5a51fbceb1d26ddf7a101712bb407bc835ab701038b6e103c9f25c7677308fbda93ec515701862b297810b962dffac3b0e3ed35032296a6cf1f78c4adb4b79e

data/History.md CHANGED

@@ -1,5 +1,18 @@
+# Version 2.17.0
+Release date: 2018-01-02
+### Added
+* `have_all_of_selectors`, `have_none_of_selectors` RSpec matchers for parity with minitest assertions [Thomas Walpole]
+### Fixed
+* Allow xpath 3.x gem [Thomas Walpole]
+* Issue when drivers returned nil for `current_path` and a matcher was used with a Regexp [Thomas Walpole]
+* Error message when visible element not found, but non-visible was [Andy Klimczak]
 # Version 2.16.1
-Release data: 2017-11-20
+Release date: 2017-11-20
 ### Fixed

data/lib/capybara/minitest.rb CHANGED

@@ -81,7 +81,9 @@ module Capybara
       # @!method assert_xpath
       #   see {Capybara::Node::Matchers#assert_not_matches_selector}
-      %w(assert_selector assert_no_selector assert_matches_selector assert_not_matches_selector).each do |assertion_name|
+      %w(assert_selector assert_no_selector
+         assert_all_of_selectors assert_none_of_selectors
+         assert_matches_selector assert_not_matches_selector).each do |assertion_name|
         self.class_eval <<-EOM, __FILE__, __LINE__ + 1
           def #{assertion_name} *args, &optional_filter_block
             self.assertions +=1

data/lib/capybara/minitest/spec.rb CHANGED

@@ -11,7 +11,9 @@ module Capybara
       (%w(selector xpath css link button field select table checked_field unchecked_field).flat_map do |assertion|
         [["assert_#{assertion}", "must_have_#{assertion}"],
          ["refute_#{assertion}", "wont_have_#{assertion}"]]
-      end + %w(selector xpath css).flat_map do |assertion|
+      end + [["assert_all_of_selectors", "must_have_all_of_selectors"],
+             ["assert_none_of_selectors", "must_have_none_of_selectors"]] +
+      %w(selector xpath css).flat_map do |assertion|
         [["assert_matches_#{assertion}", "must_match_#{assertion}"],
          ["refute_matches_#{assertion}", "wont_match_#{assertion}"]]
       end).each do |(meth, new_name)|

data/lib/capybara/queries/current_path_query.rb CHANGED

@@ -31,7 +31,7 @@ module Capybara
         end
         if @expected_path.is_a? Regexp
-          @actual_path.match(@expected_path)
+          @actual_path.to_s.match(@expected_path)
         else
           ::Addressable::URI.parse(@expected_path) == ::Addressable::URI.parse(@actual_path)
         end

data/lib/capybara/queries/text_query.rb CHANGED

@@ -70,7 +70,7 @@ module Capybara
             invisible_text = text(@node, :all)
             invisible_count = invisible_text.scan(@search_regexp).size
             if invisible_count != @count
-              details_message << ". it was found #{invisible_count} #{Capybara::Helpers.declension("time", "times", invisible_count)} including non-visible text"
+              details_message << "it was found #{invisible_count} #{Capybara::Helpers.declension("time", "times", invisible_count)} including non-visible text"
             end
           rescue
             # An error getting the non-visible text (if element goes out of scope) should not affect the response

data/lib/capybara/rspec/matchers.rb CHANGED

@@ -59,7 +59,6 @@ module Capybara
     end
     class HaveSelector < Matcher
       def initialize(*args, &filter_block)
         @args = args
         @filter_block = filter_block
@@ -82,6 +81,44 @@ module Capybara
       end
     end
+    class HaveAllSelectors < Matcher
+      def initialize(*args, &filter_block)
+        @args = args
+        @filter_block = filter_block
+      end
+      def matches?(actual)
+        wrap_matches?(actual){ |el| el.assert_all_of_selectors(*@args, &@filter_block) }
+      end
+      def does_not_match?(actual)
+        raise ArgumentError, "The have_all_selectors matcher does not support use with not_to/should_not"
+      end
+      def description
+        "have all selectors"
+      end
+    end
+    class HaveNoSelectors < Matcher
+      def initialize(*args, &filter_block)
+        @args = args
+        @filter_block = filter_block
+      end
+      def matches?(actual)
+        wrap_matches?(actual){ |el| el.assert_none_of_selectors(*@args, &@filter_block) }
+      end
+      def does_not_match?(actual)
+        raise ArgumentError, "The have_none_of_selectors matcher does not support use with not_to/should_not"
+      end
+      def description
+        "have no selectors"
+      end
+    end
     class MatchSelector < HaveSelector
       def matches?(actual)
         wrap_matches?(actual) { |el| el.assert_matches_selector(*@args, &@filter_block) }
@@ -211,6 +248,18 @@ module Capybara
       HaveSelector.new(*args, &optional_filter_block)
     end
+    # RSpec matcher for whether the element(s) matching a group of selectors exist
+    # See {Capybara::Node::Matcher#assert_all_of_selectors}
+    def have_all_of_selectors(*args, &optional_filter_block)
+      HaveAllSelectors.new(*args, &optional_filter_block)
+    end
+    # RSpec matcher for whether no element(s) matching a group of selectors exist
+    # See {Capybara::Node::Matcher#assert_none_of_selectors}
+    def have_none_of_selectors(*args, &optional_filter_block)
+      HaveNoSelectors.new(*args, &optional_filter_block)
+    end
     # RSpec matcher for whether the current element matches a given selector
     # See {Capybara::Node::Matchers#assert_matches_selector}
     def match_selector(*args, &optional_filter_block)

data/lib/capybara/selenium/node.rb CHANGED

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 class Capybara::Selenium::Node < Capybara::Driver::Node
   def visible_text
     # Selenium doesn't normalize Unicode whitespace.
     Capybara::Helpers.normalize_whitespace(native.text)
@@ -112,11 +113,15 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   end
   def right_click
-    driver.browser.action.context_click(native).perform
+    scroll_if_needed do
+      driver.browser.action.context_click(native).perform
+    end
   end
   def double_click
-    driver.browser.action.double_click(native).perform
+    scroll_if_needed do
+      driver.browser.action.double_click(native).perform
+    end
   end
   def send_keys(*args)
@@ -124,11 +129,15 @@ class Capybara::Selenium::Node < Capybara::Driver::Node
   end
   def hover
-    driver.browser.action.move_to(native).perform
+    scroll_if_needed do
+      driver.browser.action.move_to(native).perform
+    end
   end
   def drag_to(element)
-    driver.browser.action.drag_and_drop(native, element.native).perform
+    scroll_if_needed do
+      driver.browser.action.drag_and_drop(native, element.native).perform
+    end
   end
   def tag_name
@@ -238,4 +247,18 @@ private
       end
     end
   end
+  def scroll_if_needed(&block)
+    block.call
+  rescue ::Selenium::WebDriver::Error::MoveTargetOutOfBoundsError
+    script = <<-JS
+      try {
+        arguments[0].scrollIntoView({behavior: 'instant', block: 'center', inline: 'center'});
+      } catch(e) {
+        arguments[0].scrollIntoView(true);
+      }
+    JS
+    driver.execute_script(script, self)
+    block.call
+  end
 end

data/lib/capybara/session.rb CHANGED

@@ -261,10 +261,8 @@ module Capybara
           visit_uri_parts = visit_uri.to_hash.delete_if { |k,v| v.nil? }
-          # TODO - this is only for compatability with previous 2.x behavior that concatenated
-          # Capybara.app_host and a "relative" path - Consider removing in 3.0
-          # @abotalov brought up a good point about this behavior potentially being useful to people
-          # deploying to a subdirectory and/or single page apps where only the url fragment changes
+          # Useful to people deploying to a subdirectory
+          # and/or single page apps where only the url fragment changes
           visit_uri_parts[:path] = uri_base.path + visit_uri.path
           visit_uri = uri_base.merge(visit_uri_parts)
@@ -488,7 +486,7 @@ module Capybara
     #   @raise [Capybara::WindowError]     if no window matches given block
     # @overload switch_to_window(window)
     #   @param window [Capybara::Window]   window that should be switched to
-    #   @raise [Capybara::Driver::Base#no_such_window_error] if non-existent (e.g. closed) window was passed
+    #   @raise [Capybara::Driver::Base#no_such_window_error] if nonexistent (e.g. closed) window was passed
     #
     # @return [Capybara::Window]         window that has been switched to
     # @raise [Capybara::ScopeError]        if this method is invoked inside `within` or
@@ -521,7 +519,7 @@ module Capybara
     # @overload within_window(window) { do_something }
     #   @param window [Capybara::Window]       instance of `Capybara::Window` class
     #     that will be switched to
-    #   @raise [driver#no_such_window_error] if unexistent (e.g. closed) window was passed
+    #   @raise [driver#no_such_window_error] if nonexistent (e.g. closed) window was passed
     # @overload within_window(proc_or_lambda) { do_something }
     #   @param lambda [Proc]                  lambda. First window for which lambda
     #     returns a value other than false or nil will be switched to.

data/lib/capybara/session/config.rb CHANGED

@@ -39,6 +39,7 @@ module Capybara
     #  See {Capybara.configure}
     #@!method save_path
     #  See {Capybara.configure}
+    #@deprecated
     #@!method exact_options
     #  See {Capybara.configure}
     #@!method asset_host
@@ -90,6 +91,13 @@ module Capybara
       @save_and_open_page_path = path
     end
+    remove_method :exact_options=
+    def exact_options=(opt)
+      @exact_options = opt
+      warn "DEPRECATED: #exact_options is deprecated, please scope your findes/actions and use the `:exact` "\
+           "option if similar functionality is needed."
+    end
     def initialize_copy(other)
       super
       @server_errors = @server_errors.dup

data/lib/capybara/spec/public/test.js CHANGED

@@ -1,8 +1,8 @@
 var activeRequests = 0;
 $(function() {
   $('#change').text('I changed it');
-  $('#drag').draggable();
-  $('#drop').droppable({
+  $('#drag, #drag_scroll').draggable();
+  $('#drop, #drop_scroll').droppable({
     drop: function(event, ui) {
       ui.draggable.remove();
       $(this).html('Dropped!');

data/lib/capybara/spec/session/assert_text.rb CHANGED

@@ -52,6 +52,14 @@ Capybara::SpecHelper.spec '#assert_text' do
     end.to raise_error(Capybara::ExpectationNotMet, /it was found 1 time using a case insensitive search/)
   end
+  it "should raise error with helpful message if requested text is present but invisible and with incorrect case", requires: [:js] do
+    @session.visit('/with_html')
+    el = @session.find(:css, '#uppercase')
+    expect do
+      el.assert_text('text here')
+    end.to raise_error(Capybara::ExpectationNotMet, /it was found 1 time using a case insensitive search and it was found 1 time including non-visible text/)
+  end
   it "should raise the correct error if requested text is missing but contains regex special characters" do
     @session.visit('/with_html')
     expect do

data/lib/capybara/spec/session/has_all_selectors_spec.rb ADDED

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+Capybara::SpecHelper.spec '#have_all_selectors' do
+  before do
+    @session.visit('/with_html')
+  end
+  it "should be true if the given selectors are on the page" do
+    expect(@session).to have_all_of_selectors(:css, "p a#foo", "h2#h2one", "h2#h2two" )
+  end
+  it "should be false if any of the given selectors are not on the page" do
+    expect {
+      expect(@session).to have_all_of_selectors(:css, "p a#foo", "h2#h2three", "h2#h2one")
+    }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+  end
+  it "should use default selector" do
+    Capybara.default_selector = :css
+    expect(@session).to have_all_of_selectors("p a#foo", "h2#h2two", "h2#h2one" )
+    expect {
+      expect(@session).to have_all_of_selectors("p a#foo", "h2#h2three", "h2#h2one")
+    }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+  end
+  context "should respect scopes" do
+    it "when used with `within`" do
+      @session.within "//p[@id='first']" do
+        expect(@session).to have_all_of_selectors(".//a[@id='foo']")
+        expect {
+          expect(@session).to have_all_of_selectors(".//a[@id='red']")
+        }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end
+    end
+    it "when called on elements" do
+      el = @session.find "//p[@id='first']"
+      expect(el).to have_all_of_selectors(".//a[@id='foo']")
+      expect {
+        expect(el).to have_all_of_selectors(".//a[@id='red']")
+      }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end
+  end
+  context "with options" do
+    it "should apply options to all locators" do
+      expect(@session).to have_all_of_selectors(:field, 'normal', 'additional_newline', type: :textarea)
+      expect {
+        expect(@session).to have_all_of_selectors(:field, 'normal', 'test_field', 'additional_newline', type: :textarea)
+      }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end
+  end
+  context "with wait", requires: [:js] do
+    it "should not raise error if all the elements appear before given wait duration" do
+      Capybara.using_wait_time(0.1) do
+        @session.visit('/with_js')
+        @session.click_link('Click me')
+        expect(@session).to have_all_of_selectors(:css, "a#clickable", "a#has-been-clicked", '#drag', wait: 0.9)
+      end
+    end
+  end
+  it "cannot be negated" do
+    expect {
+      expect(@session).not_to have_all_of_selectors(:css, "p a#foo", "h2#h2one", "h2#h2two")
+    }.to raise_error ArgumentError
+  end
+end

data/lib/capybara/spec/session/has_current_path_spec.rb CHANGED

@@ -13,6 +13,12 @@ Capybara::SpecHelper.spec '#has_current_path?' do
     expect(@session).not_to have_current_path(/monkey/)
   end
+  it "should not raise an error when non-http" do
+    @session.reset_session!
+    expect(@session.has_current_path?(/monkey/)).to eq false
+    expect(@session.has_current_path?("/with_js")).to eq false
+  end
   it "should handle non-escaped query options" do
     @session.click_link("Non-escaped query options")
     expect(@session).to have_current_path("/with_html?options[]=things")

data/lib/capybara/spec/session/has_link_spec.rb CHANGED

@@ -14,8 +14,8 @@ Capybara::SpecHelper.spec '#has_link?' do
   it "should be false if the given link is not on the page" do
     expect(@session).not_to have_link('monkey')
-    expect(@session).not_to have_link('A link', href: '/non-existant-href')
-    expect(@session).not_to have_link('A link', href: /non-existant/)
+    expect(@session).not_to have_link('A link', href: '/nonexistent-href')
+    expect(@session).not_to have_link('A link', href: /nonexistent/)
   end
 end
@@ -32,7 +32,7 @@ Capybara::SpecHelper.spec '#has_no_link?' do
   it "should be true if the given link is not on the page" do
     expect(@session).to have_no_link('monkey')
-    expect(@session).to have_no_link('A link', href: '/non-existant-href')
-    expect(@session).to have_no_link('A link', href: /\/non-existant-href/)
+    expect(@session).to have_no_link('A link', href: '/nonexistent-href')
+    expect(@session).to have_no_link('A link', href: /\/nonexistent-href/)
   end
 end

data/lib/capybara/spec/session/has_none_selectors_spec.rb ADDED

@@ -0,0 +1,76 @@
+Capybara::SpecHelper.spec '#have_none_of_selectors' do
+  before do
+    @session.visit('/with_html')
+  end
+  it "should be false if any of the given locators are on the page" do
+    expect {
+      expect(@session).to have_none_of_selectors(:xpath, "//p", "//a")
+    }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    expect {
+      expect(@session).to have_none_of_selectors(:css, "p a#foo")
+    }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+  end
+  it "should be true if none of the given locators are on the page" do
+    expect(@session).to have_none_of_selectors(:xpath, "//abbr", "//td" )
+    expect(@session).to have_none_of_selectors(:css, "p a#doesnotexist", "abbr")
+  end
+  it "should use default selector" do
+    Capybara.default_selector = :css
+    expect(@session).to have_none_of_selectors("p a#doesnotexist", "abbr")
+    expect {
+      expect(@session).to have_none_of_selectors("abbr", "p a#foo")
+    }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+  end
+  context "should respect scopes" do
+    it "when used with `within`" do
+      @session.within "//p[@id='first']" do
+        expect {
+          expect(@session).to have_none_of_selectors(".//a[@id='foo']")
+        }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+        expect(@session).to have_none_of_selectors(".//a[@id='red']")
+      end
+    end
+    it "when called on an element" do
+      el = @session.find "//p[@id='first']"
+      expect {
+        expect(el).to have_none_of_selectors(".//a[@id='foo']")
+      }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      expect(el).to have_none_of_selectors(".//a[@id='red']")
+    end
+  end
+  context "with options" do
+    it "should apply the options to all locators" do
+      expect {
+        expect(@session).to have_none_of_selectors("//p//a", text: "Redirect")
+      }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      expect(@session).to have_none_of_selectors("//p", text: "Doesnotexist")
+    end
+    it "should discard all matches where the given regexp is matched" do
+      expect {
+        expect(@session).to have_none_of_selectors("//p//a", text: /re[dab]i/i, count: 1)
+      }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      expect(@session).to have_none_of_selectors("//p//a", text: /Red$/)
+    end
+  end
+  context "with wait", requires: [:js] do
+    it "should not find elements if they appear after given wait duration" do
+      @session.visit('/with_js')
+      @session.click_link('Click me')
+      expect(@session).to have_none_of_selectors(:css, "#new_field", "a#has-been-clicked", wait: 0.1)
+    end
+  end
+  it "cannot be negated" do
+    expect {
+      expect(@session).not_to have_none_of_selectors(:css, "p a#foo", "h2#h2one", "h2#h2two")
+    }.to raise_error ArgumentError
+  end
+end

data/lib/capybara/spec/session/has_select_spec.rb CHANGED

@@ -27,7 +27,7 @@ Capybara::SpecHelper.spec '#has_select?' do
       expect(@session).not_to have_select('Does not exist', selected: 'John')
       expect(@session).not_to have_select('City', selected: 'Not there')
       expect(@session).not_to have_select('Underwear', selected: [
-        'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns', 'Nonexistant'
+        'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns', 'Nonexistent'
       ])
       expect(@session).not_to have_select('Underwear', selected: [
         'Boxerbriefs', 'Briefs', 'Boxers', 'Commando', "Frenchman's Pantalons", 'Long Johns'
@@ -185,7 +185,7 @@ Capybara::SpecHelper.spec '#has_no_select?' do
       expect(@session).to have_no_select('Does not exist', selected: 'John')
       expect(@session).to have_no_select('City', selected: 'Not there')
       expect(@session).to have_no_select('Underwear', selected: [
-        'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns', 'Nonexistant'
+        'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns', 'Nonexistent'
       ])
       expect(@session).to have_no_select('Underwear', selected: [
         'Boxerbriefs', 'Briefs', 'Boxers', 'Commando', "Frenchman's Pantalons", 'Long Johns'

data/lib/capybara/spec/session/node_spec.rb CHANGED

@@ -297,14 +297,29 @@ Capybara::SpecHelper.spec "node" do
       element.drag_to(target)
       expect(@session.find('//div[contains(., "Dropped!")]')).not_to be_nil
     end
+    it "should drag and drop if scrolling is needed" do
+      @session.visit('/with_js')
+      element = @session.find('//div[@id="drag_scroll"]')
+      target = @session.find('//div[@id="drop_scroll"]')
+      element.drag_to(target)
+      expect(@session.find('//div[contains(., "Dropped!")]')).not_to be_nil
+    end
   end
   describe '#hover', requires: [:hover] do
     it "should allow hovering on an element" do
       @session.visit('/with_hover')
-      expect(@session.find(:css,'.hidden_until_hover', visible: false)).not_to be_visible
-      @session.find(:css,'.wrapper').hover
-      expect(@session.find(:css, '.hidden_until_hover', visible: false)).to be_visible
+      expect(@session.find(:css, '.wrapper:not(.scroll_needed) .hidden_until_hover', visible: false)).not_to be_visible
+      @session.find(:css,'.wrapper:not(.scroll_needed)').hover
+      expect(@session.find(:css, '.wrapper:not(.scroll_needed) .hidden_until_hover', visible: false)).to be_visible
+    end
+    it "should allow hovering on an element that needs to be scrolled into view" do
+      @session.visit('/with_hover')
+      expect(@session.find(:css, '.wrapper.scroll_needed .hidden_until_hover', visible: false)).not_to be_visible
+      @session.find(:css,'.wrapper.scroll_needed').hover
+      expect(@session.find(:css, '.wrapper.scroll_needed .hidden_until_hover', visible: false)).to be_visible
     end
   end
@@ -347,7 +362,7 @@ Capybara::SpecHelper.spec "node" do
   describe '#double_click', requires: [:js] do
     it "should double click an element" do
-      pending "selenium-webdriver/geckodriver doesn't support mouse move_to" if marionette?(@session)
+      pending "selenium-webdriver/geckodriver doesn't generate double click event" if marionette?(@session)
       @session.visit('/with_js')
       @session.find(:css, '#click-test').double_click
       expect(@session.find(:css, '#has-been-double-clicked')).to be
@@ -356,7 +371,6 @@ Capybara::SpecHelper.spec "node" do
   describe '#right_click', requires: [:js] do
     it "should right click an element" do
-      pending "selenium-webdriver/geckodriver doesn't support mouse move_to" if marionette?(@session)
       @session.visit('/with_js')
       @session.find(:css, '#click-test').right_click
       expect(@session.find(:css, '#has-been-right-clicked')).to be

data/lib/capybara/spec/session/select_spec.rb CHANGED

@@ -24,6 +24,7 @@ Capybara::SpecHelper.spec "#select" do
   end
   it "should not allow selecting options where they are the only inexact match if `Capybara.exact_options = true`" do
+    expect_any_instance_of(Kernel).to receive(:warn).with(/^DEPRECATED:/)
     Capybara.exact_options = true
     expect do
       @session.select("Mis", from: 'Title')

data/lib/capybara/spec/spec_helper.rb CHANGED

@@ -33,7 +33,9 @@ module Capybara
         Capybara.default_max_wait_time = 1
         Capybara.ignore_hidden_elements = true
         Capybara.exact = false
-        Capybara.exact_options = false
+        # `exact_options` is deprecated - set instancce var directly so we
+        # don't generate message every reset
+        Capybara.send(:config).session_options.instance_variable_set('@exact_options', false)
         Capybara.raise_server_errors = true
         Capybara.visible_text_only = false
         Capybara.match = :smart
@@ -52,7 +54,7 @@ module Capybara
         end
       end
-      def spec(name, options={}, &block)
+      def spec(name, *options, &block)
         @specs ||= []
         @specs << [name, options, block]
       end
@@ -79,7 +81,7 @@ module Capybara
           end
           specs.each do |spec_name, spec_options, block|
-            describe spec_name, spec_options do
+            describe spec_name, *spec_options do
               class_eval(&block)
             end
           end

data/lib/capybara/spec/views/with_hover.erb CHANGED

@@ -14,5 +14,10 @@
       Some text here so the wrapper has size
       <div class="hidden_until_hover">Here I am</div>
     </div>
+    <div style="display: block; height: 1000px; width: 100%"></div>
+    <div class="wrapper scroll_needed" >
+      Some text here so the wrapper has size
+      <div class="hidden_until_hover">Here I am</div>
+    </div>
   </body>
 </html>

data/lib/capybara/spec/views/with_html.erb CHANGED

@@ -122,6 +122,10 @@ banana</textarea>
   <a id="link_blank_href" href="">Blank href</a>
 </div>
+<div id="uppercase" style="text-transform: uppercase;">
+  text here
+</div>
 <div id="ancestor3">
   Ancestor
   <div id="ancestor2">

data/lib/capybara/spec/views/with_js.erb CHANGED

@@ -121,6 +121,13 @@
       <input type="file" id="hidden_file" style="opacity:0; display: none;">
     </p>
+    <div id="drag_scroll">
+      <p>This is a draggable element.</p>
+    </div>
+    <div id="drop_scroll">
+      <p>It should be dropped here.</p>
+    </div>
     <script type="text/javascript">
       // a javascript comment
       var aVar = 123;

data/lib/capybara/version.rb CHANGED

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Capybara
-  VERSION = '2.16.1'
+  VERSION = '2.17.0'
 end

data/spec/capybara_spec.rb CHANGED

@@ -139,7 +139,7 @@ RSpec.describe Capybara do
 end
 RSpec.describe Capybara::Session do
-  context 'with non-existant driver' do
+  context 'with nonexistent driver' do
     it "should raise an error" do
       expect {
         Capybara::Session.new(:quox, TestApp).driver

data/spec/minitest_spec.rb CHANGED

@@ -88,6 +88,14 @@ class MinitestTest < Minitest::Test
     refute_table('not_on_form')
   end
+  def test_assert_all_of_selectors
+    assert_all_of_selectors(:css, 'select#form_other_title', 'input#form_last_name')
+  end
+  def test_assert_none_of_selectors
+    assert_none_of_selectors(:css, 'input#not_on_page', 'input#also_not_on_page')
+  end
   def test_assert_matches_selector
     assert_matches_selector(find(:field, 'customer_email'), :field, 'customer_email')
     assert_not_matches_selector(find(:select, 'form_title'), :field, 'customer_email')
@@ -117,6 +125,6 @@ RSpec.describe 'capybara/minitest' do
     reporter.start
     MinitestTest.run reporter, {}
     reporter.report
-    expect(output.string).to include("15 runs, 42 assertions, 0 failures, 0 errors, 0 skips")
+    expect(output.string).to include("17 runs, 44 assertions, 0 failures, 0 errors, 0 skips")
   end
 end

data/spec/minitest_spec_spec.rb CHANGED

@@ -88,6 +88,14 @@ class MinitestSpecTest < Minitest::Spec
     page.wont_have_table('not_on_form')
   end
+  it "supports all_of_selectors expectations" do
+    page.must_have_all_of_selectors(:css, 'select#form_other_title', 'input#form_last_name')
+  end
+  it "supports none_of_selectors expectations" do
+    page.must_have_none_of_selectors(:css, 'input#not_on_page', 'input#also_not_on_page')
+  end
   it "supports match_selector expectations" do
     find(:field, 'customer_email').must_match_selector(:field, 'customer_email')
     find(:select, 'form_title').wont_match_selector(:field, 'customer_email')
@@ -120,7 +128,7 @@ RSpec.describe 'capybara/minitest/spec' do
     reporter.start
     MinitestSpecTest.run reporter, {}
     reporter.report
-    expect(output.string).to include("16 runs, 39 assertions, 1 failures, 0 errors, 0 skips")
+    expect(output.string).to include("18 runs, 41 assertions, 1 failures, 0 errors, 0 skips")
     #Make sure error messages are displayed
     expect(output.string).to include('expected to find visible select box "non_existing_form_title" that is not disabled but there were no matches')
   end

data/spec/selenium_spec_chrome.rb CHANGED

@@ -40,8 +40,10 @@ RSpec.describe "Capybara::Session with chrome" do
         @session.find(:css, '#set-storage').click
         @session.reset!
         @session.visit('/with_js')
-        expect(@session.driver.browser.local_storage.keys).not_to be_empty
-        expect(@session.driver.browser.session_storage.keys).not_to be_empty
+        # expect(@session.driver.browser.local_storage.keys).not_to be_empty
+        # expect(@session.driver.browser.session_storage.keys).not_to be_empty
+        expect(@session.evaluate_script('Object.keys(localStorage)')).not_to be_empty
+        expect(@session.evaluate_script('Object.keys(sessionStorage)')).not_to be_empty
       end
       it "clears storage when set" do
@@ -50,8 +52,10 @@ RSpec.describe "Capybara::Session with chrome" do
         @session.find(:css, '#set-storage').click
         @session.reset!
         @session.visit('/with_js')
-        expect(@session.driver.browser.local_storage.keys).to be_empty
-        expect(@session.driver.browser.session_storage.keys).to be_empty
+        # expect(@session.driver.browser.local_storage.keys).to be_empty
+        # expect(@session.driver.browser.session_storage.keys).to be_empty
+        expect(@session.evaluate_script('Object.keys(localStorage)')).to be_empty
+        expect(@session.evaluate_script('Object.keys(sessionStorage)')).to be_empty
       end
     end
   end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.16.1
+  version: 2.17.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2017-11-20 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -72,16 +72,22 @@ dependencies:
   name: xpath
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -390,11 +396,13 @@ files:
 - lib/capybara/spec/session/frame/within_frame_spec.rb
 - lib/capybara/spec/session/go_back_spec.rb
 - lib/capybara/spec/session/go_forward_spec.rb
+- lib/capybara/spec/session/has_all_selectors_spec.rb
 - lib/capybara/spec/session/has_button_spec.rb
 - lib/capybara/spec/session/has_css_spec.rb
 - lib/capybara/spec/session/has_current_path_spec.rb
 - lib/capybara/spec/session/has_field_spec.rb
 - lib/capybara/spec/session/has_link_spec.rb
+- lib/capybara/spec/session/has_none_selectors_spec.rb
 - lib/capybara/spec/session/has_select_spec.rb
 - lib/capybara/spec/session/has_selector_spec.rb
 - lib/capybara/spec/session/has_table_spec.rb
@@ -508,7 +516,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.7.0
+rubygems_version: 2.7.3
 signing_key:
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,