capybara 2.5.0 → 2.18.0

data/lib/capybara/spec/session/{within_frame_spec.rb → frame/within_frame_spec.rb}

@@ -1,4 +1,5 @@
-Capybara::SpecHelper.spec '#within_frame', :requires => [:frames] do
+# frozen_string_literal: true
+Capybara::SpecHelper.spec '#within_frame', requires: [:frames] do
   before(:each) do
     @session.visit('/within_frames')
   end
@@ -8,40 +9,59 @@ Capybara::SpecHelper.spec '#within_frame', :requires => [:frames] do
       expect(@session.find("//*[@id='divInFrameOne']").text).to eql 'This is the text of divInFrameOne'
     end
   end
+
   it "should find the div in FrameTwo" do
     @session.within_frame("frameTwo") do
       expect(@session.find("//*[@id='divInFrameTwo']").text).to eql 'This is the text of divInFrameTwo'
     end
   end
+
   it "should find the text div in the main window after finding text in frameOne" do
     @session.within_frame("frameOne") do
       expect(@session.find("//*[@id='divInFrameOne']").text).to eql 'This is the text of divInFrameOne'
     end
     expect(@session.find("//*[@id='divInMainWindow']").text).to eql 'This is the text for divInMainWindow'
   end
+
   it "should find the text div in the main window after finding text in frameTwo" do
     @session.within_frame("frameTwo") do
       expect(@session.find("//*[@id='divInFrameTwo']").text).to eql 'This is the text of divInFrameTwo'
     end
     expect(@session.find("//*[@id='divInMainWindow']").text).to eql 'This is the text for divInMainWindow'
   end
+
   it "should return the result of executing the block" do
     expect(@session.within_frame("frameOne") { "return value" }).to eql "return value"
   end
+
   it "should find the div given Element" do
     element = @session.find(:id, 'frameOne')
     @session.within_frame element do
       expect(@session.find("//*[@id='divInFrameOne']").text).to eql 'This is the text of divInFrameOne'
     end
   end
+
+  it "should find the div given selector and locator" do
+    @session.within_frame(:css, '#frameOne') do
+      expect(@session.find("//*[@id='divInFrameOne']").text).to eql 'This is the text of divInFrameOne'
+    end
+  end
+
+  it "should default to the :frame selector kind when only options passed" do
+    @session.within_frame(name: 'my frame one') do
+      expect(@session.find("//*[@id='divInFrameOne']").text).to eql 'This is the text of divInFrameOne'
+    end
+  end
+
   it "should find multiple nested frames" do
     @session.within_frame 'parentFrame' do
       @session.within_frame 'childFrame' do
         @session.within_frame 'grandchildFrame1' do end
         @session.within_frame 'grandchildFrame2' do end
-      end    
+      end
     end
   end
+
   it "should reset scope when changing frames" do
     @session.within(:css, '#divInMainWindow') do
       @session.within_frame 'parentFrame' do
@@ -49,4 +69,26 @@ Capybara::SpecHelper.spec '#within_frame', :requires => [:frames] do
       end
     end
   end
+
+  it "works if the frame is closed", requires: [:frames, :js] do
+    @session.within_frame 'parentFrame' do
+      @session.within_frame 'childFrame' do
+        @session.click_link 'Close Window'
+      end
+      expect(@session).to have_selector(:css, 'body#parentBody')
+      expect(@session).not_to have_selector(:css, '#childFrame')
+    end
+  end
+
+  it "should support the driver #switch_to_frame api" do
+    # This test is purely to notify driver authors to update their API.
+    # The #switch_to_frame API will be required in the next version (> 2.8) of Capybara for frames support.
+    # It should not be used as an example of code for users.
+    frame = @session.find(:frame, "frameOne")
+    expect {
+      @session.driver.switch_to_frame(frame)
+      sleep 0.5
+      @session.driver.switch_to_frame(:parent)
+    }.not_to raise_error
+  end
 end

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

@@ -1,4 +1,5 @@
-Capybara::SpecHelper.spec '#go_back', :requires => [:js] do
+# frozen_string_literal: true
+Capybara::SpecHelper.spec '#go_back', requires: [:js] do
   it "should fetch a response from the driver from the previous page" do
     @session.visit('/')
     expect(@session).to have_content('Hello world!')

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

