capybara 2.9.2 → 2.10.0

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

@@ -43,27 +43,27 @@ Capybara::SpecHelper.spec '#first' do
 
   context "with visible filter" do
     it "should only find visible nodes when true" do
-      expect(@session.first(:css, "a#invisible", :visible => true)).to be_nil
+      expect(@session.first(:css, "a#invisible", visible: true)).to be_nil
     end
 
     it "should find nodes regardless of whether they are invisible when false" do
-      expect(@session.first(:css, "a#invisible", :visible => false)).not_to be_nil
-      expect(@session.first(:css, "a#visible", :visible => false)).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: false)).not_to be_nil
+      expect(@session.first(:css, "a#visible", visible: false)).not_to be_nil
     end
 
     it "should find nodes regardless of whether they are invisible when :all" do
-      expect(@session.first(:css, "a#invisible", :visible => :all)).not_to be_nil
-      expect(@session.first(:css, "a#visible", :visible => :all)).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :all)).not_to be_nil
+      expect(@session.first(:css, "a#visible", visible: :all)).not_to be_nil
     end
 
     it "should find only hidden nodes when :hidden" do
-      expect(@session.first(:css, "a#invisible", :visible => :hidden)).not_to be_nil
-      expect(@session.first(:css, "a#visible", :visible => :hidden)).to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :hidden)).not_to be_nil
+      expect(@session.first(:css, "a#visible", visible: :hidden)).to be_nil
     end
 
     it "should find only visible nodes when :visible" do
-      expect(@session.first(:css, "a#invisible", :visible => :visible)).to be_nil
-      expect(@session.first(:css, "a#visible", :visible => :visible)).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :visible)).to be_nil
+      expect(@session.first(:css, "a#visible", visible: :visible)).not_to be_nil
     end
 
     it "should default to Capybara.ignore_hidden_elements" do

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-Capybara::SpecHelper.spec '#go_back', :requires => [:js] do
+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,5 +1,5 @@
 # frozen_string_literal: true
-Capybara::SpecHelper.spec '#go_forward', :requires => [:js] do
+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_button_spec.rb

@@ -10,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
@@ -22,16 +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)
+  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)
+  it "should be true for enabled buttons if disabled: :all" do
+    expect(@session).to have_button('med', disabled: :all)
   end
 end
 
@@ -45,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
@@ -57,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

@@ -22,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']")
@@ -30,86 +30,86 @@ 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
 end
@@ -137,7 +137,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")
@@ -145,85 +145,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

@@ -23,7 +23,7 @@ Capybara::SpecHelper.spec '#has_current_path?' do
     expect(@session).to have_current_path("/with_html?options%5B%5D=things")
   end
 
-  it "should wait for current_path", :requires => [:js] do
+  it "should wait for current_path", requires: [:js] do
     @session.click_link("Change page")
     expect(@session).to have_current_path("/with_html")
   end
@@ -68,7 +68,7 @@ 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
+  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')
   end

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

@@ -15,50 +15,50 @@ Capybara::SpecHelper.spec '#has_field' do
 
   context 'with value' do
     it "should be true if a field with the given value is on the page" do
-      expect(@session).to have_field('First Name', :with => 'John')
-      expect(@session).to have_field('First Name', :with => /^Joh/)
-      expect(@session).to have_field('Phone', :with => '+1 555 7021')
-      expect(@session).to have_field('Street', :with => 'Sesame street 66')
-      expect(@session).to have_field('Description', :with => 'Descriptive text goes here')
+      expect(@session).to have_field('First Name', with: 'John')
+      expect(@session).to have_field('First Name', with: /^Joh/)
+      expect(@session).to have_field('Phone', with: '+1 555 7021')
+      expect(@session).to have_field('Street', with: 'Sesame street 66')
+      expect(@session).to have_field('Description', with: 'Descriptive text goes here')
     end
 
     it "should be false if the given field is not on the page" do
-      expect(@session).not_to have_field('First Name', :with => 'Peter')
-      expect(@session).not_to have_field('First Name', :with => /eter$/)
-      expect(@session).not_to have_field('Wrong Name', :with => 'John')
-      expect(@session).not_to have_field('Description', :with => 'Monkey')
+      expect(@session).not_to have_field('First Name', with: 'Peter')
+      expect(@session).not_to have_field('First Name', with: /eter$/)
+      expect(@session).not_to have_field('Wrong Name', with: 'John')
+      expect(@session).not_to have_field('Description', with: 'Monkey')
     end
 
     it "should be true after the field has been filled in with the given value" do
