capybara 2.14.0 → 2.14.1

data/lib/capybara/session/matchers.rb

@@ -22,6 +22,7 @@ module Capybara
 
     ##
     # Asserts that the page doesn't have the given path.
+    # By default this will compare against the path+query portion of the full url
     #
     # @macro current_path_query_params
     # @raise [Capybara::ExpectationNotMet] if the assertion hasn't succeeded during wait time
@@ -33,6 +34,7 @@ module Capybara
 
     ##
     # Checks if the page has the given path.
+    # By default this will compare against the path+query portion of the full url
     #
     # @macro current_path_query_params
     # @return [Boolean]
@@ -45,6 +47,7 @@ module Capybara
 
     ##
     # Checks if the page doesn't have the given path.
+    # By default this will compare against the path+query portion of the full url
     #
     # @macro current_path_query_params
     # @return [Boolean]

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

@@ -63,7 +63,7 @@ Capybara::SpecHelper.spec '#accept_alert', requires: [:modals] do
     end
 
     it "should allow to adjust the delay" do
-      @session.accept_alert wait: 4 do
+      @session.accept_alert wait: 10 do
         @session.click_link('Open slow alert')
       end
       expect(@session).to have_xpath("//a[@id='open-slow-alert' and @opened='true']")

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

@@ -16,7 +16,8 @@ Capybara::SpecHelper.spec "#all" do
 
   it "should accept an XPath instance" do
     @session.visit('/form')
-    @xpath = XPath::HTML.fillable_field('Name')
+    @xpath = Capybara::Selector.all[:fillable_field].call('Name')
+    expect(@xpath).to be_a(::XPath::Union)
     @result = @session.all(@xpath).map { |r| r.value }
     expect(@result).to include('Smith', 'John', 'John Smith')
   end

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

@@ -65,7 +65,7 @@ Capybara::SpecHelper.spec '#assert_selector' do
       Capybara.using_wait_time(0.1) do
         @session.visit('/with_js')
         @session.click_link('Click me')
-        @session.assert_selector(:css, "a#has-been-clicked", text: "Has been clicked", wait: 0.9)
+        @session.assert_selector(:css, "a#has-been-clicked", text: "Has been clicked", wait: 2)
       end
     end
   end

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

@@ -4,16 +4,23 @@ Capybara::SpecHelper.spec '#assert_title' do
     @session.visit('/with_js')
   end
 
-  it "should be true if the page's title contains the given string" do
-    expect(@session.assert_title('js')).to eq(true)
+  it "should not raise if the page's title contains the given string" do
+    expect do
+      @session.assert_title('js')
+    end.not_to raise_error
   end
 
-  it "should be true when given an empty string" do
-    expect(@session.assert_title('')).to eq(true)
+  it "should not raise when given an empty string" do
+    expect do
+      @session.assert_title('')
+    end.not_to raise_error
   end
 
   it "should allow regexp matches" do
-    expect(@session.assert_title(/w[a-z]{3}_js/)).to eq(true)
+    expect do
+      @session.assert_title(/w[a-z]{3}_js/)
+    end.not_to raise_error
+
     expect do
       @session.assert_title(/w[a-z]{10}_js/)
     end.to raise_error(Capybara::ExpectationNotMet, 'expected "with_js" to match /w[a-z]{10}_js/')
@@ -21,7 +28,9 @@ Capybara::SpecHelper.spec '#assert_title' do
 
   it "should wait for title", requires: [:js] do
     @session.click_link("Change title")
-    expect(@session.assert_title("changed title")).to eq(true)
+    expect do
+      @session.assert_title("changed title", wait: 3)
+    end.not_to raise_error
   end
 
   it "should raise error if the title doesn't contain the given string" do
@@ -61,10 +70,14 @@ Capybara::SpecHelper.spec '#assert_no_title' do
 
   it "should wait for title to disappear", requires: [:js] do
     @session.click_link("Change title")
-    expect(@session.assert_no_title('with_js')).to eq(true)
+    expect do
+      @session.assert_no_title('with_js', wait: 3)
+    end.not_to raise_error
   end
 
-  it "should be true if the title doesn't contain the given string" do
-    expect(@session.assert_no_title('monkey')).to eq(true)
+  it "should not raise if the title doesn't contain the given string" do
+    expect do
+      @session.assert_no_title('monkey')
+    end.not_to raise_error
   end
 end

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

@@ -10,14 +10,14 @@ Capybara::SpecHelper.spec '#dismiss_confirm', requires: [:modals] do
     end
     expect(@session).to have_xpath("//a[@id='open-confirm' and @confirmed='false']")
   end
-  
+
   it "should dismiss the confirm if the message matches" do
     @session.dismiss_confirm 'Confirm opened' do
       @session.click_link('Open confirm')
     end
     expect(@session).to have_xpath("//a[@id='open-confirm' and @confirmed='false']")
   end
