capybara 2.18.0 → 3.0.0

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec "#fill_in" do
   before do
     @session.visit('/form')
@@ -52,6 +53,30 @@ Capybara::SpecHelper.spec "#fill_in" do
     expect(extract_results(@session)['password']).to eq('supasikrit')
   end
 
+  context "Date/Time" do
+    it "should fill in a date input" do
+      date = Date.today
+      @session.fill_in('form_date', with: date)
+      @session.click_button('awesome')
+      expect(Date.parse(extract_results(@session)['date'])).to eq date
+    end
+
+    it "should fill in a time input" do
+      time = Time.new(2018, 3, 9, 15, 26)
+      @session.fill_in('form_time', with: time)
+      @session.click_button('awesome')
+      results = extract_results(@session)['time']
+      expect(Time.parse(results).strftime('%r')).to eq time.strftime('%r')
+    end
+
+    it "should fill in a datetime input" do
+      dt = Time.new(2018, 3, 13, 9, 53)
+      @session.fill_in('form_datetime', with: dt)
+      @session.click_button('awesome')
+      expect(Time.parse(extract_results(@session)['datetime'])).to eq dt
+    end
+  end
+
   it "should handle HTML in a textarea" do
     @session.fill_in('form_description', with: 'is <strong>very</strong> secret!')
     @session.click_button('awesome')
@@ -113,7 +138,7 @@ Capybara::SpecHelper.spec "#fill_in" do
   end
 
   it "should throw an exception if a hash containing 'with' is not provided" do
-    expect {@session.fill_in 'Name', 'ignu'}.to raise_error(RuntimeError, /with/)
+    expect { @session.fill_in 'Name' }.to raise_error(ArgumentError, /with/)
   end
 
   it "should wait for asynchronous load", requires: [:js] do
@@ -123,13 +148,13 @@ Capybara::SpecHelper.spec "#fill_in" do
   end
 
   it "casts to string" do
-    @session.fill_in(:'form_first_name', with: :'Harry')
+    @session.fill_in(:form_first_name, with: :Harry)
     @session.click_button('awesome')
     expect(extract_results(@session)['first_name']).to eq('Harry')
   end
 
   it "casts to string if field has maxlength" do
-    @session.fill_in(:'form_zipcode', with: 1234567)
+    @session.fill_in(:form_zipcode, with: 1234567)
     @session.click_button('awesome')
     expect(extract_results(@session)['zipcode']).to eq('12345')
   end