-      @session.fill_in('First Name', :with => 'Jonas')
-      expect(@session).to have_field('First Name', :with => 'Jonas')
-      expect(@session).to have_field('First Name', :with => /ona/)
+      @session.fill_in('First Name', with: 'Jonas')
+      expect(@session).to have_field('First Name', with: 'Jonas')
+      expect(@session).to have_field('First Name', with: /ona/)
     end
 
     it "should be false after the field has been filled in with a different value" do
-      @session.fill_in('First Name', :with => 'Jonas')
-      expect(@session).not_to have_field('First Name', :with => 'John')
-      expect(@session).not_to have_field('First Name', :with => /John|Paul|George|Ringo/)
+      @session.fill_in('First Name', with: 'Jonas')
+      expect(@session).not_to have_field('First Name', with: 'John')
+      expect(@session).not_to have_field('First Name', with: /John|Paul|George|Ringo/)
     end
   end
 
   context 'with type' do
     it "should be true if a field with the given type is on the page" do
-      expect(@session).to have_field('First Name', :type => 'text')
-      expect(@session).to have_field('Html5 Email', :type => 'email')
-      expect(@session).to have_field('Html5 Multiple Email', :type => 'email')
-      expect(@session).to have_field('Html5 Tel', :type => 'tel')
-      expect(@session).to have_field('Description', :type => 'textarea')
-      expect(@session).to have_field('Languages', :type => 'select')
+      expect(@session).to have_field('First Name', type: 'text')
+      expect(@session).to have_field('Html5 Email', type: 'email')
+      expect(@session).to have_field('Html5 Multiple Email', type: 'email')
+      expect(@session).to have_field('Html5 Tel', type: 'tel')
+      expect(@session).to have_field('Description', type: 'textarea')
+      expect(@session).to have_field('Languages', type: 'select')
     end
 
     it "should be false if the given field is not on the page" do
-      expect(@session).not_to have_field('First Name', :type => 'textarea')
-      expect(@session).not_to have_field('Html5 Email', :type => 'tel')
-      expect(@session).not_to have_field('Html5 Multiple Email', :type => 'tel')
-      expect(@session).not_to have_field('Description', :type => '')
-      expect(@session).not_to have_field('Description', :type => 'email')
-      expect(@session).not_to have_field('Languages', :type => 'textarea')
+      expect(@session).not_to have_field('First Name', type: 'textarea')
+      expect(@session).not_to have_field('Html5 Email', type: 'tel')
+      expect(@session).not_to have_field('Html5 Multiple Email', type: 'tel')
+      expect(@session).not_to have_field('Description', type: '')
+      expect(@session).not_to have_field('Description', type: 'email')
+      expect(@session).not_to have_field('Languages', type: 'textarea')
     end
   end
 
@@ -88,44 +88,44 @@ Capybara::SpecHelper.spec '#has_no_field' do
 
   context 'with value' do
     it "should be false if a field with the given value is on the page" do
-      expect(@session).not_to have_no_field('First Name', :with => 'John')
-      expect(@session).not_to have_no_field('Phone', :with => '+1 555 7021')
-      expect(@session).not_to have_no_field('Street', :with => 'Sesame street 66')
-      expect(@session).not_to have_no_field('Description', :with => 'Descriptive text goes here')
+      expect(@session).not_to have_no_field('First Name', with: 'John')
+      expect(@session).not_to have_no_field('Phone', with: '+1 555 7021')
+      expect(@session).not_to have_no_field('Street', with: 'Sesame street 66')
+      expect(@session).not_to have_no_field('Description', with: 'Descriptive text goes here')
     end
 
     it "should be true if the given field is not on the page" do
-      expect(@session).to have_no_field('First Name', :with => 'Peter')
-      expect(@session).to have_no_field('Wrong Name', :with => 'John')
-      expect(@session).to have_no_field('Description', :with => 'Monkey')
+      expect(@session).to have_no_field('First Name', with: 'Peter')
+      expect(@session).to have_no_field('Wrong Name', with: 'John')
+      expect(@session).to have_no_field('Description', with: 'Monkey')
     end
 
     it "should be false after the field has been filled in with the given value" do
