capybara 2.7.0 → 3.35.3

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

@@ -1,56 +1,105 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#has_current_path?' do
   before do
     @session.visit('/with_js')
   end
 
-  it "should be true if the page has the given current path" do
+  it 'should be true if the page has the given current path' do
     expect(@session).to have_current_path('/with_js')
   end
 
-  it "should allow regexp matches" do
+  it 'should allow regexp matches' do
     expect(@session).to have_current_path(/w[a-z]{3}_js/)
     expect(@session).not_to have_current_path(/monkey/)
   end
 
-  it "should handle non-escaped query options" do
-    @session.click_link("Non-escaped query options")
-    expect(@session).to have_current_path("/with_html?options[]=things")
+  it 'should not raise an error when non-http' do
+    @session.reset_session!
+    expect(@session.has_current_path?(/monkey/)).to eq false
+    expect(@session.has_current_path?('/with_js')).to eq false
+  end
+
+  it 'should handle non-escaped query options' do
+    @session.click_link('Non-escaped query options')
+    expect(@session).to have_current_path('/with_html?options[]=things')
   end
 
-  it "should handle escaped query options" do
-    @session.click_link("Escaped query options")
-    expect(@session).to have_current_path("/with_html?options%5B%5D=things")
+  it 'should handle escaped query options' do
+    @session.click_link('Escaped query options')
+    expect(@session).to have_current_path('/with_html?options%5B%5D=things')
   end
 
-  it "should wait for current_path", :requires => [:js] do
-    @session.click_link("Change page")
-    expect(@session).to have_current_path("/with_html")
+  it 'should wait for current_path', requires: [:js] do
+    @session.click_link('Change page')
+    expect(@session).to have_current_path('/with_html', wait: 3)
   end
 
-  it "should be false if the page has not the given current_path" do
+  it 'should be false if the page has not the given current_path' do
     expect(@session).not_to have_current_path('/with_html')
   end
 
-  it "should check query options" do
+  it 'should check query options' do
     @session.visit('/with_js?test=test')
     expect(@session).to have_current_path('/with_js?test=test')
   end
 
