capybara 2.13.0 → 2.18.0

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

@@ -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_css_spec.rb

@@ -112,6 +112,17 @@ Capybara::SpecHelper.spec '#has_css?' do
       expect(@session).not_to have_css("p a", text: /Red$/)
     end
   end
+
+  it "should allow escapes in the CSS selector" do
+    if (defined?(TestClass) && @session.is_a?(TestClass)) || @session.driver.is_a?(Capybara::RackTest::Driver)
+      # Nokogiri doesn't unescape CSS selectors when converting from CSS to XPath
+      # See: https://github.com/teamcapybara/capybara/issues/1866
+      # Also: https://github.com/sparklemotion/nokogiri/pull/1646
+      pending "Current Nokogiri doesn't handle escapes in CSS attribute selectors correctly"
+    end
+    expect(@session).to have_css('p[data-random="abc\\\\def"]')
+    expect(@session).to have_css("p[data-random='#{Capybara::Selector::CSS.escape('abc\def')}']")
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_css?' do

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

@@ -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")
@@ -25,7 +31,7 @@ Capybara::SpecHelper.spec '#has_current_path?' do
 
   it "should wait for current_path", requires: [:js] do
     @session.click_link("Change page")
-    expect(@session).to have_current_path("/with_html")
+    expect(@session).to have_current_path("/with_html", wait: 3)
   end
 
   it "should be false if the page has not the given current_path" do
@@ -37,20 +43,47 @@ Capybara::SpecHelper.spec '#has_current_path?' do
     expect(@session).to have_current_path('/with_js?test=test')
   end
 
-  it "should compare the full url" do
+  it "should compare the full url if url: true is used" do
     expect(@session).to have_current_path(%r{\Ahttp://[^/]*/with_js\Z}, url: true)
+    domain_port = if @session.respond_to?(:server) && @session.server
+      "#{@session.server.host}:#{@session.server.port}"
+    else
+      "www.example.com"
+    end
+    expect(@session).to have_current_path("http://#{domain_port}/with_js", url: true)
+  end
+
+  it "should not compare the full url if url: true is not passed" do
+    expect(@session).to have_current_path(%r{^/with_js\Z})
+    expect(@session).to have_current_path('/with_js')
+  end
+
+  it "should not compare the full url if url: false is passed" do
+    expect(@session).to have_current_path(%r{^/with_js\Z}, url: false)
+    expect(@session).to have_current_path('/with_js', url: false)
+  end
+
+  it "should default to full url if value is a url" do
+    url = @session.current_url
+    expect(url).to match /with_js$/
+    expect(@session).to have_current_path(url)
+    expect(@session).not_to have_current_path("http://www.not_example.com/with_js")
   end
 
   it "should ignore the query" do
     @session.visit('/with_js?test=test')
     expect(@session).to have_current_path('/with_js?test=test')
     expect(@session).to have_current_path('/with_js', only_path: true)
+    expect(@session).to have_current_path('/with_js', ignore_query: true)
+    uri = ::Addressable::URI.parse(@session.current_url)
+    uri.query = nil
+    expect(@session).to have_current_path(uri.to_s, ignore_query: true)
   end
 
   it "should not allow url and only_path at the same time" do
     expect {
       expect(@session).to have_current_path('/with_js', url: true, only_path: true)
-      }. to raise_error ArgumentError
+    }.to raise_error ArgumentError
   end
 
   it "should not raise an exception if the current_url is nil" do
@@ -59,12 +92,17 @@ Capybara::SpecHelper.spec '#has_current_path?' do
     # Without only_path option
     expect {
       expect(@session).to have_current_path(nil)
-    }. not_to raise_exception
+    }.not_to raise_exception
 
     # With only_path option
     expect {
       expect(@session).to have_current_path(nil, only_path: true)
-    }. not_to raise_exception
+    }.not_to raise_exception
+
+    # With ignore_query option
+    expect {
+      expect(@session).to have_current_path(nil, ignore_query: true)
+    }.not_to raise_exception
   end
 end
 
@@ -83,8 +121,10 @@ Capybara::SpecHelper.spec '#has_no_current_path?' do
   end
 
   it "should wait for current_path to disappear", requires: [:js] do
-    @session.click_link("Change page")
-    expect(@session).to have_no_current_path('/with_js')
+    Capybara.using_wait_time(3) do
+      @session.click_link("Change page")
+      expect(@session).to have_no_current_path('/with_js')
+    end
   end
 
   it "should be true if the page has not the given current_path" do