@@ -182,14 +207,14 @@ Capybara::SpecHelper.spec "#fill_in" do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      @session.fill_in("Explanation", with: "Dude", exact:  false)
+      @session.fill_in("Explanation", with: "Dude", exact: false)
       @session.click_button("awesome")
       expect(extract_results(@session)["name_explanation"]).to eq("Dude")
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.fill_in("Explanation", with: "Dude", exact:  true)
+        @session.fill_in("Explanation", with: "Dude", exact: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#find_button' do
   before do
     @session.visit('/form')
@@ -22,7 +23,7 @@ Capybara::SpecHelper.spec '#find_button' do
   end
 
   it "casts to string" do
-    expect(@session.find_button(:'med')[:id]).to eq("mediocre")
+    expect(@session.find_button(:med)[:id]).to eq("mediocre")
   end
 
   it "should raise error if the button doesn't exist" do
@@ -33,12 +34,12 @@ Capybara::SpecHelper.spec '#find_button' do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      expect(@session.find_button('What an Awesome', exact:  false).value).to eq("awesome")
+      expect(@session.find_button('What an Awesome', exact: false).value).to eq("awesome")
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.find_button('What an Awesome', exact:  true)
+        @session.find_button('What an Awesome', exact: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#find_by_id' do
   before do
     @session.visit('/with_html')
@@ -9,7 +10,7 @@ Capybara::SpecHelper.spec '#find_by_id' do
   end
 
   it "casts to string" do
-    expect(@session.find_by_id(:'red').tag_name).to eq('a')
+    expect(@session.find_by_id(:red).tag_name).to eq('a')
   end
 
   it "should raise error if no element with id is found" do

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#find_field' do
   before do
     @session.visit('/form')
@@ -6,7 +7,7 @@ Capybara::SpecHelper.spec '#find_field' do
 
   it "should find any field" do
     expect(@session.find_field('Dog').value).to eq('dog')
-    expect(@session.find_field('form_description').text).to eq('Descriptive text goes here')
+    expect(@session.find_field('form_description').value).to eq('Descriptive text goes here')
     expect(@session.find_field('Region')[:name]).to eq('form[region]')
     expect(@session.find_field('With Asterisk*')).to be
   end
@@ -26,7 +27,7 @@ Capybara::SpecHelper.spec '#find_field' do
   end
 
   it "casts to string" do
-    expect(@session.find_field(:'Dog').value).to eq('dog')
+    expect(@session.find_field(:Dog).value).to eq('dog')
   end
 
   it "should raise error if the field doesn't exist" do
@@ -35,27 +36,20 @@ Capybara::SpecHelper.spec '#find_field' do
     end.to raise_error(Capybara::ElementNotFound)
   end
 
-  it "should warn if filter option is invalid" do
-    expect_any_instance_of(Kernel).to receive(:warn).
-      with('Invalid value nil passed to filter disabled - defaulting to false')
-    @session.find_field('Dog', disabled: nil)
-  end
-
-  it "should be aliased as 'field_labeled' for webrat compatibility" do
-    expect(@session.field_labeled('Dog').value).to eq('dog')
+  it "should raise error if filter option is invalid" do
     expect do
-      @session.field_labeled('Does not exist')
-    end.to raise_error(Capybara::ElementNotFound)
+      @session.find_field('Dog', disabled: nil)
+    end.to raise_error ArgumentError, "Invalid value nil passed to filter disabled"
   end
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      expect(@session.find_field("Explanation", exact:  false)[:name]).to eq("form[name_explanation]")
+      expect(@session.find_field("Explanation", exact: false)[:name]).to eq("form[name_explanation]")
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.find_field("Explanation", exact:  true)
+        @session.find_field("Explanation", exact: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end
@@ -112,6 +106,6 @@ Capybara::SpecHelper.spec '#find_field' do
 
   it "should accept an optional filter block" do
     # this would be better done with the :with option but this is just a test
-    expect(@session.find_field('form[pets][]'){ |node| node.value == 'dog' }[:id]).to eq "form_pets_dog"
+    expect(@session.find_field('form[pets][]') { |node| node.value == 'dog' }[:id]).to eq "form_pets_dog"
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#find_link' do
   before do
     @session.visit('/with_html')
@@ -6,13 +7,13 @@ Capybara::SpecHelper.spec '#find_link' do
 
   it "should find any link" do
     expect(@session.find_link('foo').text).to eq("ullamco")
-    expect(@session.find_link('labore')[:href]).to match %r(/with_simple_html$)
+    expect(@session.find_link('labore')[:href]).to match %r{/with_simple_html$}
   end
 
   context "aria_label attribute with Capybara.enable_aria_label" do
     it "should find when true" do
       Capybara.enable_aria_label = true
-      expect(@session.find_link('Go to simple')[:href]).to match %r(/with_simple_html$)
+      expect(@session.find_link('Go to simple')[:href]).to match %r{/with_simple_html$}
     end
 
     it "should not find when false" do
@@ -22,7 +23,7 @@ Capybara::SpecHelper.spec '#find_link' do
   end
 
   it "casts to string" do
-    expect(@session.find_link(:'foo').text).to eq("ullamco")
+    expect(@session.find_link(:foo).text).to eq("ullamco")
   end
 
   it "should raise error if the field doesn't exist" do
@@ -33,12 +34,12 @@ Capybara::SpecHelper.spec '#find_link' do
 
   context "with :exact option" do
     it "should accept partial matches when false" do
-      expect(@session.find_link('abo', exact:  false).text).to eq("labore")
+      expect(@session.find_link('abo', exact: false).text).to eq("labore")
     end
 
     it "should not accept partial matches when true" do
       expect do
-        @session.find_link('abo', exact:  true)
+        @session.find_link('abo', exact: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
   end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#find' do
   before do
     @session.visit('/with_html')
@@ -85,6 +86,11 @@ Capybara::SpecHelper.spec '#find' do
     it "should support pseudo selectors" do
       expect(@session.find(:css, 'input:disabled').value).to eq('This is disabled')
     end
+
+    it "should support escaping characters" do
+      expect(@session.find(:css, '#\31 escape\.me').text).to eq('needs escaping')
+      expect(@session.find(:css, '.\32 escape').text).to eq('needs escaping')
+    end
   end
 
   context "with xpath selectors" do
@@ -179,17 +185,17 @@ Capybara::SpecHelper.spec '#find' do
 
     it "should allow use of filters from custom filter set" do
       expect(@session.find(:id, 'test_field', filter_set: :value, with: 'monkey').value).to eq('monkey')
-      expect{ @session.find(:id, 'test_field', filter_set: :value, with: 'not_monkey') }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.find(:id, 'test_field', filter_set: :value, with: 'not_monkey') }.to raise_error(Capybara::ElementNotFound)
     end
 
     it "should allow use of filter set from a different selector" do
       expect(@session.find(:id, 'test_field', filter_set: :field, with: 'monkey').value).to eq('monkey')
-      expect{ @session.find(:id, 'test_field', filter_set: :field, with: 'not_monkey') }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.find(:id, 'test_field', filter_set: :field, with: 'not_monkey') }.to raise_error(Capybara::ElementNotFound)
     end
 
     it "should allow importing of filter set into selector" do
       expect(@session.find(:id_with_field_filters, 'test_field', with: 'monkey').value).to eq('monkey')
-      expect{ @session.find(:id_with_field_filters, 'test_field', with: 'not_monkey') }.to raise_error(Capybara::ElementNotFound)
+      expect { @session.find(:id_with_field_filters, 'test_field', with: 'not_monkey') }.to raise_error(Capybara::ElementNotFound)
     end
   end
 
@@ -217,15 +223,15 @@ Capybara::SpecHelper.spec '#find' do
 
   context "with :exact option" do
     it "matches exactly when true" do
-      expect(@session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("test_field")], exact:  true).value).to eq("monkey")
+      expect(@session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("test_field")], exact: true).value).to eq("monkey")
       expect do
