capybara 2.9.2 → 2.10.0

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

@@ -7,15 +7,15 @@ Capybara::SpecHelper.spec '#has_link?' do
   it "should be true if the given link is on the page" do
     expect(@session).to have_link('foo')
     expect(@session).to have_link('awesome title')
-    expect(@session).to have_link('A link', :href => '/with_simple_html')
-    expect(@session).to have_link(:'A link', :href => :'/with_simple_html')
-    expect(@session).to have_link('A link', :href => /\/with_simple_html/)
+    expect(@session).to have_link('A link', href: '/with_simple_html')
+    expect(@session).to have_link(:'A link', href: :'/with_simple_html')
+    expect(@session).to have_link('A link', href: /\/with_simple_html/)
   end
 
   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: '/non-existant-href')
+    expect(@session).not_to have_link('A link', href: /non-existant/)
   end
 end
 
@@ -27,12 +27,12 @@ Capybara::SpecHelper.spec '#has_no_link?' do
   it "should be false if the given link is on the page" do
     expect(@session).not_to have_no_link('foo')
     expect(@session).not_to have_no_link('awesome title')
-    expect(@session).not_to have_no_link('A link', :href => '/with_simple_html')
+    expect(@session).not_to have_no_link('A link', href: '/with_simple_html')
   end
 
   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: '/non-existant-href')
+    expect(@session).to have_no_link('A link', href: /\/non-existant-href/)
   end
 end

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