@@ -103,5 +143,10 @@ Capybara::SpecHelper.spec '#has_no_current_path?' do
     expect {
       expect(@session).not_to have_current_path('/with_js', only_path: true)
     }. not_to raise_exception
+
+    # With ignore_query option
+    expect {
+      expect(@session).not_to have_current_path('/with_js', ignore_query: true)
+    }. not_to raise_exception
   end
 end

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

@@ -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

@@ -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

@@ -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'
@@ -67,6 +67,36 @@ Capybara::SpecHelper.spec '#has_select?' do
     end
   end
 
+  context 'with partial select' do
+    it "should be true if a field with the given partial values is on the page" do
+      expect(@session).to have_select('Underwear', with_selected: ['Boxerbriefs', 'Briefs'])
+    end
+
+    it "should be false if a field with the given partial values is not on the page" do
+      expect(@session).not_to have_select('Underwear', with_selected: ['Boxerbriefs', 'Boxers'])
+    end
+
+    it "should be true after the given partial value is selected" do
+      @session.select('Boxers', from: 'Underwear')
+      expect(@session).to have_select('Underwear', with_selected: ['Boxerbriefs', 'Boxers'])
+    end
+
+    it "should be false after one of the given partial values is unselected" do
+      @session.unselect('Briefs', from: 'Underwear')
+      expect(@session).not_to have_select('Underwear', with_selected: ['Boxerbriefs', 'Briefs'])
+    end
+
+    it "should be true even when the selected values are invisible, regardless of the select's visibility" do
+      expect(@session).to have_select('Dessert', visible: false, with_options: ['Pudding', 'Tiramisu'])
+      expect(@session).to have_select('Cake', with_selected: ['Chocolate Cake', 'Sponge Cake'])
+    end
+
+    it "should support non array partial values" do
+      expect(@session).to have_select('Underwear', with_selected: 'Briefs')
+      expect(@session).not_to have_select('Underwear', with_selected: 'Boxers')
+    end
+  end
+
   context 'with exact options' do
     it "should be true if a field with the given options is on the page" do
       expect(@session).to have_select('Region', options: ['Norway', 'Sweden', 'Finland'])
@@ -81,10 +111,9 @@ Capybara::SpecHelper.spec '#has_select?' do
       expect(@session).not_to have_select('Region', options: ['Norway', 'Norway', 'Norway'])
     end
 
-    it" should be true even when the options are invisible, if the select itself is invisible" do
+    it "should be true even when the options are invisible, if the select itself is invisible" do
       expect(@session).to have_select("Icecream", visible: false, options: ['Chocolate', 'Vanilla', 'Strawberry'])
     end
-
   end
 
   context 'with partial options' do
@@ -99,7 +128,7 @@ Capybara::SpecHelper.spec '#has_select?' do
       expect(@session).not_to have_select('Region', with_options: ['Norway', 'Sweden', 'Finland', 'Latvia'])
     end
 
-    it" should be true even when the options are invisible, if the select itself is invisible" do
+    it "should be true even when the options are invisible, if the select itself is invisible" do
       expect(@session).to have_select("Icecream", visible: false, with_options: ['Vanilla', 'Strawberry'])
     end
   end
@@ -123,7 +152,9 @@ Capybara::SpecHelper.spec '#has_select?' do
 
   it "should support locator-less usage" do
     expect(@session.has_select?(with_options: ['Norway', 'Sweden'])).to eq true
-    expect(@session).to have_select(with_options: ['London'] )
+    expect(@session).to have_select(with_options: ['London'])
+    expect(@session.has_select?(with_selected: ['Commando', 'Boxerbriefs'])).to eq true
+    expect(@session).to have_select(with_selected: ['Briefs'])
   end
 end
 
@@ -154,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'
@@ -189,6 +220,31 @@ Capybara::SpecHelper.spec '#has_no_select?' do
     end
   end
 