-  
+
   it "should not dismiss the confirm if the message doesn't match" do
     expect do
       @session.dismiss_confirm 'Incorrect Text' do
@@ -25,7 +25,7 @@ Capybara::SpecHelper.spec '#dismiss_confirm', requires: [:modals] do
       end
     end.to raise_error(Capybara::ModalNotFound)
   end
-    
+
 
   it "should return the message presented" do
     message = @session.dismiss_confirm do

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

@@ -10,7 +10,7 @@ Capybara::SpecHelper.spec '#dismiss_prompt', requires: [:modals] do
     end
     expect(@session).to have_xpath("//a[@id='open-prompt' and @response='dismissed']")
   end
-  
+
   it "should return the message presented" do
     message = @session.dismiss_prompt do
       @session.click_link('Open prompt')

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

@@ -54,7 +54,7 @@ Capybara::SpecHelper.spec '#find' do
     it "should find element if it appears before given wait duration" do
       @session.visit('/with_js')
       @session.click_link('Click me')
-      expect(@session.find(:css, "a#has-been-clicked", wait: 0.9).text).to include('Has been clicked')
+      expect(@session.find(:css, "a#has-been-clicked", wait: 2.0).text).to include('Has been clicked')
     end
   end
 
@@ -210,7 +210,8 @@ Capybara::SpecHelper.spec '#find' do
 
   it "should accept an XPath instance" do
     @session.visit('/form')
-    @xpath = XPath::HTML.fillable_field('First Name')
+    @xpath = Capybara::Selector.all[:fillable_field].call('First Name')
+    expect(@xpath).to be_a(::XPath::Union)
     expect(@session.find(@xpath).value).to eq('John')
   end
 

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

@@ -15,7 +15,8 @@ Capybara::SpecHelper.spec '#first' do
 
   it "should accept an XPath instance" do
     @session.visit('/form')
-    @xpath = XPath::HTML.fillable_field('First Name')
+    @xpath = Capybara::Selector.all[:fillable_field].call('First Name')
+    expect(@xpath).to be_a(::XPath::Union)
     expect(@session.first(@xpath).value).to eq('John')
   end
 
@@ -110,14 +111,18 @@ Capybara::SpecHelper.spec '#first' do
 
     it "should wait for at least one match if true" do
       Capybara.wait_on_first_by_default = true
-      @session.click_link('clickable')
-      expect(@session.first(:css, 'a#has-been-clicked')).not_to be_nil
+      Capybara.using_wait_time(3) do
+        @session.click_link('clickable')
+        expect(@session.first(:css, 'a#has-been-clicked')).not_to be_nil
+      end
     end
 
     it "should return nil after waiting if no match" do
       Capybara.wait_on_first_by_default = true
-      @session.click_link('clickable')
-      expect(@session.first(:css, 'a#not-a-real-link')).to be_nil
+      Capybara.using_wait_time(3) do
+        @session.click_link('clickable')
+        expect(@session.first(:css, 'a#not-a-real-link')).to be_nil
+      end
     end
   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

@@ -25,7 +25,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
@@ -83,8 +83,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

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

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

@@ -428,11 +428,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
 
@@ -440,7 +444,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
 
@@ -448,7 +452,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
 
@@ -456,7 +460,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')

data/lib/capybara/spec/session/window/become_closed_spec.rb

@@ -21,7 +21,7 @@ Capybara::SpecHelper.spec '#become_closed', requires: [:windows, :js] do
         @session.execute_script('setTimeout(function(){ window.close(); }, 500);')
       end
       Capybara.using_wait_time 0.1 do
-        expect(@other_window).to become_closed(wait: 2)
+        expect(@other_window).to become_closed(wait: 5)
       end
     end
 
@@ -42,7 +42,7 @@ Capybara::SpecHelper.spec '#become_closed', requires: [:windows, :js] do
       @session.within_window @other_window do
         @session.execute_script('setTimeout(function(){ window.close(); }, 500);')
       end
-      Capybara.using_wait_time 1.5 do
+      Capybara.using_wait_time 5 do
         expect(@other_window).to become_closed
       end
     end
@@ -75,10 +75,10 @@ Capybara::SpecHelper.spec '#become_closed', requires: [:windows, :js] do
       @session.within_window @other_window do
         @session.execute_script('setTimeout(function(){ window.close(); }, 700);')
       end
-      Capybara.using_wait_time 1.1 do
+      Capybara.using_wait_time 3.1 do
         expect do
           expect(@other_window).not_to become_closed
-        end.to raise_error(RSpec::Expectations::ExpectationNotMetError, /\Aexpected #<Window @handle=".+"> not to become closed after 1.1 seconds\Z/)
+        end.to raise_error(RSpec::Expectations::ExpectationNotMetError, /\Aexpected #<Window @handle=".+"> not to become closed after 3.1 seconds\Z/)
       end
     end
   end