capybara 2.5.0 → 2.18.0

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#has_select?' do
   before { @session.visit('/form') }
 
@@ -14,80 +15,147 @@ Capybara::SpecHelper.spec '#has_select?' do
 
   context 'with selected value' do
     it "should be true if a field with the given value is on the page" do
-      expect(@session).to have_select('form_locale', :selected => 'English')
-      expect(@session).to have_select('Region', :selected => 'Norway')
-      expect(@session).to have_select('Underwear', :selected => [
+      expect(@session).to have_select('form_locale', selected: 'English')
+      expect(@session).to have_select('Region', selected: 'Norway')
+      expect(@session).to have_select('Underwear', selected: [
         'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
     end
 
     it "should be false if the given field is not on the page" do
-      expect(@session).not_to have_select('Locale', :selected => 'Swedish')
-      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'
+      expect(@session).not_to have_select('Locale', selected: 'Swedish')
+      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', 'Nonexistent'
       ])
-      expect(@session).not_to have_select('Underwear', :selected => [
+      expect(@session).not_to have_select('Underwear', selected: [
         'Boxerbriefs', 'Briefs', 'Boxers', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
-      expect(@session).not_to have_select('Underwear', :selected => [
+      expect(@session).not_to have_select('Underwear', selected: [
         'Boxerbriefs', 'Briefs','Commando', "Frenchman's Pantalons"
       ])
     end
 
     it "should be true after the given value is selected" do
-      @session.select('Swedish', :from => 'Locale')
-      expect(@session).to have_select('Locale', :selected => 'Swedish')
+      @session.select('Swedish', from: 'Locale')
+      expect(@session).to have_select('Locale', selected: 'Swedish')
     end
 
     it "should be false after a different value is selected" do
-      @session.select('Swedish', :from => 'Locale')
-      expect(@session).not_to have_select('Locale', :selected => 'English')
+      @session.select('Swedish', from: 'Locale')
+      expect(@session).not_to have_select('Locale', selected: 'English')
     end
 
     it "should be true after the given values are selected" do
-      @session.select('Boxers', :from => 'Underwear')
-      expect(@session).to have_select('Underwear', :selected => [
+      @session.select('Boxers', from: 'Underwear')
+      expect(@session).to have_select('Underwear', selected: [
         'Boxerbriefs', 'Briefs', 'Boxers', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
     end
 
     it "should be false after one of the values is unselected" do
-      @session.unselect('Briefs', :from => 'Underwear')
-      expect(@session).not_to have_select('Underwear', :selected => [
+      @session.unselect('Briefs', from: 'Underwear')
+      expect(@session).not_to have_select('Underwear', selected: [
         'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
     end
+
+    it "should be true even when the selected option invisible, regardless of the select's visibility" do
+      expect(@session).to have_select('Icecream', visible: false, selected: 'Chocolate')
+      expect(@session).to have_select('Sorbet', selected: 'Vanilla')
+    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'])
-      expect(@session).to have_select('Tendency', :options => [])
+      expect(@session).to have_select('Region', options: ['Norway', 'Sweden', 'Finland'])
+      expect(@session).to have_select('Tendency', options: [])
     end
 
     it "should be false if the given field is not on the page" do
-      expect(@session).not_to have_select('Locale', :options => ['Swedish'])
-      expect(@session).not_to have_select('Does not exist', :options => ['John'])
-      expect(@session).not_to have_select('City', :options => ['London', 'Made up city'])
-      expect(@session).not_to have_select('Region', :options => ['Norway', 'Sweden'])
-      expect(@session).not_to have_select('Region', :options => ['Norway', 'Norway', 'Norway'])
+      expect(@session).not_to have_select('Locale', options: ['Swedish'])
+      expect(@session).not_to have_select('Does not exist', options: ['John'])
+      expect(@session).not_to have_select('City', options: ['London', 'Made up city'])
+      expect(@session).not_to have_select('Region', options: ['Norway', 'Sweden'])
+      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
+      expect(@session).to have_select("Icecream", visible: false, options: ['Chocolate', 'Vanilla', 'Strawberry'])
     end
   end
 
   context 'with partial options' do
     it "should be true if a field with the given partial options is on the page" do
-      expect(@session).to have_select('Region', :with_options => ['Norway', 'Sweden'])
-      expect(@session).to have_select('City', :with_options => ['London'])
+      expect(@session).to have_select('Region', with_options: ['Norway', 'Sweden'])
+      expect(@session).to have_select('City', with_options: ['London'])
     end
 
     it "should be false if a field with the given partial options is not on the page" do
-      expect(@session).not_to have_select('Locale', :with_options => ['Uruguayan'])
-      expect(@session).not_to have_select('Does not exist', :with_options => ['John'])
-      expect(@session).not_to have_select('Region', :with_options => ['Norway', 'Sweden', 'Finland', 'Latvia'])
+      expect(@session).not_to have_select('Locale', with_options: ['Uruguayan'])
+      expect(@session).not_to have_select('Does not exist', with_options: ['John'])
+      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
+      expect(@session).to have_select("Icecream", visible: false, with_options: ['Vanilla', 'Strawberry'])
     end
   end
+
+  context 'with multiple option' do
+    it "should find multiple selects if true" do
+      expect(@session).to have_select('form_languages', multiple: true)
+      expect(@session).not_to have_select('form_other_title', multiple: true)
+    end
+
+    it "should not find multiple selects if false" do
+      expect(@session).not_to have_select('form_languages', multiple: false)
+      expect(@session).to have_select('form_other_title', multiple: false)
+    end
+
+    it "should find both if not specified" do
+      expect(@session).to have_select('form_languages')
+      expect(@session).to have_select('form_other_title')
+    end
+  end
+
+  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.has_select?(with_selected: ['Commando', 'Boxerbriefs'])).to eq true
+    expect(@session).to have_select(with_selected: ['Briefs'])
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_select?' do
@@ -105,77 +173,109 @@ Capybara::SpecHelper.spec '#has_no_select?' do
 
   context 'with selected value' do
     it "should be false if a field with the given value is on the page" do
-      expect(@session).not_to have_no_select('form_locale', :selected => 'English')
-      expect(@session).not_to have_no_select('Region', :selected => 'Norway')
-      expect(@session).not_to have_no_select('Underwear', :selected => [
+      expect(@session).not_to have_no_select('form_locale', selected: 'English')
+      expect(@session).not_to have_no_select('Region', selected: 'Norway')
+      expect(@session).not_to have_no_select('Underwear', selected: [
         'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
     end
 
     it "should be true if the given field is not on the page" do
-      expect(@session).to have_no_select('Locale', :selected => 'Swedish')
-      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'
+      expect(@session).to have_no_select('Locale', selected: 'Swedish')
+      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', 'Nonexistent'
       ])
-      expect(@session).to have_no_select('Underwear', :selected => [
+      expect(@session).to have_no_select('Underwear', selected: [
         'Boxerbriefs', 'Briefs', 'Boxers', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
-      expect(@session).to have_no_select('Underwear', :selected => [
+      expect(@session).to have_no_select('Underwear', selected: [
         'Boxerbriefs', 'Briefs','Commando', "Frenchman's Pantalons"
       ])
     end
 
     it "should be false after the given value is selected" do
-      @session.select('Swedish', :from => 'Locale')
-      expect(@session).not_to have_no_select('Locale', :selected => 'Swedish')
+      @session.select('Swedish', from: 'Locale')
+      expect(@session).not_to have_no_select('Locale', selected: 'Swedish')
     end
 
     it "should be true after a different value is selected" do
-      @session.select('Swedish', :from => 'Locale')
-      expect(@session).to have_no_select('Locale', :selected => 'English')
+      @session.select('Swedish', from: 'Locale')
+      expect(@session).to have_no_select('Locale', selected: 'English')
     end
 
     it "should be false after the given values are selected" do
-      @session.select('Boxers', :from => 'Underwear')
-      expect(@session).not_to have_no_select('Underwear', :selected => [
+      @session.select('Boxers', from: 'Underwear')
+      expect(@session).not_to have_no_select('Underwear', selected: [
         'Boxerbriefs', 'Briefs', 'Boxers', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
     end
 
     it "should be true after one of the values is unselected" do
-      @session.unselect('Briefs', :from => 'Underwear')
-      expect(@session).to have_no_select('Underwear', :selected => [
+      @session.unselect('Briefs', from: 'Underwear')
+      expect(@session).to have_no_select('Underwear', selected: [
         'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
     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'])
+      expect(@session).not_to have_no_select('Region', options: ['Norway', 'Sweden', 'Finland'])
     end
 
     it "should be true if the given field is not on the page" do
-      expect(@session).to have_no_select('Locale', :options => ['Swedish'])
-      expect(@session).to have_no_select('Does not exist', :options => ['John'])
-      expect(@session).to have_no_select('City', :options => ['London', 'Made up city'])
-      expect(@session).to have_no_select('Region', :options => ['Norway', 'Sweden'])
-      expect(@session).to have_no_select('Region', :options => ['Norway', 'Norway', 'Norway'])
+      expect(@session).to have_no_select('Locale', options: ['Swedish'])
+      expect(@session).to have_no_select('Does not exist', options: ['John'])
+      expect(@session).to have_no_select('City', options: ['London', 'Made up city'])
+      expect(@session).to have_no_select('Region', options: ['Norway', 'Sweden'])
+      expect(@session).to have_no_select('Region', options: ['Norway', 'Norway', 'Norway'])
     end
   end
 
   context 'with partial options' do
     it "should be false if a field with the given partial options is on the page" do
-      expect(@session).not_to have_no_select('Region', :with_options => ['Norway', 'Sweden'])
-      expect(@session).not_to have_no_select('City', :with_options => ['London'])
+      expect(@session).not_to have_no_select('Region', with_options: ['Norway', 'Sweden'])
+      expect(@session).not_to have_no_select('City', with_options: ['London'])
     end
 
     it "should be true if a field with the given partial options is not on the page" do
-      expect(@session).to have_no_select('Locale', :with_options => ['Uruguayan'])
-      expect(@session).to have_no_select('Does not exist', :with_options => ['John'])
-      expect(@session).to have_no_select('Region', :with_options => ['Norway', 'Sweden', 'Finland', 'Latvia'])
+      expect(@session).to have_no_select('Locale', with_options: ['Uruguayan'])
+      expect(@session).to have_no_select('Does not exist', with_options: ['John'])
+      expect(@session).to have_no_select('Region', with_options: ['Norway', 'Sweden', 'Finland', 'Latvia'])
     end
   end
+
+  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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#has_selector?' do
   before do
     @session.visit('/with_html')
@@ -28,43 +29,73 @@ Capybara::SpecHelper.spec '#has_selector?' do
     end
   end
 
+  it "should accept a filter block" do
+    expect(@session).to have_selector(:css, "a", count: 1) { |el| el[:id] == "foo" }
+  end
+
   context "with count" do
     it "should be true if the content is on the page the given number of times" do
-      expect(@session).to have_selector("//p", :count => 3)
-      expect(@session).to have_selector("//p//a[@id='foo']", :count => 1)
-      expect(@session).to have_selector("//p[contains(.,'est')]", :count => 1)
+      expect(@session).to have_selector("//p", count: 3)
+      expect(@session).to have_selector("//p//a[@id='foo']", count: 1)
+      expect(@session).to have_selector("//p[contains(.,'est')]", count: 1)
     end
 
     it "should be false if the content is on the page the given number of times" do
-      expect(@session).not_to have_selector("//p", :count => 6)
-      expect(@session).not_to have_selector("//p//a[@id='foo']", :count => 2)
-      expect(@session).not_to have_selector("//p[contains(.,'est')]", :count => 5)
+      expect(@session).not_to have_selector("//p", count: 6)
+      expect(@session).not_to have_selector("//p//a[@id='foo']", count: 2)
+      expect(@session).not_to have_selector("//p[contains(.,'est')]", count: 5)
     end
 
     it "should be false if the content isn't on the page at all" do
-      expect(@session).not_to have_selector("//abbr", :count => 2)
-      expect(@session).not_to have_selector("//p//a[@id='doesnotexist']", :count => 1)
+      expect(@session).not_to have_selector("//abbr", count: 2)
+      expect(@session).not_to have_selector("//p//a[@id='doesnotexist']", count: 1)
     end
   end
 
   context "with text" do
     it "should discard all matches where the given string is not contained" do
-      expect(@session).to have_selector("//p//a", :text => "Redirect", :count => 1)
-      expect(@session).not_to have_selector("//p", :text => "Doesnotexist")
+      expect(@session).to have_selector("//p//a", text: "Redirect", count: 1)
+      expect(@session).not_to have_selector("//p", text: "Doesnotexist")
     end
 
     it "should respect visibility setting" do
-      expect(@session).to have_selector(:id, "hidden-text", :text => "Some of this text is hidden!", :visible => false)
-      expect(@session).not_to have_selector(:id, "hidden-text", :text => "Some of this text is hidden!", :visible => true)
+      expect(@session).to have_selector(:id, "hidden-text", text: "Some of this text is hidden!", visible: false)
+      expect(@session).not_to have_selector(:id, "hidden-text", text: "Some of this text is hidden!", visible: true)
       Capybara.ignore_hidden_elements = false
-      expect(@session).to have_selector(:id, "hidden-text", :text => "Some of this text is hidden!", :visible => false)
+      expect(@session).to have_selector(:id, "hidden-text", text: "Some of this text is hidden!", visible: false)
       Capybara.visible_text_only = true
-      expect(@session).not_to have_selector(:id, "hidden-text", :text => "Some of this text is hidden!", :visible => true)
+      expect(@session).not_to have_selector(:id, "hidden-text", text: "Some of this text is hidden!", visible: true)
     end
 
     it "should discard all matches where the given regexp is not matched" do
-      expect(@session).to have_selector("//p//a", :text => /re[dab]i/i, :count => 1)
-      expect(@session).not_to have_selector("//p//a", :text => /Red$/)
+      expect(@session).to have_selector("//p//a", text: /re[dab]i/i, count: 1)
+      expect(@session).not_to have_selector("//p//a", text: /Red$/)
+    end
+
+    it "should warn when extra parameters passed" do
+      expect_any_instance_of(Kernel).to receive(:warn).with(/extra/)
+      expect(@session).to have_selector(:css, "p a#foo", 'extra')
+    end
+  end
+
+  context "with exact_text" do
+    context "string" do
+      it "should only match elements that match exactly" do
+        expect(@session).to have_selector(:id, "h2one", exact_text: "Header Class Test One")
+        expect(@session).to have_no_selector(:id, "h2one", exact_text: "Header Class Test")
+      end
+    end
+
+    context "boolean" do
+      it "should only match elements that match exactly when true" do
+        expect(@session).to have_selector(:id, "h2one", text: "Header Class Test One", exact_text: true)
+        expect(@session).to have_no_selector(:id, "h2one", text: "Header Class Test", exact_text: true)
+      end
+
+      it "should match substrings when false" do
+        expect(@session).to have_selector(:id, "h2one", text: "Header Class Test One", exact_text: false)
+        expect(@session).to have_selector(:id, "h2one", text: "Header Class Test", exact_text: false)
+      end
     end
   end
 end
@@ -99,34 +130,39 @@ Capybara::SpecHelper.spec '#has_no_selector?' do
     end
   end
 
+  it "should accept a filter block" do
+    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
+
   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_selector("//p", :count => 3)
-      expect(@session).not_to have_no_selector("//p//a[@id='foo']", :count => 1)
-      expect(@session).not_to have_no_selector("//p[contains(.,'est')]", :count => 1)
+      expect(@session).not_to have_no_selector("//p", count: 3)
+      expect(@session).not_to have_no_selector("//p//a[@id='foo']", count: 1)
+      expect(@session).not_to have_no_selector("//p[contains(.,'est')]", count: 1)
     end
 
     it "should be true if the content is on the page the wrong number of times" do
-      expect(@session).to have_no_selector("//p", :count => 6)
-      expect(@session).to have_no_selector("//p//a[@id='foo']", :count => 2)
-      expect(@session).to have_no_selector("//p[contains(.,'est')]", :count => 5)
+      expect(@session).to have_no_selector("//p", count: 6)
+      expect(@session).to have_no_selector("//p//a[@id='foo']", count: 2)
+      expect(@session).to have_no_selector("//p[contains(.,'est')]", count: 5)
     end
 
     it "should be true if the content isn't on the page at all" do
-      expect(@session).to have_no_selector("//abbr", :count => 2)
-      expect(@session).to have_no_selector("//p//a[@id='doesnotexist']", :count => 1)
+      expect(@session).to have_no_selector("//abbr", count: 2)
+      expect(@session).to have_no_selector("//p//a[@id='doesnotexist']", count: 1)
     end
   end
 
   context "with text" do
     it "should discard all matches where the given string is contained" do
-      expect(@session).not_to have_no_selector("//p//a", :text => "Redirect", :count => 1)
-      expect(@session).to have_no_selector("//p", :text => "Doesnotexist")
+      expect(@session).not_to have_no_selector("//p//a", text: "Redirect", count: 1)
+      expect(@session).to have_no_selector("//p", text: "Doesnotexist")
     end
 
     it "should discard all matches where the given regexp is matched" do
-      expect(@session).not_to have_no_selector("//p//a", :text => /re[dab]i/i, :count => 1)
-      expect(@session).to have_no_selector("//p//a", :text => /Red$/)
+      expect(@session).not_to have_no_selector("//p//a", text: /re[dab]i/i, count: 1)
+      expect(@session).to have_no_selector("//p//a", text: /Red$/)
     end
   end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#has_table?' do
   before do
     @session.visit('/tables')

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#has_text?' do
   it "should be true if the given text is on the page at least once" do
     @session.visit('/with_html')
@@ -79,7 +80,7 @@ Capybara::SpecHelper.spec '#has_text?' do
     expect(@session).to have_text(:all, 'Some of this text is hidden!')
   end
 
-  it "should be true if `Capybara.ignore_hidden_elements = true` and text is invisible." do
+  it "should be true if `Capybara.ignore_hidden_elements = false` and text is invisible." do
     Capybara.ignore_hidden_elements = false
     @session.visit('/with_html')
     expect(@session).to have_text('Some of this text is hidden!')
@@ -95,6 +96,18 @@ Capybara::SpecHelper.spec '#has_text?' do
     expect(@session).not_to have_text(/xxxxyzzz/)
   end
 
+  context "with exact: true option" do
+    it "should be true if text matches exactly" do
+      @session.visit('/with_html')
+      expect(@session.find(:id, "h2one")).to have_text("Header Class Test One", exact: true)
+    end
+
+    it "should be false if text doesn't match exactly" do
+      @session.visit('/with_html')
+      expect(@session.find(:id, "h2one")).not_to have_text("Header Class Test On", exact: true)
+    end
+  end
+
   it "should escape any characters that would have special meaning in a regexp" do
     @session.visit('/with_html')
     expect(@session).not_to have_text('.orem')
@@ -111,10 +124,12 @@ Capybara::SpecHelper.spec '#has_text?' do
     expect(@session).to have_text(nil)
   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")
+  it "should wait for text to appear", requires: [:js] do
+    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
@@ -191,12 +206,12 @@ Capybara::SpecHelper.spec '#has_text?' do
     end
   end
 
-  context "with wait", :requires => [:js] do
+  context "with wait", requires: [:js] do
     it "should find element if it appears 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_text('Has been clicked', :wait => 0.9)
+        expect(@session).to have_text('Has been clicked', wait: 0.9)
       end
     end
   end
@@ -204,7 +219,7 @@ Capybara::SpecHelper.spec '#has_text?' do
   it "should raise an error if an invalid option is passed" do
     @session.visit('/with_html')
     expect do
-      expect(@session).to have_text('Lorem', exact: true)
+      expect(@session).to have_text('Lorem', invalid: true)
     end.to raise_error(ArgumentError)
   end
 end
@@ -279,7 +294,7 @@ Capybara::SpecHelper.spec '#has_no_text?' do
     expect(@session).not_to have_no_text(:all, 'Some of this text is hidden!')
   end
 
-  it "should be false if `Capybara.ignore_hidden_elements = true` and text is invisible." do
+  it "should be false if `Capybara.ignore_hidden_elements = false` and text is invisible." do
     Capybara.ignore_hidden_elements = false
     @session.visit('/with_html')
     expect(@session).not_to have_no_text('Some of this text is hidden!')
@@ -300,17 +315,17 @@ Capybara::SpecHelper.spec '#has_no_text?' do
     expect(@session).to have_no_text('.orem')
   end
 
-  it "should wait for text to disappear", :requires => [:js] do
+  it "should wait for text to disappear", requires: [:js] do
     @session.visit('/with_js')
     @session.click_link('Click me')
     expect(@session).to have_no_text("I changed it")
   end
 
-  context "with wait", :requires => [:js] do
+  context "with wait", requires: [:js] do
     it "should not find element if it appears after given wait duration" do
       @session.visit('/with_js')
       @session.click_link('Click me')
-      expect(@session).to have_no_text('Has been clicked', :wait => 0.1)
+      expect(@session).to have_no_text('Has been clicked', wait: 0.1)
     end
   end
 end

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 Capybara::SpecHelper.spec '#has_title?' do
   before do
     @session.visit('/with_js')
@@ -12,7 +13,7 @@ Capybara::SpecHelper.spec '#has_title?' do
     expect(@session).not_to have_title(/monkey/)
   end
 
-  it "should wait for title", :requires => [:js] do
+  it "should wait for title", requires: [:js] do
     @session.click_link("Change title")
     expect(@session).to have_title("changed title")
   end
@@ -20,6 +21,21 @@ Capybara::SpecHelper.spec '#has_title?' do
   it "should be false if the page has not the given title" do
     expect(@session).not_to have_title('monkey')
   end
+
+  it "should default to exact: false matching" do
+    expect(@session).to have_title('with_js', exact: false)
+    expect(@session).to have_title('with_', exact: false)
+  end
+
+  it "should match exactly if exact: true option passed" do
+    expect(@session).to have_title('with_js', exact: true)
+    expect(@session).not_to have_title('with_', exact: true)
+  end
+
+  it "should match partial if exact: false option passed" do
+    expect(@session).to have_title('with_js', exact: false)
+    expect(@session).to have_title('with_', exact: false)
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_title?' do
@@ -36,9 +52,11 @@ Capybara::SpecHelper.spec '#has_no_title?' do
     expect(@session).to have_no_title(/monkey/)
   end
 
-  it "should wait for title to disappear", :requires => [:js] do
-    @session.click_link("Change title")
-    expect(@session).to have_no_title('with_js')
+  it "should wait for title to disappear", requires: [:js] do
+    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