+  context 'with partial select' do
+    it "should be false if a field with the given partial values is on the page" do
+      expect(@session).not_to have_no_select('Underwear', with_selected: ['Boxerbriefs', 'Briefs'])
+    end
+
+    it "should be true if a field with the given partial values is not on the page" do
+      expect(@session).to have_no_select('Underwear', with_selected: ['Boxerbriefs', 'Boxers'])
+    end
+
+    it "should be false after the given partial value is selected" do
+      @session.select('Boxers', from: 'Underwear')
+      expect(@session).not_to have_no_select('Underwear', with_selected: ['Boxerbriefs', 'Boxers'])
+    end
+
+    it "should be true after one of the given partial values is unselected" do
+      @session.unselect('Briefs', from: 'Underwear')
+      expect(@session).to have_no_select('Underwear', with_selected: ['Boxerbriefs', 'Briefs'])
+    end
+
+    it "should support non array partial values" do
+      expect(@session).not_to have_no_select('Underwear', with_selected: 'Briefs')
+      expect(@session).to have_no_select('Underwear', with_selected: 'Boxers')
+    end
+  end
+
   context 'with exact options' do
     it "should be false if a field with the given options is on the page" do
       expect(@session).not_to have_no_select('Region', options: ['Norway', 'Sweden', 'Finland'])
@@ -219,5 +275,7 @@ Capybara::SpecHelper.spec '#has_no_select?' do
   it "should support locator-less usage" do
     expect(@session.has_no_select?(with_options: ['Norway', 'Sweden', 'Finland', 'Latvia'])).to eq true
     expect(@session).to have_no_select(with_options: ['New London'] )
+    expect(@session.has_no_select?(with_selected: ['Boxers'])).to eq true
+    expect(@session).to have_no_select(with_selected: ['Commando', 'Boxers'])
   end
 end

data/lib/capybara/spec/session/has_selector_spec.rb

@@ -131,9 +131,7 @@ Capybara::SpecHelper.spec '#has_no_selector?' do
   end
 
   it "should accept a filter block" do
-    if !defined?(::RSpec::Expectations::Version) || (Gem::Version.new(RSpec::Expectations::Version::STRING) < Gem::Version.new('3.0'))
-      skip "RSpec < 3 doesn't pass the block along to the matcher for the Builtin::Has matcher"
-    end
+    skip "RSpec < 3 doesn't pass the block along to the matcher for the Builtin::Has matcher" if rspec2?
     expect(@session).to have_no_selector(:css, "a#foo") { |el| el[:id] != "foo" }
   end
 

data/lib/capybara/spec/session/has_text_spec.rb

@@ -125,9 +125,11 @@ Capybara::SpecHelper.spec '#has_text?' do
   end
 
   it "should wait for text to appear", requires: [:js] do
-    @session.visit('/with_js')
-    @session.click_link('Click me')
-    expect(@session).to have_text("Has been clicked")
+    Capybara.using_wait_time(3) do
+      @session.visit('/with_js')
+      @session.click_link('Click me')
+      expect(@session).to have_text("Has been clicked")
+    end
   end
 
   context "with between" do

data/lib/capybara/spec/session/has_title_spec.rb

@@ -53,8 +53,10 @@ Capybara::SpecHelper.spec '#has_no_title?' do
   end
 
   it "should wait for title to disappear", requires: [:js] do
-    @session.click_link("Change title")
-    expect(@session).to have_no_title('with_js')
+    Capybara.using_wait_time(5) do
+      @session.click_link("Change title") # triggers title change after 400ms
+      expect(@session).to have_no_title('with_js')
+    end
   end
 
   it "should be true if the page has not the given title" do

data/lib/capybara/spec/session/has_xpath_spec.rb

@@ -29,9 +29,11 @@ Capybara::SpecHelper.spec '#has_xpath?' do
   end
 
   it "should wait for content to appear", requires: [:js] do
-    @session.visit('/with_js')
-    @session.click_link('Click me')
-    expect(@session).to have_xpath("//input[@type='submit' and @value='New Here']")
+    Capybara.using_wait_time(3) do
+      @session.visit('/with_js')
+      @session.click_link('Click me') # updates page after 500ms
+      expect(@session).to have_xpath("//input[@type='submit' and @value='New Here']")
+    end
   end
 
   context "with count" do

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

@@ -122,23 +122,25 @@ Capybara::SpecHelper.spec "node" do
       expect(@session.first('//textarea[@readonly]').set('changed')).to raise_error(Capybara::ReadOnlyElementError)
     end if Capybara::VERSION.to_f > 3.0
 