-        @session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("est_fiel")], exact:  true)
+        @session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("est_fiel")], exact: true)
       end.to raise_error(Capybara::ElementNotFound)
     end
 
     it "matches loosely when false" do
-      expect(@session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("test_field")], exact:  false).value).to eq("monkey")
-      expect(@session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("est_fiel")], exact:  false).value).to eq("monkey")
+      expect(@session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("test_field")], exact: false).value).to eq("monkey")
+      expect(@session.find(:xpath, XPath.descendant(:input)[XPath.attr(:id).is("est_fiel")], exact: false).value).to eq("monkey")
     end
 
     it "defaults to `Capybara.exact`" do
@@ -238,8 +244,8 @@ Capybara::SpecHelper.spec '#find' do
     end
 
     it "warns when the option has no effect" do
-      expect_any_instance_of(Kernel).to receive(:warn).
-        with('The :exact option only has an effect on queries using the XPath#is method. Using it with the query "#test_field" has no effect.')
+      expect_any_instance_of(Kernel).to receive(:warn)
+        .with('The :exact option only has an effect on queries using the XPath#is method. Using it with the query "#test_field" has no effect.')
       @session.find(:css, '#test_field', exact: true)
     end
   end
@@ -253,7 +259,7 @@ Capybara::SpecHelper.spec '#find' do
       end
       it "raises an error even if there the match is exact and the others are inexact" do
         expect do
-          @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], exact:  false, match: :one)
+          @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], exact: false, match: :one)
         end.to raise_error(Capybara::Ambiguous)
       end
       it "returns the element if there is only one" do