@@ -1,4 +1,5 @@
-Capybara::SpecHelper.spec '#go_forward', :requires => [:js] do
+# frozen_string_literal: true
+Capybara::SpecHelper.spec '#go_forward', requires: [:js] do
   it "should fetch a response from the driver from the previous page" do
     @session.visit('/')
     expect(@session).to have_content('Hello world!')

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_button_spec.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#has_button?' do
   before do
     @session.visit('/form')
@@ -9,8 +10,8 @@ Capybara::SpecHelper.spec '#has_button?' do
     expect(@session).to have_button(:'crap321')
   end
 
-  it "should be true for disabled buttons if :disabled => true" do
-    expect(@session).to have_button('Disabled button', :disabled => true)
+  it "should be true for disabled buttons if disabled: true" do
+    expect(@session).to have_button('Disabled button', disabled: true)
   end
 
   it "should be false if the given button is not on the page" do
@@ -21,8 +22,16 @@ Capybara::SpecHelper.spec '#has_button?' do
     expect(@session).not_to have_button('Disabled button')
   end
 
-  it "should be false for disabled buttons if :disabled => false" do
-    expect(@session).not_to have_button('Disabled button', :disabled => false)
+  it "should be false for disabled buttons if disabled: false" do
+    expect(@session).not_to have_button('Disabled button', disabled: false)
+  end
+
+  it "should be true for disabled buttons if disabled: :all" do
+    expect(@session).to have_button('Disabled button', disabled: :all)
+  end
+
+  it "should be true for enabled buttons if disabled: :all" do
+    expect(@session).to have_button('med', disabled: :all)
   end
 end
 
@@ -36,8 +45,8 @@ Capybara::SpecHelper.spec '#has_no_button?' do
     expect(@session).not_to have_no_button('crap321')
   end
 
-  it "should be true for disabled buttons if :disabled => true" do
-    expect(@session).not_to have_no_button('Disabled button', :disabled => true)
+  it "should be true for disabled buttons if disabled: true" do
+    expect(@session).not_to have_no_button('Disabled button', disabled: true)
   end
 
   it "should be false if the given button is not on the page" do
@@ -48,7 +57,7 @@ Capybara::SpecHelper.spec '#has_no_button?' do
     expect(@session).to have_no_button('Disabled button')
   end
 
-  it "should be false for disabled buttons if :disabled => false" do
-    expect(@session).to have_no_button('Disabled button', :disabled => false)
+  it "should be false for disabled buttons if disabled: false" do
+    expect(@session).to have_no_button('Disabled button', disabled: false)
   end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#has_css?' do
   before do
     @session.visit('/with_html')
@@ -21,7 +22,7 @@ Capybara::SpecHelper.spec '#has_css?' do
     end
   end
 
-  it "should wait for content to appear", :requires => [:js] do
+  it "should wait for content to appear", requires: [:js] do
     @session.visit('/with_js')
     @session.click_link('Click me')
     expect(@session).to have_css("input[type='submit'][value='New Here']")
@@ -29,88 +30,99 @@ Capybara::SpecHelper.spec '#has_css?' do
 
   context "with between" do
     it "should be true if the content occurs within the range given" do
-      expect(@session).to have_css("p", :between => 1..4)
-      expect(@session).to have_css("p a#foo", :between => 1..3)
-      expect(@session).to have_css("p a.doesnotexist", :between => 0..8)
+      expect(@session).to have_css("p", between: 1..4)
+      expect(@session).to have_css("p a#foo", between: 1..3)
+      expect(@session).to have_css("p a.doesnotexist", between: 0..8)
     end
 
     it "should be false if the content occurs more or fewer times than range" do
-      expect(@session).not_to have_css("p", :between => 6..11 )
-      expect(@session).not_to have_css("p a#foo", :between => 4..7)
-      expect(@session).not_to have_css("p a.doesnotexist", :between => 3..8)
+      expect(@session).not_to have_css("p", between: 6..11 )
+      expect(@session).not_to have_css("p a#foo", between: 4..7)
+      expect(@session).not_to have_css("p a.doesnotexist", between: 3..8)
     end
   end
 
   context "with count" do
     it "should be true if the content occurs the given number of times" do