@@ -15,92 +15,92 @@ 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 => [
+      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('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')
+      expect(@session).to have_select('Icecream', visible: false, selected: 'Chocolate')
+      expect(@session).to have_select('Sorbet', selected: 'Vanilla')
     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'])
+      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'])
+      expect(@session).to have_select("Icecream", visible: false, with_options: ['Vanilla', 'Strawberry'])
     end
   end
 
@@ -121,6 +121,10 @@ Capybara::SpecHelper.spec '#has_select?' do
     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'] )
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_select?' do
@@ -138,48 +142,48 @@ 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 => [
+      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('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
@@ -187,28 +191,33 @@ Capybara::SpecHelper.spec '#has_no_select?' do
 
   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'] )
+  end
 end

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

@@ -31,41 +31,41 @@ Capybara::SpecHelper.spec '#has_selector?' do
 
   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
@@ -107,32 +107,32 @@ Capybara::SpecHelper.spec '#has_no_selector?' do
 
   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_text_spec.rb

@@ -112,7 +112,7 @@ Capybara::SpecHelper.spec '#has_text?' do
     expect(@session).to have_text(nil)
   end
 
-  it "should wait for text to appear", :requires => [:js] do
+  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")
@@ -192,12 +192,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
@@ -301,17 +301,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

@@ -13,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
@@ -37,7 +37,7 @@ 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
+  it "should wait for title to disappear", requires: [:js] do
     @session.click_link("Change title")
     expect(@session).to have_no_title('with_js')
   end

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

@@ -28,7 +28,7 @@ Capybara::SpecHelper.spec '#has_xpath?' 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_xpath("//input[@type='submit' and @value='New Here']")
@@ -36,29 +36,29 @@ Capybara::SpecHelper.spec '#has_xpath?' do
 
   context "with count" do
     it "should be true if the content occurs the given number of times" do
-      expect(@session).to have_xpath("//p", :count => 3)
-      expect(@session).to have_xpath("//p//a[@id='foo']", :count => 1)
-      expect(@session).to have_xpath("//p[contains(.,'est')]", :count => 1)
-      expect(@session).to have_xpath("//p//a[@id='doesnotexist']", :count => 0)
+      expect(@session).to have_xpath("//p", count: 3)
+      expect(@session).to have_xpath("//p//a[@id='foo']", count: 1)
+      expect(@session).to have_xpath("//p[contains(.,'est')]", count: 1)
+      expect(@session).to have_xpath("//p//a[@id='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_xpath("//p", :count => 6)
-      expect(@session).not_to have_xpath("//p//a[@id='foo']", :count => 2)
-      expect(@session).not_to have_xpath("//p[contains(.,'est')]", :count => 5)
-      expect(@session).not_to have_xpath("//p//a[@id='doesnotexist']", :count => 1)
+      expect(@session).not_to have_xpath("//p", count: 6)
+      expect(@session).not_to have_xpath("//p//a[@id='foo']", count: 2)
+      expect(@session).not_to have_xpath("//p[contains(.,'est')]", count: 5)
+      expect(@session).not_to have_xpath("//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_xpath("//p//a", :text => "Redirect", :count => 1)
-      expect(@session).not_to have_xpath("//p", :text => "Doesnotexist")
+      expect(@session).to have_xpath("//p//a", text: "Redirect", count: 1)
+      expect(@session).not_to have_xpath("//p", text: "Doesnotexist")
     end
 
     it "should discard all matches where the given regexp is not matched" do
-      expect(@session).to have_xpath("//p//a", :text => /re[dab]i/i, :count => 1)
-      expect(@session).not_to have_xpath("//p//a", :text => /Red$/)
+      expect(@session).to have_xpath("//p//a", text: /re[dab]i/i, count: 1)
+      expect(@session).not_to have_xpath("//p//a", text: /Red$/)
     end
   end
 end
@@ -92,7 +92,7 @@ Capybara::SpecHelper.spec '#has_no_xpath?' 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_xpath("//p[@id='change']")
@@ -100,29 +100,29 @@ Capybara::SpecHelper.spec '#has_no_xpath?' do
 
   context "with count" do
     it "should be false if the content occurs the given number of times" do
-      expect(@session).not_to have_no_xpath("//p", :count => 3)
-      expect(@session).not_to have_no_xpath("//p//a[@id='foo']", :count => 1)
-      expect(@session).not_to have_no_xpath("//p[contains(.,'est')]", :count => 1)
-      expect(@session).not_to have_no_xpath("//p//a[@id='doesnotexist']", :count => 0)
+      expect(@session).not_to have_no_xpath("//p", count: 3)
+      expect(@session).not_to have_no_xpath("//p//a[@id='foo']", count: 1)
+      expect(@session).not_to have_no_xpath("//p[contains(.,'est')]", count: 1)
+      expect(@session).not_to have_no_xpath("//p//a[@id='doesnotexist']", count: 0)
     end
 
     it "should be true if the content occurs a different number of times than the given" do
-      expect(@session).to have_no_xpath("//p", :count => 6)
-      expect(@session).to have_no_xpath("//p//a[@id='foo']", :count => 2)
-      expect(@session).to have_no_xpath("//p[contains(.,'est')]", :count => 5)
-      expect(@session).to have_no_xpath("//p//a[@id='doesnotexist']", :count => 1)
+      expect(@session).to have_no_xpath("//p", count: 6)
+      expect(@session).to have_no_xpath("//p//a[@id='foo']", count: 2)
+      expect(@session).to have_no_xpath("//p[contains(.,'est')]", count: 5)
+      expect(@session).to have_no_xpath("//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_xpath("//p//a", :text => "Redirect", :count => 1)
-      expect(@session).to have_no_xpath("//p", :text => "Doesnotexist")
+      expect(@session).not_to have_no_xpath("//p//a", text: "Redirect", count: 1)
+      expect(@session).to have_no_xpath("//p", text: "Doesnotexist")
     end
 
     it "should discard all matches where the given regexp is matched" do
-      expect(@session).not_to have_no_xpath("//p//a", :text => /re[dab]i/i, :count => 1)
-      expect(@session).to have_no_xpath("//p//a", :text => /Red$/)
+      expect(@session).not_to have_no_xpath("//p//a", text: /re[dab]i/i, count: 1)
+      expect(@session).to have_no_xpath("//p//a", text: /Red$/)
     end
   end
 end