-  it "should compare the full url" do
+  it 'should compare the full url if url: true is used' do
     expect(@session).to have_current_path(%r{\Ahttp://[^/]*/with_js\Z}, url: true)
+    domain_port = if @session.respond_to?(:server) && @session.server
+      "#{@session.server.host}:#{@session.server.port}"
+    else
+      'www.example.com'
+    end
+    expect(@session).to have_current_path("http://#{domain_port}/with_js", url: true)
+  end
+
+  it 'should not compare the full url if url: true is not passed' do
+    expect(@session).to have_current_path(%r{^/with_js\Z})
+    expect(@session).to have_current_path('/with_js')
+  end
+
+  it 'should not compare the full url if url: false is passed' do
+    expect(@session).to have_current_path(%r{^/with_js\Z}, url: false)
+    expect(@session).to have_current_path('/with_js', url: false)
+  end
+
+  it 'should default to full url if value is a url' do
+    url = @session.current_url
+    expect(url).to match(/with_js$/)
+    expect(@session).to have_current_path(url)
+    expect(@session).not_to have_current_path('http://www.not_example.com/with_js')
   end
 
-  it "should ignore the query" do
+  it 'should ignore the query' do
     @session.visit('/with_js?test=test')
     expect(@session).to have_current_path('/with_js?test=test')
-    expect(@session).to have_current_path('/with_js', only_path: true)
+    expect(@session).to have_current_path('/with_js', ignore_query: true)
+    uri = ::Addressable::URI.parse(@session.current_url)
+    uri.query = nil
+    expect(@session).to have_current_path(uri.to_s, ignore_query: true)
   end
 
-  it "should not allow url and only_path at the same time" do
-    expect {
-      expect(@session).to have_current_path('/with_js', url: true, only_path: true)
-      }. to raise_error ArgumentError
+  it 'should not raise an exception if the current_url is nil' do
+    allow(@session).to receive(:current_url).and_return(nil)
+    allow(@session.page).to receive(:current_url).and_return(nil) if @session.respond_to? :page
+
+    # Without ignore_query option
+    expect do
+      expect(@session).to have_current_path(nil)
+    end.not_to raise_exception
+
+    # With ignore_query option
+    expect do
+      expect(@session).to have_current_path(nil, ignore_query: true)
+    end.not_to raise_exception
+  end
+
+  it 'should accept a filter block that receives Addressable::URL' do
+    @session.visit('/with_js?a=3&b=defgh')
+    expect(@session).to have_current_path('/with_js', ignore_query: true) { |url|
+      url.query_values.keys == %w[a b]
+    }
   end
 end
 
@@ -59,21 +108,44 @@ Capybara::SpecHelper.spec '#has_no_current_path?' do
     @session.visit('/with_js')
   end
 
-  it "should be false if the page has the given current_path" do
+  it 'should be false if the page has the given current_path' do
     expect(@session).not_to have_no_current_path('/with_js')
   end
 
-  it "should allow regexp matches" do
+  it 'should allow regexp matches' do
     expect(@session).not_to have_no_current_path(/w[a-z]{3}_js/)
     expect(@session).to have_no_current_path(/monkey/)
   end
 
-  it "should wait for current_path to disappear", :requires => [:js] do
-    @session.click_link("Change page")
-    expect(@session).to have_no_current_path('/with_js')
+  it 'should wait for current_path to disappear', requires: [:js] do
+    Capybara.using_wait_time(3) do
+      @session.click_link('Change page')
+      expect(@session).to have_no_current_path('/with_js')
+    end
   end
 
-  it "should be true if the page has not the given current_path" do
+  it 'should be true if the page has not the given current_path' do
     expect(@session).to have_no_current_path('/with_html')
   end
+
+  it 'should not raise an exception if the current_url is nil' do
+    allow(@session).to receive(:current_url).and_return(nil)
+    allow(@session.page).to receive(:current_url).and_return(nil) if @session.respond_to? :page
+
+    # Without ignore_query option
+    expect do
+      expect(@session).not_to have_current_path('/with_js')
+    end.not_to raise_exception
+
+    # With ignore_query option
+    expect do
+      expect(@session).not_to have_current_path('/with_js', ignore_query: true)
+    end.not_to raise_exception
+  end
+
+  it 'should accept a filter block that receives Addressable::URL' do
+    expect(@session).to have_no_current_path('/with_js', ignore_query: true) { |url|
+      !url.query.nil?
+    }
+  end
 end

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

@@ -1,127 +1,187 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#has_field' do
   before { @session.visit('/form') }
 
-  it "should be true if the field is on the page" do
+  it 'should be true if the field is on the page' do
     expect(@session).to have_field('Dog')
     expect(@session).to have_field('form_description')
     expect(@session).to have_field('Region')
-    expect(@session).to have_field(:'Region')
+    expect(@session).to have_field(:Region)
   end
 
-  it "should be false if the field is not on the page" do
+  it 'should be false if the field is not on the page' do
     expect(@session).not_to have_field('Monkey')
   end
 
   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('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')
+    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')
+    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')
     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('Wrong Name', :with => 'John')
-      expect(@session).not_to have_field('Description', :with => 'Monkey')
+    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/)
     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')
+    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/)
     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')