-      expect(@session).to have_css("p", :count => 3)
-      expect(@session).to have_css("p a#foo", :count => 1)
-      expect(@session).to have_css("p a.doesnotexist", :count => 0)
+      expect(@session).to have_css("p", count: 3)
+      expect(@session).to have_css("p a#foo", count: 1)
+      expect(@session).to have_css("p a.doesnotexist", count: 0)
     end
 
     it "should be false if the content occurs a different number of times than the given" do
-      expect(@session).not_to have_css("p", :count => 6)
-      expect(@session).not_to have_css("p a#foo", :count => 2)
-      expect(@session).not_to have_css("p a.doesnotexist", :count => 1)
+      expect(@session).not_to have_css("p", count: 6)
+      expect(@session).not_to have_css("p a#foo", count: 2)
+      expect(@session).not_to have_css("p a.doesnotexist", count: 1)
     end
 
     it "should coerce count to an integer" do
-      expect(@session).to have_css("p", :count => "3")
-      expect(@session).to have_css("p a#foo", :count => "1")
+      expect(@session).to have_css("p", count: "3")
+      expect(@session).to have_css("p a#foo", count: "1")
     end
   end
 
   context "with maximum" do
     it "should be true when content occurs same or fewer times than given" do
-      expect(@session).to have_css("h2.head", :maximum => 5) # edge case
-      expect(@session).to have_css("h2", :maximum => 10)
-      expect(@session).to have_css("p a.doesnotexist", :maximum => 1)
-      expect(@session).to have_css("p a.doesnotexist", :maximum => 0)
+      expect(@session).to have_css("h2.head", maximum: 5) # edge case
+      expect(@session).to have_css("h2", maximum: 10)
+      expect(@session).to have_css("p a.doesnotexist", maximum: 1)
+      expect(@session).to have_css("p a.doesnotexist", maximum: 0)
     end
 
     it "should be false when content occurs more times than given" do
-      expect(@session).not_to have_css("h2.head", :maximum => 4) # edge case
-      expect(@session).not_to have_css("h2", :maximum => 3)
-      expect(@session).not_to have_css("p", :maximum => 1)
+      expect(@session).not_to have_css("h2.head", maximum: 4) # edge case
+      expect(@session).not_to have_css("h2", maximum: 3)
+      expect(@session).not_to have_css("p", maximum: 1)
     end
 
     it "should coerce maximum to an integer" do
-      expect(@session).to have_css("h2.head", :maximum => "5") # edge case
-      expect(@session).to have_css("h2", :maximum => "10")
+      expect(@session).to have_css("h2.head", maximum: "5") # edge case
+      expect(@session).to have_css("h2", maximum: "10")
     end
   end
 
   context "with minimum" do
     it "should be true when content occurs same or more times than given" do
-      expect(@session).to have_css("h2.head", :minimum => 5) # edge case
-      expect(@session).to have_css("h2", :minimum => 3)
-      expect(@session).to have_css("p a.doesnotexist", :minimum => 0)
+      expect(@session).to have_css("h2.head", minimum: 5) # edge case
+      expect(@session).to have_css("h2", minimum: 3)
+      expect(@session).to have_css("p a.doesnotexist", minimum: 0)
     end
 
     it "should be false when content occurs fewer times than given" do
-      expect(@session).not_to have_css("h2.head", :minimum => 6) # edge case
-      expect(@session).not_to have_css("h2", :minimum => 8)
-      expect(@session).not_to have_css("p", :minimum => 10)
-      expect(@session).not_to have_css("p a.doesnotexist", :minimum => 1)
+      expect(@session).not_to have_css("h2.head", minimum: 6) # edge case
+      expect(@session).not_to have_css("h2", minimum: 8)
+      expect(@session).not_to have_css("p", minimum: 10)
+      expect(@session).not_to have_css("p a.doesnotexist", minimum: 1)
     end
 
     it "should coerce minimum to an integer" do
-      expect(@session).to have_css("h2.head", :minimum => "5") # edge case
-      expect(@session).to have_css("h2", :minimum => "3")
+      expect(@session).to have_css("h2.head", minimum: "5") # edge case
+      expect(@session).to have_css("h2", minimum: "3")
     end
   end
 
   context "with text" do
     it "should discard all matches where the given string is not contained" do
-      expect(@session).to have_css("p a", :text => "Redirect", :count => 1)
-      expect(@session).not_to have_css("p a", :text => "Doesnotexist")
+      expect(@session).to have_css("p a", text: "Redirect", count: 1)
+      expect(@session).not_to have_css("p a", text: "Doesnotexist")
     end
 
     it "should discard all matches where the given regexp is not matched" do
