capybara 2.14.4 → 2.15.0

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

@@ -69,11 +69,11 @@ Capybara::SpecHelper.spec "#uncheck" do
       end
 
       it "should raise original error when no label available" do
-        expect { @session.uncheck('form_cars_ariel') }.to raise_error(Capybara::ElementNotFound, 'Unable to find checkbox "form_cars_ariel"')
+        expect { @session.uncheck('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.uncheck('form_cars_jaguar', allow_label_click: false)}.to raise_error(Capybara::ElementNotFound, 'Unable to find checkbox "form_cars_jaguar"')
+        expect{@session.uncheck('form_cars_jaguar', allow_label_click: false)}.to raise_error(Capybara::ElementNotFound, 'Unable to find visible checkbox "form_cars_jaguar" that is not disabled')
       end
     end
   end

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

@@ -55,7 +55,7 @@ Capybara::SpecHelper.spec "#unselect" do
 
   context "with a locator that doesn't exist" do
     it "should raise an error" do
-      msg = "Unable to find select box \"does not exist\""
+      msg = "Unable to find visible select box \"does not exist\" that is not disabled"
       expect do
         @session.unselect('foo', from: 'does not exist')
       end.to raise_error(Capybara::ElementNotFound, msg)
@@ -64,7 +64,7 @@ Capybara::SpecHelper.spec "#unselect" do
 
   context "with an option that doesn't exist" do
     it "should raise an error" do
-      msg = "Unable to find option \"Does not Exist\""
+      msg = 'Unable to find visible option "Does not Exist"'
       expect do
         @session.unselect('Does not Exist', from: 'form_underwear')
       end.to raise_error(Capybara::ElementNotFound, msg)

data/lib/capybara/spec/session/window/become_closed_spec.rb

@@ -27,12 +27,12 @@ Capybara::SpecHelper.spec '#become_closed', requires: [:windows, :js] do
 
     it 'should raise error if value of :wait is less than timeout' do
       @session.within_window @other_window do
-        @session.execute_script('setTimeout(function(){ window.close(); }, 700);')
+        @session.execute_script('setTimeout(function(){ window.close(); }, 1000);')
       end
       Capybara.using_wait_time 2 do
         expect do
-          expect(@other_window).to become_closed(wait: 0.4)
-        end.to raise_error(RSpec::Expectations::ExpectationNotMetError, /\Aexpected #<Window @handle=".+"> to become closed after 0.4 seconds\Z/)
+          expect(@other_window).to become_closed(wait: 0.2)
+        end.to raise_error(RSpec::Expectations::ExpectationNotMetError, /\Aexpected #<Window @handle=".+"> to become closed after 0.2 seconds\Z/)
       end
     end
   end

data/lib/capybara/spec/session/window/switch_to_window_spec.rb

@@ -79,7 +79,7 @@ Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
         @session.within(:css, '#doesNotOpenWindows') do
           @session.switch_to_window { @session.title == 'With Windows' }
         end
-      end.to raise_error(Capybara::ScopeError, "`switch_to_window` is not supposed to be invoked from `within`'s, `within_frame`'s' or `within_window`'s' block.")
+      end.to raise_error(Capybara::ScopeError, /`switch_to_window` is not supposed to be invoked/)
     end
 
     it "should raise error when invoked inside `within_frame` as it's nonsense" do
@@ -87,16 +87,18 @@ Capybara::SpecHelper.spec '#switch_to_window', requires: [:windows] do
         @session.within_frame('frameOne') do
           @session.switch_to_window { @session.title == 'With Windows' }
         end
-      end.to raise_error(Capybara::ScopeError, "`switch_to_window` is not supposed to be invoked from `within`'s, `within_frame`'s' or `within_window`'s' block.")
+      end.to raise_error(Capybara::ScopeError, /`switch_to_window` is not supposed to be invoked from/)
     end
 
-    it "should raise error when invoked inside `within_window` as it's nonsense" do
-      window = (@session.windows - [@window]).first
-      expect do
-        @session.within_window window do
-          @session.switch_to_window { @session.title == 'With Windows' }
-        end
-      end.to raise_error(Capybara::ScopeError, "`switch_to_window` is not supposed to be invoked from `within`'s, `within_frame`'s' or `within_window`'s' block.")
+    it "should allow to be called inside within_window and within_window will still return to original" do
+      other_windows = (@session.windows - [@window])
+      expect(@session.current_window).to eq(@window)
+      @session.within_window other_windows[0] do
+        expect(@session.current_window).to eq(other_windows[0])
+        @session.switch_to_window other_windows[1]
+        expect(@session.current_window).to eq(other_windows[1])
+      end
+      expect(@session.current_window).to eq(@window)
     end
 
     it "should raise error if window matching block wasn't found" do

data/lib/capybara/spec/session/window/within_window_spec.rb

@@ -57,10 +57,10 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
       expect(@session.send(:scopes)).to eq([nil])
     end
 
-    it "should leave correct scopes after execution in case of error" do
+    it "should leave correct scopes after execution in case of error", requires: [:windows, :frames] do
       window = (@session.windows - [@window]).first
       expect do
-        @session.within 'html' do
+        @session.within_frame 'frameOne' do
           @session.within_window(window) {}
         end
       end.to raise_error(Capybara::ScopeError)
@@ -102,6 +102,31 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
       expect(@session.title).to eq('With Windows')
     end
 
+    it "should be able to nest within_window" do
+      @session.within_window(->{ @session.title == 'Title of popup two'}) do
+        expect(@session).to have_css('#divInPopupTwo')
+        @session.within_window(->{ @session.title == 'Title of the first popup'}) do
+          expect(@session).to have_css('#divInPopupOne')
+        end
+        expect(@session).to have_css('#divInPopupTwo')
+        expect(@session).not_to have_css('divInPopupOne')
+      end
+      expect(@session).not_to have_css('#divInPopupTwo')
+      expect(@session).not_to have_css('divInPopupOne')
+      expect(@session.title).to eq('With Windows')
+    end
+
+    it "should work inside a normal scope" do
+      expect(@session).to have_css('#openWindow')
+      @session.within(:css, '#scope') do
+        @session.within_window(->{ @session.title == 'Title of the first popup'}) do
+          expect(@session).to have_css('#divInPopupOne')
+        end
+        expect(@session).to have_content('My scoped content')
+        expect(@session).not_to have_css('#openWindow')
+      end
+    end
+
     it "should raise error if window wasn't found" do
       expect do
         @session.within_window(->{ @session.title == 'Invalid title'}) do

data/lib/capybara/spec/test_app.rb

@@ -17,6 +17,7 @@ class TestApp < Sinatra::Base
   set :raise_errors, true
   set :show_exceptions, false
 
+  @@form_post_count = 0
   # Also check lib/capybara/spec/views/*.erb for pages not listed here
 
   get '/' do
@@ -147,7 +148,8 @@ class TestApp < Sinatra::Base
   end
 
   post '/form' do
-    '<pre id="results">' + params[:form].to_yaml + '</pre>'
+    @@form_post_count += 1
+    '<pre id="results">' + params[:form].merge({"post_count" => @@form_post_count}).to_yaml + '</pre>'
   end
 
   post '/upload_empty' do

data/lib/capybara/spec/views/with_html.erb

@@ -19,7 +19,7 @@
   et dolore magna aliqua. Ut enim ad minim veniam,
   quis nostrud exercitation <a href="/foo" id="foo">ullamco</a> laboris nisi
   ut aliquip ex ea commodo consequat.
-  <a href="/with_simple_html" aria-label="Go to simple"><img width="20" height="20" alt="awesome image" /></a>
+  <a href="/with_simple_html" aria-label="Go to simple"><img id="first_image" width="20" height="20" alt="awesome image" /></a>
 </p>
 
 <p class="para" id="second">
@@ -121,3 +121,29 @@ banana</textarea>
   <a id="link_placeholder">No href</a>
   <a id="link_blank_href" href="">Blank href</a>
 </div>
+
+<div id="ancestor3">
+  Ancestor
+  <div id="ancestor2">
+    Ancestor
+    <div id="ancestor1">
+      Ancestor
+      <div id="child">Child</div>
+    </div>
+  </div>
+  <button id="ancestor_button" type="submit" disabled>
+    <img id="button_img" width="20" height="20" alt="button img"/>
+  </button>
+</div>
+
+<div id="sibling_test">
+  <div id="sibling_wrapper" data-pre=true>
+    <div id="pre_sibling" data-pre=true>Pre Sibling</div>
+    <div id="mid_sibling">Mid Sibling</div>
+    <div id="post_sibling" data-post=true>Post Sibling</div>
+  </div>
+  <div id="other_sibling_wrapper" data-post=true>
+    <div data-pre=true>Pre Sibling</div>
+    <div data-post=true>Post Sibling</div>
+  </div>
+</div>

data/lib/capybara/spec/views/with_windows.erb

@@ -46,5 +46,9 @@
     <button id="doesNotOpenWindows">Does not open windows</button>
 
     <iframe src="/frame_one" id="frameOne"></iframe>
+
+    <div id="scope">
+      <span>My scoped content</span>
+    </div>
   </body>
 </html>

data/lib/capybara/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Capybara
-  VERSION = '2.14.4'
+  VERSION = '2.15.0'
 end

data/spec/capybara_spec.rb

@@ -92,9 +92,17 @@ RSpec.describe Capybara do
       require 'rack/handler/puma'
       mock_app = double('app')
       Capybara.server = :puma
-      expect(Rack::Handler::Puma).to receive(:run)
+      expect(Rack::Handler::Puma).to receive(:run).with(mock_app, hash_including(Host: nil, Port: 8000))
       Capybara.server.call(mock_app, 8000)
     end
+
+    it "should pass options to server" do
+      require 'rack/handler/puma'
+      mock_app = double('app')
+      Capybara.server = :puma, { Silent: true }
+      expect(Rack::Handler::Puma).to receive(:run).with(mock_app, hash_including(Host: nil, Port: 9000, Silent: true))
+      Capybara.server.call(mock_app, 9000)
+    end
   end
 
   describe 'app_host' do

data/spec/minitest_spec_spec.rb

@@ -122,6 +122,6 @@ RSpec.describe 'capybara/minitest/spec' do
     reporter.report
     expect(output.string).to include("16 runs, 39 assertions, 1 failures, 0 errors, 0 skips")
     #Make sure error messages are displayed
-    expect(output.string).to include('expected to find select box "non_existing_form_title" but there were no matches')
+    expect(output.string).to include('expected to find visible select box "non_existing_form_title" that is not disabled but there were no matches')
   end
 end

data/spec/rspec/shared_spec_matchers.rb

@@ -2,6 +2,7 @@
 require 'spec_helper'
 require 'capybara/dsl'
 require 'capybara/rspec/matchers'
+require 'benchmark'
 
 RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
 
@@ -10,7 +11,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
 
   describe "have_css matcher" do
     it "gives proper description" do
-      expect(have_css('h1').description).to eq("have css \"h1\"")
+      expect(have_css('h1').description).to eq("have visible css \"h1\"")
     end
 
     context "on a string" do
@@ -22,7 +23,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
         it "fails if has_css? returns false" do
           expect do
             expect("<h1>Text</h1>").to have_css('h2')
-          end.to raise_error(/expected to find css "h2" but there were no matches/)
+          end.to raise_error(/expected to find visible css "h2" but there were no matches/)
         end
 
         it "passes if matched node count equals expected count" do
@@ -32,25 +33,25 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
         it "fails if matched node count does not equal expected count" do
           expect do
             expect("<h1>Text</h1>").to have_css('h1', count: 2)
-          end.to raise_error("expected to find css \"h1\" 2 times, found 1 match: \"Text\"")
+          end.to raise_error("expected to find visible css \"h1\" 2 times, found 1 match: \"Text\"")
         end
 
         it "fails if matched node count is less than expected minimum count" do
           expect do
             expect("<h1>Text</h1>").to have_css('p', minimum: 1)
-          end.to raise_error("expected to find css \"p\" at least 1 time but there were no matches")
+          end.to raise_error("expected to find visible css \"p\" at least 1 time but there were no matches")
         end
 
         it "fails if matched node count is more than expected maximum count" do
           expect do
             expect("<h1>Text</h1><h1>Text</h1><h1>Text</h1>").to have_css('h1', maximum: 2)
-          end.to raise_error('expected to find css "h1" at most 2 times, found 3 matches: "Text", "Text", "Text"')
+          end.to raise_error('expected to find visible css "h1" at most 2 times, found 3 matches: "Text", "Text", "Text"')
         end
 
         it "fails if matched node count does not belong to expected range" do
           expect do
             expect("<h1>Text</h1>").to have_css('h1', between: 2..3)
-          end.to raise_error("expected to find css \"h1\" between 2 and 3 times, found 1 match: \"Text\"")
+          end.to raise_error("expected to find visible css \"h1\" between 2 and 3 times, found 1 match: \"Text\"")
         end
 
       end
@@ -63,7 +64,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
         it "fails if has_no_css? returns false" do
           expect do
             expect("<h1>Text</h1>").not_to have_css('h1')
-          end.to raise_error(/expected not to find css "h1"/)
+          end.to raise_error(/expected not to find visible css "h1"/)
         end
 
         it "passes if matched node count does not equal expected count" do
@@ -73,7 +74,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
         it "fails if matched node count equals expected count" do
           expect do
             expect("<h1>Text</h1>").not_to have_css('h1', count: 1)
-          end.to raise_error(/expected not to find css "h1"/)
+          end.to raise_error(/expected not to find visible css "h1"/)
         end
       end
 
@@ -96,7 +97,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
         it "fails if has_css? returns false" do
           expect do
             expect(page).to have_css('h1#doesnotexist')
-          end.to raise_error(/expected to find css "h1#doesnotexist" but there were no matches/)
+          end.to raise_error(/expected to find visible css "h1#doesnotexist" but there were no matches/)
         end
       end
 
@@ -108,7 +109,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
         it "fails if has_no_css? returns false" do
           expect do
             expect(page).not_to have_css('h1')
-          end.to raise_error(/expected not to find css "h1"/)
+          end.to raise_error(/expected not to find visible css "h1"/)
         end
       end
     end
@@ -116,7 +117,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
 
   describe "have_xpath matcher" do
     it "gives proper description" do
-      expect(have_xpath('//h1').description).to eq("have xpath \"\/\/h1\"")
+      expect(have_xpath('//h1').description).to eq("have visible xpath \"\/\/h1\"")
     end
 
     context "on a string" do
@@ -128,7 +129,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
         it "fails if has_xpath? returns false" do
           expect do
             expect("<h1>Text</h1>").to have_xpath('//h2')
-          end.to raise_error(%r(expected to find xpath "//h2" but there were no matches))
+          end.to raise_error(%r(expected to find visible xpath "//h2" but there were no matches))
         end
       end
 
@@ -140,7 +141,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
         it "fails if has_no_xpath? returns false" do
           expect do
             expect("<h1>Text</h1>").not_to have_xpath('//h1')
-          end.to raise_error(%r(expected not to find xpath "//h1"))
+          end.to raise_error(%r(expected not to find visible xpath "//h1"))
         end
       end
 
@@ -163,7 +164,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
         it "fails if has_xpath? returns false" do
           expect do
             expect(page).to have_xpath("//h1[@id='doesnotexist']")
-          end.to raise_error(%r(expected to find xpath "//h1\[@id='doesnotexist'\]" but there were no matches))
+          end.to raise_error(%r(expected to find visible xpath "//h1\[@id='doesnotexist'\]" but there were no matches))
         end
       end
 
@@ -175,7 +176,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
         it "fails if has_no_xpath? returns false" do
           expect do
             expect(page).not_to have_xpath('//h1')
-          end.to raise_error(%r(expected not to find xpath "//h1"))
+          end.to raise_error(%r(expected not to find visible xpath "//h1"))
         end
       end
     end
@@ -185,7 +186,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     it "gives proper description" do
       matcher = have_selector('//h1')
       expect("<h1>Text</h1>").to matcher
-      expect(matcher.description).to eq("have xpath \"//h1\"")
+      expect(matcher.description).to eq("have visible xpath \"//h1\"")
     end
 
     context "on a string" do
@@ -197,7 +198,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
         it "fails if has_selector? returns false" do
           expect do
             expect("<h1>Text</h1>").to have_selector('//h2')
-          end.to raise_error(%r(expected to find xpath "//h2" but there were no matches))
+          end.to raise_error(%r(expected to find visible xpath "//h2" but there were no matches))
         end
       end
 
@@ -209,7 +210,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
         it "fails if has_no_selector? returns false" do
           expect do
             expect("<h1>Text</h1>").not_to have_selector(:css, 'h1')
-          end.to raise_error(%r(expected not to find css "h1"))
+          end.to raise_error(%r(expected not to find visible css "h1"))
         end
       end
     end
@@ -227,13 +228,13 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
         it "fails if has_selector? returns false" do
           expect do
             expect(page).to have_selector("//h1[@id='doesnotexist']")
-          end.to raise_error(%r(expected to find xpath "//h1\[@id='doesnotexist'\]" but there were no matches))
+          end.to raise_error(%r(expected to find visible xpath "//h1\[@id='doesnotexist'\]" but there were no matches))
         end
 
         it "includes text in error message" do
           expect do
             expect(page).to have_selector("//h1", text: 'wrong text')
-          end.to raise_error(%r(expected to find xpath "//h1" with text "wrong text" but there were no matches))
+          end.to raise_error(%r(expected to find visible xpath "//h1" with text "wrong text" but there were no matches))
         end
       end
 
@@ -245,7 +246,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
         it "fails if has_no_selector? returns false" do
           expect do
             expect(page).not_to have_selector(:css, 'h1', text: 'test')
-          end.to raise_error(%r(expected not to find css "h1" with text "test"))
+          end.to raise_error(%r(expected not to find visible css "h1" with text "test"))
         end
       end
     end
@@ -483,7 +484,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     let(:html) { '<a href="#">Just a link</a><a href="#">Another link</a>' }
 
     it "gives proper description" do
-      expect(have_link('Just a link').description).to eq("have link \"Just a link\"")
+      expect(have_link('Just a link').description).to eq("have visible link \"Just a link\"")
     end
 
     it "passes if there is such a button" do
@@ -493,7 +494,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     it "fails if there is no such button" do
       expect do
         expect(html).to have_link('No such Link')
-      end.to raise_error(/expected to find link "No such Link"/)
+      end.to raise_error(/expected to find visible link "No such Link"/)
     end
 
     it "supports compounding" do
@@ -617,7 +618,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     let(:html) { '<button>A button</button><input type="submit" value="Another button"/>' }
 
     it "gives proper description" do
-      expect(have_button('A button').description).to eq("have button \"A button\"")
+      expect(have_button('A button').description).to eq("have visible button \"A button\"")
     end
 
     it "passes if there is such a button" do
@@ -627,7 +628,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     it "fails if there is no such button" do
       expect do
         expect(html).to have_button('No such Button')
-      end.to raise_error(/expected to find button "No such Button"/)
+      end.to raise_error(/expected to find visible button "No such Button"/)
     end
 
     it "supports compounding" do
@@ -639,11 +640,11 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     let(:html) { '<p><label>Text field<input type="text" value="some value"/></label></p>' }
 
     it "gives proper description" do
-      expect(have_field('Text field').description).to eq("have field \"Text field\"")
+      expect(have_field('Text field').description).to eq("have visible field \"Text field\" that is not disabled")
     end
 
     it "gives proper description for a given value" do
-      expect(have_field('Text field', with: 'some value').description).to eq("have field \"Text field\" with value \"some value\"")
+      expect(have_field('Text field', with: 'some value').description).to eq("have visible field \"Text field\" that is not disabled with value \"some value\"")
     end
 
     it "passes if there is such a field" do
@@ -657,13 +658,13 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     it "fails if there is no such field" do
       expect do
         expect(html).to have_field('No such Field')
-      end.to raise_error(/expected to find field "No such Field"/)
+      end.to raise_error(/expected to find visible field "No such Field"/)
     end
 
     it "fails if there is such field but with false value" do
       expect do
         expect(html).to have_field('Text field', with: 'false value')
-      end.to raise_error(/expected to find field "Text field"/)
+      end.to raise_error(/expected to find visible field "Text field"/)
     end
 
     it "treats a given value as a string" do
@@ -687,7 +688,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     end
 
     it "gives proper description" do
-      expect(have_checked_field('it is checked').description).to eq("have field \"it is checked\" that is checked")
+      expect(have_checked_field('it is checked').description).to eq("have visible field \"it is checked\" that is checked and not disabled")
     end
 
     context "with should" do
@@ -698,13 +699,13 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
       it "fails if there is such a field but it is not checked" do
         expect do
           expect(html).to have_checked_field('unchecked field')
-        end.to raise_error(/expected to find field "unchecked field"/)
+        end.to raise_error(/expected to find visible field "unchecked field"/)
       end
 
       it "fails if there is no such field" do
         expect do
           expect(html).to have_checked_field('no such field')
-        end.to raise_error(/expected to find field "no such field"/)
+        end.to raise_error(/expected to find visible field "no such field"/)
       end
     end
 
@@ -712,7 +713,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
       it "fails if there is such a field and it is checked" do
         expect do
           expect(html).not_to have_checked_field('it is checked')
-        end.to raise_error(/expected not to find field "it is checked"/)
+        end.to raise_error(/expected not to find visible field "it is checked"/)
       end
 
       it "passes if there is such a field but it is not checked" do
@@ -736,7 +737,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     end
 
     it "gives proper description" do
-      expect(have_unchecked_field('unchecked field').description).to eq("have field \"unchecked field\" that is not checked")
+      expect(have_unchecked_field('unchecked field').description).to eq("have visible field \"unchecked field\" that is not checked and not disabled")
     end
 
     context "with should" do
@@ -747,13 +748,13 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
       it "fails if there is such a field but it is checked" do
         expect do
           expect(html).to have_unchecked_field('it is checked')
-        end.to raise_error(/expected to find field "it is checked"/)
+        end.to raise_error(/expected to find visible field "it is checked"/)
       end
 
       it "fails if there is no such field" do
         expect do
           expect(html).to have_unchecked_field('no such field')
-        end.to raise_error(/expected to find field "no such field"/)
+        end.to raise_error(/expected to find visible field "no such field"/)
       end
     end
 
@@ -761,7 +762,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
       it "fails if there is such a field and it is not checked" do
         expect do
           expect(html).not_to have_unchecked_field('unchecked field')
-        end.to raise_error(/expected not to find field "unchecked field"/)
+        end.to raise_error(/expected not to find visible field "unchecked field"/)
       end
 
       it "passes if there is such a field but it is checked" do
@@ -782,11 +783,11 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     let(:html) { '<label>Select Box<select></select></label>' }
 
     it "gives proper description" do
-      expect(have_select('Select Box').description).to eq("have select box \"Select Box\"")
+      expect(have_select('Select Box').description).to eq("have visible select box \"Select Box\" that is not disabled")
     end
 
     it "gives proper description for a given selected value" do
-      expect(have_select('Select Box', selected: 'some value').description).to eq("have select box \"Select Box\" with \"some value\" selected")
+      expect(have_select('Select Box', selected: 'some value').description).to eq('have visible select box "Select Box" that is not disabled with "some value" selected')
     end
 
     it "passes if there is such a select" do
@@ -796,7 +797,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     it "fails if there is no such select" do
       expect do
         expect(html).to have_select('No such Select box')
-      end.to raise_error(/expected to find select box "No such Select box"/)
+      end.to raise_error(/expected to find visible select box "No such Select box"/)
     end
 
     it "supports compounding" do
@@ -808,7 +809,14 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     let(:html) { '<table><caption>Lovely table</caption></table>' }
 
     it "gives proper description" do
-      expect(have_table('Lovely table').description).to eq("have table \"Lovely table\"")
+      expect(have_table('Lovely table').description).to eq("have visible table \"Lovely table\"")
+    end
+
+    it "gives proper description when :visible option passed" do
+      expect(have_table('Lovely table', visible: true).description).to eq("have visible table \"Lovely table\"")
+      expect(have_table('Lovely table', visible: :hidden).description).to eq("have non-visible table \"Lovely table\"")
+      expect(have_table('Lovely table', visible: :all).description).to eq("have table \"Lovely table\"")
+      expect(have_table('Lovely table', visible: false).description).to eq("have table \"Lovely table\"")
     end
 
     it "passes if there is such a select" do
@@ -818,11 +826,107 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     it "fails if there is no such select" do
       expect do
         expect(html).to have_table('No such Table')
-      end.to raise_error(/expected to find table "No such Table"/)
+      end.to raise_error(/expected to find visible table "No such Table"/)
     end
 
     it "supports compounding" do
       expect(html).to have_table('nope').or have_table('Lovely table')
     end if RSpec::Version::STRING.to_f >= 3.0
   end
+
+  if RSpec::Version::STRING.to_f >= 3.0
+    context "compounding", requires: [:js] do
+      before(:each) do
+        @session = session
+        @session.visit('/with_js')
+        @el = @session.find(:css, '#reload-me')
+      end
+
+      context "#and" do
+        it "should run 'concurrently'" do
+          Capybara.using_wait_time(2) do
+            matcher = have_text('this is not there').and have_text('neither is this')
+            expect(Benchmark.realtime do
+              expect {
+                expect(@el).to matcher
+              }.to raise_error RSpec::Expectations::ExpectationNotMetError
+            end).to be_between(2,3)
+          end
+        end
+
+        it "should run 'concurrently' and retry" do
+          @session.click_link('reload-link')
+          @session.using_wait_time(2) do
+            expect(Benchmark.realtime do
+              expect {
+                expect(@el).to have_text('waiting to be reloaded').and(have_text('has been reloaded'))
+              }.to raise_error RSpec::Expectations::ExpectationNotMetError, /expected to find text "waiting to be reloaded" in "has been reloaded"/
+            end).to be_between(2,3)
+          end
+        end
+
+        it "should ignore :wait options" do
+          @session.using_wait_time(2) do
+            matcher = have_text('this is not there', wait: 5).and have_text('neither is this', wait: 6)
+            expect(Benchmark.realtime do
+              expect {
+                expect(@el).to matcher
+              }.to raise_error RSpec::Expectations::ExpectationNotMetError
+            end).to be_between(2,3)
+          end
+        end
+
+        it "should work on the session" do
+          @session.using_wait_time(2) do
+            @session.click_link('reload-link')
+            expect(@session).to have_selector(:css, 'h1', text: 'FooBar').and have_text('has been reloaded')
+          end
+        end
+      end
+
+      context "#and_then" do
+        it "should run sequentially" do
+          @session.click_link('reload-link')
+          expect(@el).to have_text('waiting to be reloaded').and_then have_text('has been reloaded')
+        end
+      end
+
+      context "#or" do
+        it "should run 'concurrently'" do
+          @session.using_wait_time(3) do
+            expect(Benchmark.realtime do
+              expect(@el).to have_text('has been reloaded').or have_text('waiting to be reloaded')
+            end).to be < 1
+          end
+        end
+
+        it "should retry" do
+          @session.using_wait_time(3) do
+            expect(Benchmark.realtime do
+              expect {
+                expect(@el).to have_text('has been reloaded').or have_text('random stuff')
+              }.to raise_error RSpec::Expectations::ExpectationNotMetError
+            end).to be > 3
+          end
+        end
+
+        it "should ignore :wait options" do
+          @session.using_wait_time(2) do
+            expect(Benchmark.realtime do
+              expect {
+                expect(@el).to have_text('this is not there', wait: 10).or have_text('neither is this', wait: 15)
+              }.to raise_error RSpec::Expectations::ExpectationNotMetError
+            end).to be_between(2,3)
+          end
+        end
+
+        it "should work on the session" do
+          @session.using_wait_time(2) do
+            @session.click_link('reload-link')
+            expect(@session).to have_selector(:css, 'h1', text: 'Not on the page').or have_text('has been reloaded')
+          end
+        end
+      end
+    end
+  end
 end