-      @session.fill_in('First Name', :with => 'Jonas')
-      expect(@session).not_to have_no_field('First Name', :with => 'Jonas')
+      @session.fill_in('First Name', with: 'Jonas')
+      expect(@session).not_to have_no_field('First Name', with: 'Jonas')
     end
 
     it "should be true after the field has been filled in with a different value" do
-      @session.fill_in('First Name', :with => 'Jonas')
-      expect(@session).to have_no_field('First Name', :with => 'John')
+      @session.fill_in('First Name', with: 'Jonas')
+      expect(@session).to have_no_field('First Name', with: 'John')
     end
   end
 
   context 'with type' do
     it "should be false if a field with the given type is on the page" do
-      expect(@session).not_to have_no_field('First Name', :type => 'text')
-      expect(@session).not_to have_no_field('Html5 Email', :type => 'email')
-      expect(@session).not_to have_no_field('Html5 Tel', :type => 'tel')
-      expect(@session).not_to have_no_field('Description', :type => 'textarea')
-      expect(@session).not_to have_no_field('Languages', :type => 'select')
+      expect(@session).not_to have_no_field('First Name', type: 'text')
+      expect(@session).not_to have_no_field('Html5 Email', type: 'email')
+      expect(@session).not_to have_no_field('Html5 Tel', type: 'tel')
+      expect(@session).not_to have_no_field('Description', type: 'textarea')
+      expect(@session).not_to have_no_field('Languages', type: 'select')
     end
 
     it "should be true if the given field is not on the page" do
-      expect(@session).to have_no_field('First Name', :type => 'textarea')
-      expect(@session).to have_no_field('Html5 Email', :type => 'tel')
-      expect(@session).to have_no_field('Description', :type => '')
-      expect(@session).to have_no_field('Description', :type => 'email')
-      expect(@session).to have_no_field('Languages', :type => 'textarea')
+      expect(@session).to have_no_field('First Name', type: 'textarea')
+      expect(@session).to have_no_field('Html5 Email', type: 'tel')
+      expect(@session).to have_no_field('Description', type: '')
+      expect(@session).to have_no_field('Description', type: 'email')
+      expect(@session).to have_no_field('Languages', type: 'textarea')
     end
   end
 end
@@ -138,8 +138,8 @@ Capybara::SpecHelper.spec '#has_checked_field?' do
     expect(@session).to have_checked_field('Hamster')
   end
 
-  it "should be true for disabled checkboxes if :disabled => true" do
-    expect(@session).to have_checked_field('Disabled Checkbox', :disabled => true)
+  it "should be true for disabled checkboxes if disabled: true" do
+    expect(@session).to have_checked_field('Disabled Checkbox', disabled: true)
   end
 
   it "should be false if an unchecked field is on the page" do
@@ -155,16 +155,16 @@ Capybara::SpecHelper.spec '#has_checked_field?' do
     expect(@session).not_to have_checked_field('Disabled Checkbox')
   end
 
-  it "should be false for disabled checkboxes if :disabled => false" do
-    expect(@session).not_to have_checked_field('Disabled Checkbox', :disabled => false)
+  it "should be false for disabled checkboxes if disabled: false" do
+    expect(@session).not_to have_checked_field('Disabled Checkbox', disabled: false)
   end
 
-  it "should be true for disabled checkboxes if :disabled => :all" do
-    expect(@session).to have_checked_field('Disabled Checkbox', :disabled => :all)
+  it "should be true for disabled checkboxes if disabled: :all" do
+    expect(@session).to have_checked_field('Disabled Checkbox', disabled: :all)
   end
 
-  it "should be true for enabled checkboxes if :disabled => :all" do
-    expect(@session).to have_checked_field('gender_female', :disabled => :all)
+  it "should be true for enabled checkboxes if disabled: :all" do
+    expect(@session).to have_checked_field('gender_female', disabled: :all)
   end
 
   it "should be true after an unchecked checkbox is checked" do