-      expect(@session).to have_css("p a", :text => /re[dab]i/i, :count => 1)
-      expect(@session).not_to have_css("p a", :text => /Red$/)
+      expect(@session).to have_css("p a", text: /re[dab]i/i, count: 1)
+      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
@@ -136,7 +148,7 @@ Capybara::SpecHelper.spec '#has_no_css?' do
     end
   end
 
-  it "should wait for content to disappear", :requires => [:js] do
+  it "should wait for content to disappear", requires: [:js] do
     @session.visit('/with_js')
     @session.click_link('Click me')
     expect(@session).to have_no_css("p#change")
@@ -144,85 +156,85 @@ Capybara::SpecHelper.spec '#has_no_css?' do
 
   context "with between" do
     it "should be false if the content occurs within the range given" do
-      expect(@session).not_to have_no_css("p", :between => 1..4)
-      expect(@session).not_to have_no_css("p a#foo", :between => 1..3)
-      expect(@session).not_to have_no_css("p a.doesnotexist", :between => 0..2)
+      expect(@session).not_to have_no_css("p", between: 1..4)
+      expect(@session).not_to have_no_css("p a#foo", between: 1..3)
+      expect(@session).not_to have_no_css("p a.doesnotexist", between: 0..2)
     end
 
     it "should be true if the content occurs more or fewer times than range" do
-      expect(@session).to have_no_css("p", :between => 6..11 )
-      expect(@session).to have_no_css("p a#foo", :between => 4..7)
-      expect(@session).to have_no_css("p a.doesnotexist", :between => 3..8)
+      expect(@session).to have_no_css("p", between: 6..11 )
+      expect(@session).to have_no_css("p a#foo", between: 4..7)
+      expect(@session).to have_no_css("p a.doesnotexist", between: 3..8)
     end
   end
 
   context "with count" do
     it "should be false if the content is on the page the given number of times" do
-      expect(@session).not_to have_no_css("p", :count => 3)
-      expect(@session).not_to have_no_css("p a#foo", :count => 1)
-      expect(@session).not_to have_no_css("p a.doesnotexist", :count => 0)
+      expect(@session).not_to have_no_css("p", count: 3)
+      expect(@session).not_to have_no_css("p a#foo", count: 1)
+      expect(@session).not_to have_no_css("p a.doesnotexist", count: 0)
     end
 
     it "should be true if the content is on the page the given number of times" do
-      expect(@session).to have_no_css("p", :count => 6)
-      expect(@session).to have_no_css("p a#foo", :count => 2)
-      expect(@session).to have_no_css("p a.doesnotexist", :count => 1)
+      expect(@session).to have_no_css("p", count: 6)
+      expect(@session).to have_no_css("p a#foo", count: 2)
+      expect(@session).to have_no_css("p a.doesnotexist", count: 1)
     end
 
     it "should coerce count to an integer" do
-      expect(@session).not_to have_no_css("p", :count => "3")
-      expect(@session).not_to have_no_css("p a#foo", :count => "1")
+      expect(@session).not_to have_no_css("p", count: "3")
+      expect(@session).not_to have_no_css("p a#foo", count: "1")
     end
   end
 
   context "with maximum" do
     it "should be false when content occurs same or fewer times than given" do
-      expect(@session).not_to have_no_css("h2.head", :maximum => 5) # edge case
-      expect(@session).not_to have_no_css("h2", :maximum => 10)
-      expect(@session).not_to have_no_css("p a.doesnotexist", :maximum => 0)
+      expect(@session).not_to have_no_css("h2.head", maximum: 5) # edge case
+      expect(@session).not_to have_no_css("h2", maximum: 10)
+      expect(@session).not_to have_no_css("p a.doesnotexist", maximum: 0)
     end
 
     it "should be true when content occurs more times than given" do
-      expect(@session).to have_no_css("h2.head", :maximum => 4) # edge case
-      expect(@session).to have_no_css("h2", :maximum => 3)
-      expect(@session).to have_no_css("p", :maximum => 1)
+      expect(@session).to have_no_css("h2.head", maximum: 4) # edge case
+      expect(@session).to have_no_css("h2", maximum: 3)
+      expect(@session).to have_no_css("p", maximum: 1)
     end
 
     it "should coerce maximum to an integer" do
