capybara 2.13.0 → 2.18.0

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

@@ -11,6 +11,13 @@ Capybara::SpecHelper.spec '#accept_prompt', requires: [:modals] do
     expect(@session).to have_xpath("//a[@id='open-prompt' and @response='']")
   end
 
+  it "should accept the prompt with no message when there is a default" do
+    @session.accept_prompt do
+      @session.click_link('Open defaulted prompt')
+    end
+    expect(@session).to have_xpath("//a[@id='open-prompt-with-default' and @response='Default value!']")
+  end
+
   it "should return the message presented" do
     message = @session.accept_prompt do
       @session.click_link('Open prompt')
@@ -25,6 +32,28 @@ Capybara::SpecHelper.spec '#accept_prompt', requires: [:modals] do
     expect(@session).to have_xpath("//a[@id='open-prompt' and @response='the response']")
   end
 
+  it "should accept the prompt with a response when there is a default" do
+    @session.accept_prompt with: 'the response' do
+      @session.click_link('Open defaulted prompt')
+    end
+    expect(@session).to have_xpath("//a[@id='open-prompt-with-default' and @response='the response']")
+  end
+
+  it "should accept the prompt with a blank response when there is a default" do
+    pending "Geckodriver doesn't set a blank response currently" if marionette?(@session)
+    @session.accept_prompt with: '' do
+      @session.click_link('Open defaulted prompt')
+    end
+    expect(@session).to have_xpath("//a[@id='open-prompt-with-default' and @response='']")
+  end
+
+  it "should allow special characters in the reponse" do
+    @session.accept_prompt with: '\'the\' \b "response"' do
+      @session.click_link('Open prompt')
+    end
+    expect(@session).to have_xpath(%{//a[@id='open-prompt' and @response=concat("'the' ", '\\b "response"')]})
+  end
+
   it "should accept the prompt if the message matches" do
     @session.accept_prompt 'Prompt opened', with: 'matched' do
       @session.click_link('Open prompt')
@@ -40,7 +69,6 @@ Capybara::SpecHelper.spec '#accept_prompt', requires: [:modals] do
     end.to raise_error(Capybara::ModalNotFound)
   end
 
-
   it "should return the message presented" do
     message = @session.accept_prompt with: 'the response' do
       @session.click_link('Open prompt')

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

@@ -16,7 +16,8 @@ Capybara::SpecHelper.spec "#all" do
 
   it "should accept an XPath instance" do
     @session.visit('/form')
-    @xpath = XPath::HTML.fillable_field('Name')
+    @xpath = Capybara::Selector.all[:fillable_field].call('Name')
+    expect(@xpath).to be_a(::XPath::Union)
     @result = @session.all(@xpath).map { |r| r.value }
     expect(@result).to include('Smith', 'John', 'John Smith')
   end
@@ -66,6 +67,17 @@ Capybara::SpecHelper.spec "#all" do
       Capybara.ignore_hidden_elements = false
       expect(@session.all(:css, "a.simple").size).to eq(2)
     end
+
+    context "with per session config", requires: [:psc] do
+      it "should use the sessions ignore_hidden_elements", psc: true do
+        Capybara.ignore_hidden_elements = true
+        @session.config.ignore_hidden_elements = false
+        expect(Capybara.ignore_hidden_elements).to eq(true)
+        expect(@session.all(:css, "a.simple").size).to eq(2)
+        @session.config.ignore_hidden_elements = true
+        expect(@session.all(:css, "a.simple").size).to eq(1)
+      end
+    end
   end
 
   context 'with element count filters' do

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

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+Capybara::SpecHelper.spec '#ancestor' do
+  before do
+    @session.visit('/with_html')
+  end
+
+  after do
+    Capybara::Selector.remove(:monkey)
+  end
+
+  it "should find the ancestor element using the given locator" do
+    el = @session.find(:css, '#first_image')
+    expect(el.ancestor('//p')).to have_text('Lorem ipsum dolor')
+    expect(el.ancestor("//a")[:'aria-label']).to eq('Go to simple')
+  end
+
+  it "should find the ancestor element using the given locator and options" do
+    el = @session.find(:css, '#child')
+    expect(el.ancestor('//div', text: 'Ancestor Ancestor Ancestor')[:id]).to eq('ancestor3')
+  end
+
+  it "should raise an error if there are multiple matches" do
+    el = @session.find(:css, '#child')
+    expect { el.ancestor('//div') }.to raise_error(Capybara::Ambiguous)
+    expect { el.ancestor('//div', text: 'Ancestor') }.to raise_error(Capybara::Ambiguous)
+  end
+
+  context "with css selectors" do
+    it "should find the first element using the given locator" do
+      el = @session.find(:css, '#first_image')
+      expect(el.ancestor(:css, 'p')).to have_text('Lorem ipsum dolor')
+      expect(el.ancestor(:css, 'a')[:'aria-label']).to eq('Go to simple')
+    end
+
+    it "should support pseudo selectors" do
+      el = @session.find(:css, '#button_img')
+      expect(el.ancestor(:css, 'button:disabled')[:id]).to eq('ancestor_button')
+    end
+  end
+
+  context "with xpath selectors" do
+    it "should find the first element using the given locator" do
+      el = @session.find(:css, '#first_image')
+      expect(el.ancestor(:xpath, '//p')).to have_text('Lorem ipsum dolor')
+      expect(el.ancestor(:xpath, "//a")[:'aria-label']).to eq('Go to simple')
+    end
+  end
+
+  context "with custom selector" do
+    it "should use the custom selector" do
+      Capybara.add_selector(:level) do
+        xpath { |num| ".//*[@id='ancestor#{num}']" }
+      end
+      el = @session.find(:css, '#child')
+      expect(el.ancestor(:level, 1).text).to eq('Ancestor Child')
+      expect(el.ancestor(:level, 3).text).to eq('Ancestor Ancestor Ancestor Child')
+    end
+  end
+
+
+  it "should raise ElementNotFound with a useful default message if nothing was found" do
+    el = @session.find(:css, '#child')
+    expect do
+      el.ancestor(:xpath, '//div[@id="nosuchthing"]')
+    end.to raise_error(Capybara::ElementNotFound, "Unable to find xpath \"//div[@id=\\\"nosuchthing\\\"]\" that is an ancestor of visible css \"#child\"")
+  end
+
+
+
+  context "within a scope" do
+    it "should limit the ancestors to inside the scope" do
+      @session.within(:css, '#ancestor2') do
+        el = @session.find(:css, '#child')
+        expect(el.ancestor(:css,'div', text: 'Ancestor')[:id]).to eq('ancestor1')
+      end
+    end
+  end
+
+  it "should raise if selector type is unknown" do
+    el = @session.find(:css, '#child')
+    expect do
+      el.ancestor(:unknown, '//h1')
+    end.to raise_error(ArgumentError)
+  end
+end

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

@@ -18,10 +18,18 @@ Capybara::SpecHelper.spec '#assert_all_of_selectors' do
     @session.assert_all_of_selectors("p a#foo", "h2#h2two", "h2#h2one" )
   end
 
-  it "should respect scopes" do
-    @session.within "//p[@id='first']" do
-      @session.assert_all_of_selectors(".//a[@id='foo']")
-      expect { @session.assert_all_of_selectors(".//a[@id='red']") }.to raise_error(Capybara::ElementNotFound)
+  context "should respect scopes" do
+    it "when used with `within`" do
+      @session.within "//p[@id='first']" do
+        @session.assert_all_of_selectors(".//a[@id='foo']")
+        expect { @session.assert_all_of_selectors(".//a[@id='red']") }.to raise_error(Capybara::ElementNotFound)
+      end
+    end
+
+    it "when called on elements" do
+      el = @session.find "//p[@id='first']"
+      el.assert_all_of_selectors(".//a[@id='foo']")
+      expect { el.assert_all_of_selectors(".//a[@id='red']") }.to raise_error(Capybara::ElementNotFound)
     end
   end
 
@@ -65,10 +73,18 @@ Capybara::SpecHelper.spec '#assert_none_of_selectors' do
     expect { @session.assert_none_of_selectors("abbr", "p a#foo") }.to raise_error(Capybara::ElementNotFound)
   end
 
-  it "should respect scopes" do
-    @session.within "//p[@id='first']" do
-      expect { @session.assert_none_of_selectors(".//a[@id='foo']") }.to raise_error(Capybara::ElementNotFound)
-      @session.assert_none_of_selectors(".//a[@id='red']")
+  context "should respect scopes" do
+    it "when used with `within`" do
+      @session.within "//p[@id='first']" do
+        expect { @session.assert_none_of_selectors(".//a[@id='foo']") }.to raise_error(Capybara::ElementNotFound)
+        @session.assert_none_of_selectors(".//a[@id='red']")
+      end
+    end
+
+    it "when called on an element" do
+      el = @session.find "//p[@id='first']"
+      expect { el.assert_none_of_selectors(".//a[@id='foo']") }.to raise_error(Capybara::ElementNotFound)
+      el.assert_none_of_selectors(".//a[@id='red']")
     end
   end
 

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

@@ -65,7 +65,7 @@ Capybara::SpecHelper.spec '#assert_selector' do
       Capybara.using_wait_time(0.1) do
         @session.visit('/with_js')
         @session.click_link('Click me')
-        @session.assert_selector(:css, "a#has-been-clicked", text: "Has been clicked", wait: 0.9)
+        @session.assert_selector(:css, "a#has-been-clicked", text: "Has been clicked", wait: 2)
       end
     end
   end

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

@@ -52,6 +52,14 @@ Capybara::SpecHelper.spec '#assert_text' do
     end.to raise_error(Capybara::ExpectationNotMet, /it was found 1 time using a case insensitive search/)
   end
 
+  it "should raise error with helpful message if requested text is present but invisible and with incorrect case", requires: [:js] do
+    @session.visit('/with_html')
+    el = @session.find(:css, '#uppercase')
+    expect do
+      el.assert_text('text here')
+    end.to raise_error(Capybara::ExpectationNotMet, /it was found 1 time using a case insensitive search and it was found 1 time including non-visible text/)
+  end
+
   it "should raise the correct error if requested text is missing but contains regex special characters" do
     @session.visit('/with_html')
     expect do

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

@@ -4,16 +4,23 @@ Capybara::SpecHelper.spec '#assert_title' do
     @session.visit('/with_js')
   end
 
-  it "should be true if the page's title contains the given string" do
-    expect(@session.assert_title('js')).to eq(true)
+  it "should not raise if the page's title contains the given string" do
+    expect do
+      @session.assert_title('js')
+    end.not_to raise_error
   end
 
-  it "should be true when given an empty string" do
-    expect(@session.assert_title('')).to eq(true)
+  it "should not raise when given an empty string" do
+    expect do
+      @session.assert_title('')
+    end.not_to raise_error
   end
 
   it "should allow regexp matches" do
-    expect(@session.assert_title(/w[a-z]{3}_js/)).to eq(true)
+    expect do
+      @session.assert_title(/w[a-z]{3}_js/)
+    end.not_to raise_error
+
     expect do
       @session.assert_title(/w[a-z]{10}_js/)
     end.to raise_error(Capybara::ExpectationNotMet, 'expected "with_js" to match /w[a-z]{10}_js/')
@@ -21,7 +28,9 @@ Capybara::SpecHelper.spec '#assert_title' do
 
   it "should wait for title", requires: [:js] do
     @session.click_link("Change title")
-    expect(@session.assert_title("changed title")).to eq(true)
+    expect do
+      @session.assert_title("changed title", wait: 3)
+    end.not_to raise_error
   end
 
   it "should raise error if the title doesn't contain the given string" do
@@ -61,10 +70,14 @@ Capybara::SpecHelper.spec '#assert_no_title' do
 
   it "should wait for title to disappear", requires: [:js] do
     @session.click_link("Change title")
-    expect(@session.assert_no_title('with_js')).to eq(true)
+    expect do
+      @session.assert_no_title('with_js', wait: 3)
+    end.not_to raise_error
   end
 
-  it "should be true if the title doesn't contain the given string" do
-    expect(@session.assert_no_title('monkey')).to eq(true)
+  it "should not raise if the title doesn't contain the given string" do
+    expect do
+      @session.assert_no_title('monkey')
+    end.not_to raise_error
   end
 end

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

@@ -4,6 +4,7 @@ Capybara::SpecHelper.spec "#attach_file" do
     @test_file_path = File.expand_path('../fixtures/test_file.txt', File.dirname(__FILE__))
     @another_test_file_path = File.expand_path('../fixtures/another_test_file.txt', File.dirname(__FILE__))
     @test_jpg_file_path = File.expand_path('../fixtures/capybara.jpg', File.dirname(__FILE__))
+    @no_extension_file_path = File.expand_path('../fixtures/no_extension', File.dirname(__FILE__))
     @session.visit('/form')
   end
 
@@ -57,6 +58,12 @@ Capybara::SpecHelper.spec "#attach_file" do
       expect(@session).to have_content('image/jpeg')
     end
 
+    it "should not break when uploading a file without extension" do
+      @session.attach_file "Single Document", @no_extension_file_path
+      @session.click_button 'Upload Single'
+      expect(@session).to have_content(File.read(@no_extension_file_path))
+    end
+
     it "should not break when using HTML5 multiple file input" do
       @session.attach_file "Multiple Documents", @test_file_path
       @session.click_button('Upload Multiple')
@@ -81,7 +88,7 @@ Capybara::SpecHelper.spec "#attach_file" do
 
   context "with a locator that doesn't exist" do
     it "should raise an error" do
-      msg = "Unable to find file field \"does not exist\""
+      msg = "Unable to find visible file field \"does not exist\" that is not disabled"
       expect do
         @session.attach_file('does not exist', @test_file_path)
       end.to raise_error(Capybara::ElementNotFound, msg)

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

@@ -69,7 +69,7 @@ Capybara::SpecHelper.spec "#check" do
 
   context "with a locator that doesn't exist" do
     it "should raise an error" do
-      msg = "Unable to find checkbox \"does not exist\""
+      msg = "Unable to find visible checkbox \"does not exist\" that is not disabled"
       expect do
         @session.check('does not exist')
       end.to raise_error(Capybara::ElementNotFound, msg)
@@ -142,11 +142,11 @@ Capybara::SpecHelper.spec "#check" do
       end
 
       it "should raise original error when no label available" do
-        expect { @session.check('form_cars_ariel') }.to raise_error(Capybara::ElementNotFound, 'Unable to find checkbox "form_cars_ariel"')
+        expect { @session.check('form_cars_ariel') }.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_ariel" that is not disabled')
       end
 
       it "should raise error if not allowed to click label" do
-        expect{@session.check('form_cars_mclaren', allow_label_click: false)}.to raise_error(Capybara::ElementNotFound, 'Unable to find checkbox "form_cars_mclaren"')
+        expect{@session.check('form_cars_mclaren', allow_label_click: false)}.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_mclaren" that is not disabled')
       end
     end
 
@@ -158,7 +158,7 @@ Capybara::SpecHelper.spec "#check" do
       end
 
       it "should raise error if checkbox not visible" do
-        expect{@session.check('form_cars_mclaren')}.to raise_error(Capybara::ElementNotFound, 'Unable to find checkbox "form_cars_mclaren"')
+        expect{@session.check('form_cars_mclaren')}.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_mclaren" that is not disabled')
       end
 
       context "with allow_label_click == true" do

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

@@ -24,7 +24,7 @@ Capybara::SpecHelper.spec "#choose" do
 
   context "with a locator that doesn't exist" do
     it "should raise an error" do
-      msg = "Unable to find radio button \"does not exist\""
+      msg = "Unable to find visible radio button \"does not exist\" that is not disabled"
       expect do
         @session.choose('does not exist')
       end.to raise_error(Capybara::ElementNotFound, msg)
@@ -82,7 +82,7 @@ Capybara::SpecHelper.spec "#choose" do
       end
 
       it "should raise error if not allowed to click label" do
-        expect{@session.choose("party_democrat", allow_label_click: false)}.to raise_error(Capybara::ElementNotFound, 'Unable to find radio button "party_democrat"')
+        expect{@session.choose("party_democrat", allow_label_click: false)}.to raise_error(Capybara::ElementNotFound, 'Unable to find visible radio button "party_democrat" that is not disabled')
       end
     end
   end

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

@@ -353,7 +353,7 @@ Capybara::SpecHelper.spec '#click_button' do
 
   context "with a locator that doesn't exist" do
     it "should raise an error" do
-      msg = "Unable to find button \"does not exist\""
+      msg = "Unable to find visible button \"does not exist\""
       expect do
         @session.click_button('does not exist')
       end.to raise_error(Capybara::ElementNotFound, msg)

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

@@ -54,7 +54,7 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
     context "when `false`" do
       it "does not click on link which matches approximately" do
         @session.visit('/with_html')
-        msg = "Unable to find link or button \"abore\""
+        msg = "Unable to find visible link or button \"abore\""
         expect do
           @session.click_link_or_button('abore', exact:  true)
         end.to raise_error(Capybara::ElementNotFound, msg)
@@ -62,7 +62,7 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
 
       it "does not click on approximately matching button" do
         @session.visit('/form')
-        msg = "Unable to find link or button \"awe\""
+        msg = "Unable to find visible link or button \"awe\""
 
         expect do
           @session.click_link_or_button('awe', exact:  true)
@@ -74,7 +74,7 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
   context "with a locator that doesn't exist" do
     it "should raise an error" do
       @session.visit('/with_html')
-      msg = "Unable to find link or button \"does not exist\""
+      msg = "Unable to find visible link or button \"does not exist\""
       expect do
         @session.click_link_or_button('does not exist')
       end.to raise_error(Capybara::ElementNotFound, msg)

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

@@ -67,7 +67,7 @@ Capybara::SpecHelper.spec '#click_link' do
 
   context "with a locator that doesn't exist" do
     it "should raise an error" do
-      msg = "Unable to find link \"does not exist\""
+      msg = "Unable to find visible link \"does not exist\""
       expect do
         @session.click_link('does not exist')
       end.to raise_error(Capybara::ElementNotFound, msg)

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

@@ -3,7 +3,7 @@ require "capybara/spec/test_app"
 
 Capybara::SpecHelper.spec '#current_url, #current_path, #current_host' do
   before :all do
-    @servers = 2.times.map { Capybara::Server.new(TestApp.clone).boot }
+    @servers = 2.times.map { Capybara::Server.new(TestApp.new).boot }
     # sanity check
     expect(@servers[0].port).not_to eq(@servers[1].port)
     expect(@servers.map { |s| s.port }).not_to include 80
@@ -98,9 +98,9 @@ Capybara::SpecHelper.spec '#current_url, #current_path, #current_host' do
   end
 
   it "doesn't raise exception on a nil current_url" do
+    skip "Only makes sense when there is a real driver" unless @session.respond_to?(:driver)
+    allow(@session.driver).to receive(:current_url) { nil }
     @session.visit("/")
-    allow_any_instance_of(Capybara::Session).to receive(:current_url) { nil }
-
     expect { @session.current_url }.not_to raise_exception
     expect { @session.current_path }.not_to raise_exception
   end

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

@@ -10,14 +10,14 @@ Capybara::SpecHelper.spec '#dismiss_confirm', requires: [:modals] do
     end
     expect(@session).to have_xpath("//a[@id='open-confirm' and @confirmed='false']")
   end
-  
+
   it "should dismiss the confirm if the message matches" do
     @session.dismiss_confirm 'Confirm opened' do
       @session.click_link('Open confirm')
     end
     expect(@session).to have_xpath("//a[@id='open-confirm' and @confirmed='false']")
   end
-  
+
   it "should not dismiss the confirm if the message doesn't match" do
     expect do
       @session.dismiss_confirm 'Incorrect Text' do
@@ -25,7 +25,7 @@ Capybara::SpecHelper.spec '#dismiss_confirm', requires: [:modals] do
       end
     end.to raise_error(Capybara::ModalNotFound)
   end
-    
+
 
   it "should return the message presented" do
     message = @session.dismiss_confirm do

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

@@ -10,7 +10,7 @@ Capybara::SpecHelper.spec '#dismiss_prompt', requires: [:modals] do
     end
     expect(@session).to have_xpath("//a[@id='open-prompt' and @response='dismissed']")
   end
-  
+
   it "should return the message presented" do
     message = @session.dismiss_prompt do
       @session.click_link('Open prompt')

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+Capybara::SpecHelper.spec "#evaluate_async_script", requires: [:js] do
+  it "should evaluate the given script and return whatever it produces" do
+    @session.visit('/with_js')
+    expect(@session.evaluate_async_script("arguments[0](4)")).to eq(4)
+  end
+
+  it "should support passing elements as arguments to the script", requires: [:js, :es_args] do
+    @session.visit('/with_js')
+    el = @session.find(:css, '#drag p')
+    result = @session.evaluate_async_script("arguments[2]([arguments[0].innerText, arguments[1]])", el, "Doodle Funk")
+    expect(result).to eq ["This is a draggable element.", "Doodle Funk"]
+  end
+
+  it "should support returning elements after asynchronous operation", requires: [:js, :es_args] do
+    @session.visit('/with_js')
+    @session.find(:css, '#change') # ensure page has loaded and element is available
+    el = @session.evaluate_async_script("var cb = arguments[0]; setTimeout(function(){ cb(document.getElementById('change')) }, 100)")
+    expect(el).to be_instance_of(Capybara::Node::Element)
+    expect(el).to eq(@session.find(:css, '#change'))
+  end
+end

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

@@ -20,7 +20,7 @@ Capybara::SpecHelper.spec "#evaluate_script", requires: [:js] do
 
   it "should support returning elements", requires: [:js, :es_args] do
     @session.visit('/with_js')
-    el = @session.find(:css, '#change')
+    @session.find(:css, '#change') # ensure page has loaded and element is available
     el = @session.evaluate_script("document.getElementById('change')")
     expect(el).to be_instance_of(Capybara::Node::Element)
     expect(el).to eq(@session.find(:css, '#change'))

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

@@ -106,6 +106,12 @@ Capybara::SpecHelper.spec "#fill_in" do
     expect(extract_results(@session)['first_name']).to eq('Thomas')
   end
 
+  it "should fill in a field based on type" do
+    @session.fill_in(type: 'schmooo', with: 'Schmooo for all')
+    @session.click_button('awesome')
+    expect(extract_results(@session)['schmooo']).to eq('Schmooo for all')
+  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/)
   end
@@ -150,7 +156,7 @@ Capybara::SpecHelper.spec "#fill_in" do
     before { Capybara.ignore_hidden_elements = true }
     after  { Capybara.ignore_hidden_elements = false }
     it "should not find a hidden field" do
-      msg = "Unable to find field \"Super Secret\""
+      msg = "Unable to find visible field \"Super Secret\" that is not disabled"
       expect do
         @session.fill_in('Super Secret', with: '777')
       end.to raise_error(Capybara::ElementNotFound, msg)
@@ -159,7 +165,7 @@ Capybara::SpecHelper.spec "#fill_in" do
 
   context "with a locator that doesn't exist" do
     it "should raise an error" do
-      msg = "Unable to find field \"does not exist\""
+      msg = "Unable to find visible field \"does not exist\" that is not disabled"
       expect do
         @session.fill_in('does not exist', with: 'Blah blah')
       end.to raise_error(Capybara::ElementNotFound, msg)

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

@@ -8,6 +8,7 @@ Capybara::SpecHelper.spec '#find_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('Region')[:name]).to eq('form[region]')
+    expect(@session.find_field('With Asterisk*')).to be
   end
 
   context "aria_label attribute with Capybara.enable_aria_label" do

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

@@ -54,7 +54,7 @@ Capybara::SpecHelper.spec '#find' do
     it "should find element if it appears before given wait duration" do
       @session.visit('/with_js')
       @session.click_link('Click me')
-      expect(@session.find(:css, "a#has-been-clicked", wait: 0.9).text).to include('Has been clicked')
+      expect(@session.find(:css, "a#has-been-clicked", wait: 2.0).text).to include('Has been clicked')
     end
   end
 
@@ -205,12 +205,13 @@ Capybara::SpecHelper.spec '#find' do
   it "should raise ElementNotFound with a useful default message if nothing was found" do
     expect do
       @session.find(:xpath, '//div[@id="nosuchthing"]').to be_nil
-    end.to raise_error(Capybara::ElementNotFound, "Unable to find xpath \"//div[@id=\\\"nosuchthing\\\"]\"")
+    end.to raise_error(Capybara::ElementNotFound, "Unable to find visible xpath \"//div[@id=\\\"nosuchthing\\\"]\"")
   end
 
   it "should accept an XPath instance" do
     @session.visit('/form')
-    @xpath = XPath::HTML.fillable_field('First Name')
+    @xpath = Capybara::Selector.all[:fillable_field].call('First Name')
+    expect(@xpath).to be_a(::XPath::Union)
     expect(@session.find(@xpath).value).to eq('John')
   end
 
@@ -421,8 +422,9 @@ Capybara::SpecHelper.spec '#find' do
     end
   end
 
-  it "should warn if selector type is unknown" do
-    expect_any_instance_of(Kernel).to receive(:warn).with(/^Unknown selector type/)
-    @session.find(:unknown, '//h1')
+  it "should raise if selector type is unknown" do
+    expect do
+      @session.find(:unknown, '//h1')
+    end.to raise_error(ArgumentError)
   end
 end

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

@@ -15,7 +15,8 @@ Capybara::SpecHelper.spec '#first' do
 
   it "should accept an XPath instance" do
     @session.visit('/form')
-    @xpath = XPath::HTML.fillable_field('First Name')
+    @xpath = Capybara::Selector.all[:fillable_field].call('First Name')
+    expect(@xpath).to be_a(::XPath::Union)
     expect(@session.first(@xpath).value).to eq('John')
   end
 
@@ -110,14 +111,18 @@ Capybara::SpecHelper.spec '#first' do
 
     it "should wait for at least one match if true" do
       Capybara.wait_on_first_by_default = true
-      @session.click_link('clickable')
-      expect(@session.first(:css, 'a#has-been-clicked')).not_to be_nil
+      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
-      @session.click_link('clickable')
-      expect(@session.first(:css, 'a#not-a-real-link')).to be_nil
+      Capybara.using_wait_time(3) do
+        @session.click_link('clickable')
+        expect(@session.first(:css, 'a#not-a-real-link')).to be_nil
+      end
     end
   end
 end