@@ -281,25 +287,25 @@ Capybara::SpecHelper.spec '#find' do
       context "and `exact` set to `false`" do
         it "raises an error when there are multiple exact matches" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("multiple")], match: :smart, exact:  false)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("multiple")], match: :smart, exact: false)
           end.to raise_error(Capybara::Ambiguous)
         end
         it "finds a single exact match when there also are inexact matches" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], match: :smart, exact:  false)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], match: :smart, exact: false)
           expect(result.text).to eq("almost singular")
         end
         it "raises an error when there are multiple inexact matches" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singul")], match: :smart, exact:  false)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singul")], match: :smart, exact: false)
           end.to raise_error(Capybara::Ambiguous)
         end
         it "finds a single inexact match" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :smart, exact:  false)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :smart, exact: false)
           expect(result.text).to eq("almost singular but not quite")
         end
         it "raises an error if there is no match" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], match: :smart, exact:  false)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], match: :smart, exact: false)
           end.to raise_error(Capybara::ElementNotFound)
         end
       end
@@ -307,26 +313,26 @@ Capybara::SpecHelper.spec '#find' do
       context "with `exact` set to `true`" do
         it "raises an error when there are multiple exact matches" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("multiple")], match: :smart, exact:  true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("multiple")], match: :smart, exact: true)
           end.to raise_error(Capybara::Ambiguous)
         end
         it "finds a single exact match when there also are inexact matches" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], match: :smart, exact:  true)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], match: :smart, exact: true)
           expect(result.text).to eq("almost singular")
         end
         it "raises an error when there are multiple inexact matches" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singul")], match: :smart, exact:  true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singul")], match: :smart, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
         it "raises an error when there is a single inexact matches" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :smart, exact:  true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :smart, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
         it "raises an error if there is no match" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], match: :smart, exact:  true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], match: :smart, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
       end
@@ -335,50 +341,50 @@ Capybara::SpecHelper.spec '#find' do
     context "when set to `prefer_exact`" do
       context "and `exact` set to `false`" do
         it "picks the first one when there are multiple exact matches" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("multiple")], match: :prefer_exact, exact:  false)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("multiple")], match: :prefer_exact, exact: false)
           expect(result.text).to eq("multiple one")
         end
         it "finds a single exact match when there also are inexact matches" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], match: :prefer_exact, exact:  false)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], match: :prefer_exact, exact: false)
           expect(result.text).to eq("almost singular")
         end
         it "picks the first one when there are multiple inexact matches" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singul")], match: :prefer_exact, exact:  false)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singul")], match: :prefer_exact, exact: false)
           expect(result.text).to eq("almost singular but not quite")
         end
         it "finds a single inexact match" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :prefer_exact, exact:  false)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :prefer_exact, exact: false)
           expect(result.text).to eq("almost singular but not quite")
         end
         it "raises an error if there is no match" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], match: :prefer_exact, exact:  false)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], match: :prefer_exact, exact: false)
           end.to raise_error(Capybara::ElementNotFound)
         end
       end
 
       context "with `exact` set to `true`" do
         it "picks the first one when there are multiple exact matches" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("multiple")], match: :prefer_exact, exact:  true)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("multiple")], match: :prefer_exact, exact: true)
           expect(result.text).to eq("multiple one")
         end
         it "finds a single exact match when there also are inexact matches" do
-          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], match: :prefer_exact, exact:  true)
+          result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular")], match: :prefer_exact, exact: true)
           expect(result.text).to eq("almost singular")
         end
         it "raises an error if there are multiple inexact matches" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singul")], match: :prefer_exact, exact:  true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singul")], match: :prefer_exact, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
         it "raises an error if there is a single inexact match" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :prefer_exact, exact:  true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("almost_singular but")], match: :prefer_exact, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
         it "raises an error if there is no match" do
           expect do