+    it 'should output filter errors if only one element matched the selector but failed the filters' do
+      @session.fill_in('First Name', with: 'Thomas')
+      expect do
+        expect(@session).to have_field('First Name', with: 'Jonas')
+      end.to raise_exception(RSpec::Expectations::ExpectationNotMetError, /Expected value to be "Jonas" but was "Thomas"/)
+
+      # native boolean node filter
+      expect do
+        expect(@session).to have_field('First Name', readonly: true)
+      end.to raise_exception(RSpec::Expectations::ExpectationNotMetError, /Expected readonly true but it wasn't/)
+
+      # inherited boolean node filter
+      expect do
+        expect(@session).to have_field('form_pets_cat', checked: true)
+      end.to raise_exception(RSpec::Expectations::ExpectationNotMetError, /Expected checked true but it wasn't/)
+    end
+  end
+
+  context 'with validation message', requires: [:html_validation] do
+    it 'should accept a regexp' do
+      @session.fill_in('form_zipcode', with: '1234')
+      expect(@session).to have_field('form_zipcode', validation_message: /match the requested format/)
+      expect(@session).not_to have_field('form_zipcode', validation_message: /random/)
+    end
+
+    it 'should accept a string' do
+      @session.fill_in('form_zipcode', with: '1234')
+      expect(@session).to have_field('form_zipcode', validation_message: 'Please match the requested format.')
+      expect(@session).not_to have_field('form_zipcode', validation_message: 'match the requested format.')
+      @session.fill_in('form_zipcode', with: '12345')
+      expect(@session).to have_field('form_zipcode', validation_message: '')
     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')
+    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')
     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')
+    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')
+    end
+
+    it 'it can find type="hidden" elements if explicity specified' do
+      expect(@session).to have_field('form[data]', with: 'TWTW', type: 'hidden')
     end
   end
 
   context 'with multiple' do
-    it "should be true if a field with the multiple attribute is on the page" do
+    it 'should be true if a field with the multiple attribute is on the page' do
       expect(@session).to have_field('Html5 Multiple Email', multiple: true)
     end
 
-    it "should be false if a field without the multiple attribute is not on the page" do
+    it 'should be false if a field without the multiple attribute is not on the page' do
       expect(@session).not_to have_field('Html5 Multiple Email', multiple: false)
     end
   end
+
+  context 'with valid', requires: [:js] do
+    it 'should be true if field is valid' do
+      @session.fill_in 'required', with: 'something'
+      @session.fill_in 'length', with: 'abcd'
+
+      expect(@session).to have_field('required', valid: true)
+      expect(@session).to have_field('length', valid: true)
+    end
+
+    it 'should be false if field is invalid' do
+      expect(@session).not_to have_field('required', valid: true)
+      expect(@session).to have_field('required', valid: false)
+
+      @session.fill_in 'length', with: 'abc'
+      expect(@session).not_to have_field('length', valid: true)
+    end
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_field' do
   before { @session.visit('/form') }
 
-  it "should be false if the field is on the page" do
+  it 'should be false if the field is on the page' do
     expect(@session).not_to have_no_field('Dog')
     expect(@session).not_to have_no_field('form_description')
     expect(@session).not_to have_no_field('Region')
   end
 
-  it "should be true if the field is not on the page" do
+  it 'should be true if the field is not on the page' do
     expect(@session).to have_no_field('Monkey')
   end
 
   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')
+    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')
     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')
+    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')
     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')
+    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')
     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')
+    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')
     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')
+    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')
     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')
+    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')
     end
   end
 end
@@ -129,56 +189,56 @@ end
 Capybara::SpecHelper.spec '#has_checked_field?' do
   before { @session.visit('/form') }
 
-  it "should be true if a checked field is on the page" do
+  it 'should be true if a checked field is on the page' do
     expect(@session).to have_checked_field('gender_female')
     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
+  it 'should be false if an unchecked field is on the page' do
     expect(@session).not_to have_checked_field('form_pets_cat')
     expect(@session).not_to have_checked_field('Male')
   end
 
-  it "should be false if no field is on the page" do
+  it 'should be false if no field is on the page' do
     expect(@session).not_to have_checked_field('Does Not Exist')
   end
 
-  it "should be false for disabled checkboxes by default" do
+  it 'should be false for disabled checkboxes by default' 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
+  it 'should be true after an unchecked checkbox is checked' do
     @session.check('form_pets_cat')
     expect(@session).to have_checked_field('form_pets_cat')
   end
 
-  it "should be false after a checked checkbox is unchecked" do
+  it 'should be false after a checked checkbox is unchecked' do
     @session.uncheck('form_pets_dog')
     expect(@session).not_to have_checked_field('form_pets_dog')
   end
 
-  it "should be true after an unchecked radio button is chosen" do
+  it 'should be true after an unchecked radio button is chosen' do
     @session.choose('gender_male')
     expect(@session).to have_checked_field('gender_male')
   end
 
-  it "should be false after another radio button in the group is chosen" do
+  it 'should be false after another radio button in the group is chosen' do
     @session.choose('gender_male')
     expect(@session).not_to have_checked_field('gender_female')
   end
@@ -187,109 +247,119 @@ end
 Capybara::SpecHelper.spec '#has_no_checked_field?' do
   before { @session.visit('/form') }
 
-  it "should be false if a checked field is on the page" do
+  it 'should be false if a checked field is on the page' do
     expect(@session).not_to have_no_checked_field('gender_female')
     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
+  it 'should be true if an unchecked field is on the page' do
     expect(@session).to have_no_checked_field('form_pets_cat')
     expect(@session).to have_no_checked_field('Male')
   end
 
-  it "should be true if no field is on the page" do
+  it 'should be true if no field is on the page' do
     expect(@session).to have_no_checked_field('Does Not Exist')
   end
 
-  it "should be true for disabled checkboxes by default" do
+  it 'should be true for disabled checkboxes by default' 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
 
 Capybara::SpecHelper.spec '#has_unchecked_field?' do
   before { @session.visit('/form') }
 
-  it "should be false if a checked field is on the page" do
+  it 'should be false if a checked field is on the page' do
     expect(@session).not_to have_unchecked_field('gender_female')
     expect(@session).not_to have_unchecked_field('Hamster')
   end
 
-  it "should be true if an unchecked field is on the page" do
+  it 'should be true if an unchecked field is on the page' do
     expect(@session).to have_unchecked_field('form_pets_cat')
     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
+  it 'should be false if no field is on the page' do
     expect(@session).not_to have_unchecked_field('Does Not Exist')
   end
 
-  it "should be false for disabled unchecked fields by default" do
+  it 'should be false for disabled unchecked fields by default' 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
+  it 'should be false after an unchecked checkbox is checked' do
     @session.check('form_pets_cat')
     expect(@session).not_to have_unchecked_field('form_pets_cat')
   end
 
-  it "should be true after a checked checkbox is unchecked" do
+  it 'should be true after a checked checkbox is unchecked' do
     @session.uncheck('form_pets_dog')
     expect(@session).to have_unchecked_field('form_pets_dog')
   end
 
-  it "should be false after an unchecked radio button is chosen" do
+  it 'should be false after an unchecked radio button is chosen' do
     @session.choose('gender_male')
     expect(@session).not_to have_unchecked_field('gender_male')
   end
 
-  it "should be true after another radio button in the group is chosen" do
+  it 'should be true after another radio button in the group is chosen' 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')).to be true
+    expect(@session).to have_unchecked_field(disabled: true, id: 'form_disabled_unchecked_checkbox')
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_unchecked_field?' do
   before { @session.visit('/form') }
 
-  it "should be true if a checked field is on the page" do
+  it 'should be true if a checked field is on the page' do
     expect(@session).to have_no_unchecked_field('gender_female')
     expect(@session).to have_no_unchecked_field('Hamster')
   end
 
-  it "should be false if an unchecked field is on the page" do
+  it 'should be false if an unchecked field is on the page' do
     expect(@session).not_to have_no_unchecked_field('form_pets_cat')
     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
+  it 'should be true if no field is on the page' do
     expect(@session).to have_no_unchecked_field('Does Not Exist')
   end
 
-  it "should be true for disabled unchecked fields by default" do
+  it 'should be true for disabled unchecked fields by default' 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