@@ -196,8 +196,8 @@ Capybara::SpecHelper.spec '#has_no_checked_field?' do
     expect(@session).not_to have_no_checked_field('Hamster')
   end
 
-  it "should be false for disabled checkboxes if :disabled => true" do
-    expect(@session).not_to have_no_checked_field('Disabled Checkbox', :disabled => true)
+  it "should be false for disabled checkboxes if disabled: true" do
+    expect(@session).not_to have_no_checked_field('Disabled Checkbox', disabled: true)
   end
 
   it "should be true if an unchecked field is on the page" do
@@ -213,8 +213,8 @@ Capybara::SpecHelper.spec '#has_no_checked_field?' do
     expect(@session).to have_no_checked_field('Disabled Checkbox')
   end
 
-  it "should be true for disabled checkboxes if :disabled => false" do
-    expect(@session).to have_no_checked_field('Disabled Checkbox', :disabled => false)
+  it "should be true for disabled checkboxes if disabled: false" do
+    expect(@session).to have_no_checked_field('Disabled Checkbox', disabled: false)
   end
 end
 
@@ -231,8 +231,8 @@ Capybara::SpecHelper.spec '#has_unchecked_field?' do
     expect(@session).to have_unchecked_field('Male')
   end
 
-  it "should be true for disabled unchecked fields if :disabled => true" do
-    expect(@session).to have_unchecked_field('Disabled Unchecked Checkbox', :disabled => true)
+  it "should be true for disabled unchecked fields if disabled: true" do
+    expect(@session).to have_unchecked_field('Disabled Unchecked Checkbox', disabled: true)
   end
 
   it "should be false if no field is on the page" do
@@ -243,8 +243,8 @@ Capybara::SpecHelper.spec '#has_unchecked_field?' do
     expect(@session).not_to have_unchecked_field('Disabled Unchecked Checkbox')
   end
 
-  it "should be false for disabled unchecked fields if :disabled => false" do
-    expect(@session).not_to have_unchecked_field('Disabled Unchecked Checkbox', :disabled => false)
+  it "should be false for disabled unchecked fields if disabled: false" do
+    expect(@session).not_to have_unchecked_field('Disabled Unchecked Checkbox', disabled: false)
   end
 
   it "should be false after an unchecked checkbox is checked" do
@@ -266,6 +266,11 @@ Capybara::SpecHelper.spec '#has_unchecked_field?' do
     @session.choose('gender_male')
     expect(@session).to have_unchecked_field('gender_female')
   end
+
+  it "should support locator-less usage" do
+    expect(@session.has_unchecked_field?(disabled: true, id: "form_disabled_unchecked_checkbox"))
+    expect(@session).to have_unchecked_field(disabled: true, id: "form_disabled_unchecked_checkbox" )
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_unchecked_field?' do
@@ -281,8 +286,8 @@ Capybara::SpecHelper.spec '#has_no_unchecked_field?' do
     expect(@session).not_to have_no_unchecked_field('Male')
   end
 
-  it "should be false for disabled unchecked fields if :disabled => true" do
-    expect(@session).not_to have_no_unchecked_field('Disabled Unchecked Checkbox', :disabled => true)
+  it "should be false for disabled unchecked fields if disabled: true" do
+    expect(@session).not_to have_no_unchecked_field('Disabled Unchecked Checkbox', disabled: true)
   end
 
   it "should be true if no field is on the page" do
@@ -293,7 +298,12 @@ Capybara::SpecHelper.spec '#has_no_unchecked_field?' do
     expect(@session).to have_no_unchecked_field('Disabled Unchecked Checkbox')
   end
 
-  it "should be true for disabled unchecked fields if :disabled => false" do
-    expect(@session).to have_no_unchecked_field('Disabled Unchecked Checkbox', :disabled => false)
+  it "should be true for disabled unchecked fields if disabled: false" do
+    expect(@session).to have_no_unchecked_field('Disabled Unchecked Checkbox', disabled: false)
+  end
+
+  it "should support locator-less usage" do
+    expect(@session.has_no_unchecked_field?(disabled: false, id: "form_disabled_unchecked_checkbox")).to eq true
+    expect(@session).to have_no_unchecked_field(disabled: false, id: "form_disabled_unchecked_checkbox" )
   end
 end