-            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], match: :prefer_exact, exact:  true)
+            @session.find(:xpath, XPath.descendant[XPath.attr(:class).is("does-not-exist")], match: :prefer_exact, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
       end
@@ -401,7 +407,7 @@ Capybara::SpecHelper.spec '#find' do
   end
 
   it "supports a custom filter block" do
-    expect(@session.find(:css, 'input'){|node| node.disabled? }[:name]).to eq('disabled_text')
+    expect(@session.find(:css, 'input', &:disabled?)[:name]).to eq('disabled_text')
   end
 
   context "within a scope" do

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#first' do
   before do
     @session.visit('/with_html')
@@ -9,8 +10,16 @@ Capybara::SpecHelper.spec '#first' do
     expect(@session.first("//input[@id='test_field']").value).to eq('monkey')
   end
 
-  it "should return nil when nothing was found" do
-    expect(@session.first('//div[@id="nosuchthing"]')).to be_nil
+  it "should raise ElementNotFound when nothing was found" do
+    expect do
+      @session.first('//div[@id="nosuchthing"]')
+    end.to raise_error Capybara::ElementNotFound
+  end
+
+  it "should return nil when nothing was found if count options allow no results" do
+    expect(@session.first('//div[@id="nosuchthing"]', minimum: 0)).to be_nil
+    expect(@session.first('//div[@id="nosuchthing"]', count: 0)).to be_nil
+    expect(@session.first('//div[@id="nosuchthing"]', between: (0..3))).to be_nil
   end
 
   it "should accept an XPath instance" do
@@ -20,9 +29,10 @@ Capybara::SpecHelper.spec '#first' do
     expect(@session.first(@xpath).value).to eq('John')
   end
 
-  it "should warn when unused parameters are passed" do
-    expect_any_instance_of(Kernel).to receive(:warn).with(/Unused parameters passed.*unused text/)
-    @session.first(:css, '.header h2', 'unused text')
+  it "should raise when unused parameters are passed" do
+    expect do
+      @session.first(:css, 'h1', 'unused text')
+    end.to raise_error ArgumentError, /Unused parameters passed.*unused text/
   end
 
   context "with css selectors" do
@@ -49,40 +59,52 @@ 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 do
+        @session.first(:css, "a#invisible", visible: true)
+      end.to raise_error Capybara::ElementNotFound
     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#invisible", visible: false, text: 'hidden link')).not_to be_nil
-      expect(@session.first(:css, "a#visible", visible: false)).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: false)).to be
+      expect(@session.first(:css, "a#invisible", visible: false, text: 'hidden link')).to be
+      expect(@session.first(:css, "a#visible", visible: false)).to be
     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#invisible", visible: :all, text: 'hidden link')).not_to be_nil
-      expect(@session.first(:css, "a#visible", visible: :all)).not_to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :all)).to be
+      expect(@session.first(:css, "a#invisible", visible: :all, text: 'hidden link')).to be
+      expect(@session.first(:css, "a#visible", visible: :all)).to be
     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#invisible", visible: :hidden, text: 'hidden link')).not_to be_nil
-      expect(@session.first(:css, "a#invisible", visible: :hidden, text: 'not hidden link')).to be_nil
-      expect(@session.first(:css, "a#visible", visible: :hidden)).to be_nil
+      expect(@session.first(:css, "a#invisible", visible: :hidden)).to be
+      expect(@session.first(:css, "a#invisible", visible: :hidden, text: 'hidden link')).to be
+      expect do
+        @session.first(:css, "a#invisible", visible: :hidden, text: 'not hidden link')
+      end.to raise_error Capybara::ElementNotFound
+      expect do
+        @session.first(:css, "a#visible", visible: :hidden)
+      end.to raise_error Capybara::ElementNotFound
     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#invisible", visible: :visible, text: 'hidden link')).to be_nil
-      expect(@session.first(:css, "a#visible", visible: :visible)).not_to be_nil
+      expect do
+        @session.first(:css, "a#invisible", visible: :visible)
+      end.to raise_error Capybara::ElementNotFound
+      expect do
+        @session.first(:css, "a#invisible", visible: :visible, text: 'hidden link')
+      end.to raise_error Capybara::ElementNotFound
+      expect(@session.first(:css, "a#visible", visible: :visible)).to be
     end
 
     it "should default to Capybara.ignore_hidden_elements" do
       Capybara.ignore_hidden_elements = true