-      expect(@session).not_to have_no_css("h2.head", :maximum => "5") # edge case
-      expect(@session).not_to have_no_css("h2", :maximum => "10")
+      expect(@session).not_to have_no_css("h2.head", maximum: "5") # edge case
+      expect(@session).not_to have_no_css("h2", maximum: "10")
     end
   end
 
   context "with minimum" do
     it "should be false when content occurs same or more times than given" do
-      expect(@session).not_to have_no_css("h2.head", :minimum => 5) # edge case
-      expect(@session).not_to have_no_css("h2", :minimum => 3)
-      expect(@session).not_to have_no_css("p a.doesnotexist", :minimum => 0)
+      expect(@session).not_to have_no_css("h2.head", minimum: 5) # edge case
+      expect(@session).not_to have_no_css("h2", minimum: 3)
+      expect(@session).not_to have_no_css("p a.doesnotexist", minimum: 0)
     end
 
     it "should be true when content occurs fewer times than given" do
-      expect(@session).to have_no_css("h2.head", :minimum => 6) # edge case
-      expect(@session).to have_no_css("h2", :minimum => 8)
-      expect(@session).to have_no_css("p", :minimum => 15)
-      expect(@session).to have_no_css("p a.doesnotexist", :minimum => 1)
+      expect(@session).to have_no_css("h2.head", minimum: 6) # edge case
+      expect(@session).to have_no_css("h2", minimum: 8)
+      expect(@session).to have_no_css("p", minimum: 15)
+      expect(@session).to have_no_css("p a.doesnotexist", minimum: 1)
     end
 
     it "should coerce minimum to an integer" do
-      expect(@session).not_to have_no_css("h2.head", :minimum => "4") # edge case
-      expect(@session).not_to have_no_css("h2", :minimum => "3")
+      expect(@session).not_to have_no_css("h2.head", minimum: "4") # edge case
+      expect(@session).not_to have_no_css("h2", minimum: "3")
     end
   end
 
   context "with text" do
     it "should discard all matches where the given string is not contained" do
-      expect(@session).not_to have_no_css("p a", :text => "Redirect", :count => 1)
-      expect(@session).to have_no_css("p a", :text => "Doesnotexist")
+      expect(@session).not_to have_no_css("p a", text: "Redirect", count: 1)
+      expect(@session).to have_no_css("p a", text: "Doesnotexist")
     end
 
     it "should discard all matches where the given regexp is not matched" do
-      expect(@session).not_to have_no_css("p a", :text => /re[dab]i/i, :count => 1)
-      expect(@session).to have_no_css("p a", :text => /Red$/)
+      expect(@session).not_to have_no_css("p a", text: /re[dab]i/i, count: 1)
+      expect(@session).to have_no_css("p a", text: /Red$/)
     end
   end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#has_current_path?' do
   before do
     @session.visit('/with_js')
@@ -12,9 +13,25 @@ Capybara::SpecHelper.spec '#has_current_path?' do
     expect(@session).not_to have_current_path(/monkey/)
   end
 
-  it "should wait for current_path", :requires => [:js] do
+  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")
+  end
+
+  it "should handle escaped query options" do
+    @session.click_link("Escaped query options")
+    expect(@session).to have_current_path("/with_html?options%5B%5D=things")
+  end
+
+  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
@@ -26,20 +43,66 @@ 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
+    allow_any_instance_of(Capybara::Session).to receive(:current_url) { nil }
+
+    # Without only_path option
+    expect {
+      expect(@session).to have_current_path(nil)
+    }.not_to raise_exception
+
+    # With only_path option
+    expect {
+      expect(@session).to have_current_path(nil, only_path: true)
+    }.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
 
@@ -57,12 +120,33 @@ Capybara::SpecHelper.spec '#has_no_current_path?' do
     expect(@session).to have_no_current_path(/monkey/)
   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')
+  it "should wait for current_path to disappear", requires: [:js] do
+    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
     expect(@session).to have_no_current_path('/with_html')
   end
+
+  it "should not raise an exception if the current_url is nil" do
+    allow_any_instance_of(Capybara::Session).to receive(:current_url) { nil }
+
+    # Without only_path option
+    expect {
+      expect(@session).not_to have_current_path('/with_js')
+    }. not_to raise_exception
+
+    # With only_path option
+    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