-    it 'should allow me to change the contents of a contenteditable element', requires: [:js] do
-      @session.visit('/with_js')
-      @session.find(:css,'#existing_content_editable').set('WYSIWYG')
-      expect(@session.find(:css,'#existing_content_editable').text).to eq('WYSIWYG')
-    end
+    context "with a contenteditable element", requires: [:js] do
+      it 'should allow me to change the contents' do
+        @session.visit('/with_js')
+        @session.find(:css,'#existing_content_editable').set('WYSIWYG')
+        expect(@session.find(:css,'#existing_content_editable').text).to eq('WYSIWYG')
+      end
 
-    it 'should allow me to set the contents of a contenteditable element', requires: [:js] do
-      @session.visit('/with_js')
-      @session.find(:css,'#blank_content_editable').set('WYSIWYG')
-      expect(@session.find(:css,'#blank_content_editable').text).to eq('WYSIWYG')
-    end
+      it 'should allow me to set the contents' do
+        @session.visit('/with_js')
+        @session.find(:css,'#blank_content_editable').set('WYSIWYG')
+        expect(@session.find(:css,'#blank_content_editable').text).to eq('WYSIWYG')
+      end
 
-    it 'should allow me to change the contents of a contenteditable elements child', requires: [:js] do
-      @session.visit('/with_js')
-      @session.find(:css,'#existing_content_editable_child').set('WYSIWYG')
-      expect(@session.find(:css,'#existing_content_editable_child').text).to eq('WYSIWYG')
-      expect(@session.find(:css,'#existing_content_editable_child_parent').text).to eq('Some content WYSIWYG')
+      it 'should allow me to change the contents of a child element' do
+        @session.visit('/with_js')
+        @session.find(:css,'#existing_content_editable_child').set('WYSIWYG')
+        expect(@session.find(:css,'#existing_content_editable_child').text).to eq('WYSIWYG')
+        expect(@session.find(:css,'#existing_content_editable_child_parent').text).to eq('Some content WYSIWYG')
+      end
     end
   end
 
@@ -289,22 +291,35 @@ Capybara::SpecHelper.spec "node" do
 
   describe '#drag_to', requires: [:js, :drag] do
     it "should drag and drop an object" do
-      pending "selenium-webdriver/geckodriver doesn't support mouse move_to" if marionette?(@session)
       @session.visit('/with_js')
       element = @session.find('//div[@id="drag"]')
       target = @session.find('//div[@id="drop"]')
       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
-      pending "selenium-webdriver/geckodriver doesn't support mouse move_to" if marionette?(@session)
       @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
 
@@ -314,6 +329,12 @@ Capybara::SpecHelper.spec "node" do
       expect(@session.current_url).to match(%r{/with_html$})
     end
 
+    it "should go to the same page if href is blank" do
+      @session.find(:css, '#link_blank_href').click
+      sleep 1
+      expect(@session).to have_current_path('/with_html')
+    end
+
     it "should be able to check a checkbox" do
       @session.visit('form')
       cbox = @session.find(:checkbox, 'form_terms_of_use')
@@ -341,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
@@ -350,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
@@ -422,11 +442,15 @@ Capybara::SpecHelper.spec "node" do
     end
 
     context "with automatic reload" do
+      before do
+        Capybara.default_max_wait_time = 4
+      end
+
       it "should reload the current context of the node automatically" do
         @session.visit('/with_js')
         node = @session.find(:css, '#reload-me')
         @session.click_link('Reload!')
-        sleep(0.3)
+        sleep(1)
         expect(node.text).to eq('has been reloaded')
       end
 
@@ -434,7 +458,7 @@ Capybara::SpecHelper.spec "node" do
         @session.visit('/with_js')
         node = @session.find(:css, '#reload-me').find(:css, 'em')
         @session.click_link('Reload!')
-        sleep(0.3)
+        sleep(1)
         expect(node.text).to eq('has been reloaded')
       end
 
@@ -442,7 +466,7 @@ Capybara::SpecHelper.spec "node" do
         @session.visit('/with_js')
         node = @session.find(:css, '#reload-me')
         @session.click_link('Reload!')
-        sleep(0.3)
+        sleep(1)
         expect(node.find(:css, 'a').text).to eq('has been reloaded')
       end
 
@@ -450,7 +474,7 @@ Capybara::SpecHelper.spec "node" do
         @session.visit('/with_js')
         node = @session.all(:css, '#the-list li')[1]
         @session.click_link('Fetch new list!')
-        sleep(0.3)
+        sleep(1)
 
         expect do
           expect(node).to have_text('Foo')