-      expect(@session.first(:css, "a#invisible")).to be_nil
+      expect do
+        @session.first(:css, "a#invisible")
+      end.to raise_error Capybara::ElementNotFound
       Capybara.ignore_hidden_elements = false
-      expect(@session.first(:css, "a#invisible")).not_to be_nil
-      expect(@session.first(:css, "a")).not_to be_nil
+      expect(@session.first(:css, "a#invisible")).to be
+      expect(@session.first(:css, "a")).to be
     end
   end
 
@@ -93,35 +115,40 @@ Capybara::SpecHelper.spec '#first' do
 
     it "should find the first element using the given locator" do
       @session.within(:xpath, "//div[@id='for_bar']") do
-        expect(@session.first('.//form')).not_to be_nil
+        expect(@session.first('.//form')).to be
       end
     end
   end
 
-  context "with Capybara.wait_on_first_by_default", requires: [:js] do
+  context "waiting behavior", requires: [:js] do
     before do
       @session.visit('/with_js')
     end
 
-    it "should not wait if false" do
-      Capybara.wait_on_first_by_default = false
+    it "should not wait if minimum: 0" do
       @session.click_link('clickable')
-      expect(@session.first(:css, 'a#has-been-clicked')).to be_nil
+      Capybara.using_wait_time(3) do
+        start_time = Time.now
+        expect(@session.first(:css, 'a#has-been-clicked', minimum: 0)).to be_nil
+        expect(Time.now - start_time).to be < 3
+      end
     end
 
-    it "should wait for at least one match if true" do
-      Capybara.wait_on_first_by_default = true
+    it "should wait for at least one match by default" do
       Capybara.using_wait_time(3) do
         @session.click_link('clickable')
         expect(@session.first(:css, 'a#has-been-clicked')).not_to be_nil
       end
     end
 
-    it "should return nil after waiting if no match" do
-      Capybara.wait_on_first_by_default = true
+    it "should raise an error after waiting if no match" do
+      @session.click_link('clickable')
       Capybara.using_wait_time(3) do
-        @session.click_link('clickable')
-        expect(@session.first(:css, 'a#not-a-real-link')).to be_nil
+        start_time = Time.now
+        expect do
+          @session.first(:css, 'a#not-a-real-link')
+        end.to raise_error Capybara::ElementNotFound
+        expect(Time.now - start_time).to be > 3
       end
     end
   end

data/lib/capybara/spec/session/frame/frame_title_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+Capybara::SpecHelper.spec '#frame_title', requires: [:frames] do
+  before(:each) do
+    @session.visit('/within_frames')
+  end
+
+  it "should return the title in a frame" do
+    @session.within_frame("frameOne") do
+      expect(@session.driver.frame_title).to eq 'This is the title of frame one'
+    end
+  end
+
+  it "should return the title in FrameTwo" do
+    @session.within_frame("frameTwo") do
+      expect(@session.driver.frame_title).to eq 'This is the title of frame two'
+    end
+  end
+
+  it "should return the title in the main frame" do
+    expect(@session.driver.frame_title).to eq 'With Frames'
+  end
+end

data/lib/capybara/spec/session/frame/frame_url_spec.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+Capybara::SpecHelper.spec '#frame_url', requires: [:frames] do
+  before(:each) do
+    @session.visit('/within_frames')
+  end
+
+  it "should return the url in a frame" do
+    @session.within_frame("frameOne") do
+      expect(@session.driver.frame_url).to end_with '/frame_one'
+    end
+  end
+
+  it "should return the url in FrameTwo" do
+    @session.within_frame("frameTwo") do
+      expect(@session.driver.frame_url).to end_with '/frame_two'
+    end
+  end
+
+  it "should return the url in the main frame" do
+    expect(@session.driver.frame_url).to end_with('/within_frames')
+  end
+end