capybara 2.18.0 → 3.0.0.rc1

data/spec/rspec/scenarios_spec.rb

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'capybara/rspec'
 
-RSpec.configuration.before(:each, { file_path: "./spec/rspec/scenarios_spec.rb" } ) do
+RSpec.configuration.before(:each, file_path: "./spec/rspec/scenarios_spec.rb") do
   @in_filtered_hook = true
 end
 
-if RSpec::Core::Version::STRING.to_f >= 3.0
-  feature "if fscenario aliases focused tag then" do
-    fscenario "scenario should have focused meta tag" do |example|
-      expect(example.metadata[:focus]).to eq true
-    end
+feature "if fscenario aliases focused tag then" do
+  fscenario "scenario should have focused meta tag" do |example|
+    expect(example.metadata[:focus]).to eq true
   end
 end
 
@@ -18,4 +17,3 @@ feature "if xscenario aliases to pending then" do
   xscenario "this test should be 'temporarily disabled with xscenario'" do
   end
 end
-

data/spec/rspec/shared_spec_matchers.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'capybara/dsl'
 require 'capybara/rspec/matchers'
 require 'benchmark'
 
-RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
-
+RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
   include Capybara::DSL
   include Capybara::RSpecMatchers
 
@@ -53,7 +53,6 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
             expect("<h1>Text</h1>").to have_css('h1', between: 2..3)
           end.to raise_error("expected to find visible css \"h1\" between 2 and 3 times, found 1 match: \"Text\"")
         end
-
       end
 
       context "with should_not" do
@@ -81,7 +80,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
       it "supports compounding" do
         expect("<h1>Text</h1><h2>Text</h2>").to have_css('h1').and have_css('h2')
         expect("<h1>Text</h1><h2>Text</h2>").to have_css('h3').or have_css('h1')
-      end if RSpec::Version::STRING.to_f >= 3.0
+      end
     end
 
     context "on a page or node" do
@@ -129,7 +128,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 visible 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
 
@@ -141,14 +140,14 @@ 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 visible xpath "//h1"))
+          end.to raise_error(%r{expected not to find visible xpath "//h1"})
         end
       end
 
       it "supports compounding" do
         expect("<h1>Text</h1><h2>Text</h2>").to have_xpath('//h1').and have_xpath('//h2')
         expect("<h1>Text</h1><h2>Text</h2>").to have_xpath('//h3').or have_xpath('//h1')
-      end if RSpec::Version::STRING.to_f >= 3.0
+      end
     end
 
     context "on a page or node" do
@@ -164,7 +163,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 visible 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
 
@@ -176,7 +175,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 visible xpath "//h1"))
+          end.to raise_error(%r{expected not to find visible xpath "//h1"})
         end
       end
     end
@@ -198,7 +197,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 visible 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
 
@@ -210,7 +209,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 visible css "h1"))
+          end.to raise_error(%r{expected not to find visible css "h1"})
         end
       end
     end
@@ -228,13 +227,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 visible 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 visible 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
 
@@ -246,7 +245,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 visible css "h1" with text "test"))
+          end.to raise_error(%r{expected not to find visible css "h1" with text "test"})
         end
       end
     end
@@ -254,7 +253,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     it "supports compounding" do
       expect("<h1>Text</h1><h2>Text</h2>").to have_selector('//h1').and have_selector('//h2')
       expect("<h1>Text</h1><h2>Text</h2>").to have_selector('//h3').or have_selector('//h1')
-    end if RSpec::Version::STRING.to_f >= 3.0
+    end
   end
 
   describe "have_content matcher" do
@@ -343,7 +342,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     it "supports compounding" do
       expect("<h1>Text</h1><h2>And</h2>").to have_content('Text').and have_content('And')
       expect("<h1>Text</h1><h2>Or</h2>").to have_content('XYZ').or have_content('Or')
-    end if RSpec::Version::STRING.to_f >= 3.0
+    end
   end
 
   describe "have_text matcher" do
@@ -477,7 +476,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     it "supports compounding" do
       expect("<h1>Text</h1><h2>And</h2>").to have_text('Text').and have_text('And')
       expect("<h1>Text</h1><h2>Or</h2>").to have_text('Not here').or have_text('Or')
-    end if RSpec::Version::STRING.to_f >= 3.0
+    end
   end
 
   describe "have_link matcher" do
@@ -500,7 +499,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     it "supports compounding" do
       expect(html).to have_link('Just a link').and have_link('Another link')
       expect(html).to have_link('Not a link').or have_link('Another link')
-    end if RSpec::Version::STRING.to_f >= 3.0
+    end
   end
 
   describe "have_title matcher" do
@@ -565,7 +564,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
 
     it "supports compounding" do
       expect("<title>I compound</title>").to have_title('I dont compound').or have_title('I compound')
-    end if RSpec::Version::STRING.to_f >= 3.0
+    end
   end
 
   describe "have_current_path matcher" do
@@ -611,7 +610,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
     it "supports compounding" do
       visit('/with_html')
       expect(page).to have_current_path('/not_with_html').or have_current_path('/with_html')
-    end if RSpec::Version::STRING.to_f >= 3.0
+    end
   end
 
   describe "have_button matcher" do
@@ -633,7 +632,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
 
     it "supports compounding" do
       expect(html).to have_button('Not this button').or have_button('A button')
-    end if RSpec::Version::STRING.to_f >= 3.0
+    end
   end
 
   describe "have_field matcher" do
@@ -678,7 +677,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
 
     it "supports compounding" do
       expect(html).to have_field('Not this one').or have_field('Text field')
-    end if RSpec::Version::STRING.to_f >= 3.0
+    end
   end
 
   describe "have_checked_field matcher" do
@@ -727,7 +726,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
 
     it "supports compounding" do
       expect(html).to have_checked_field('not this one').or have_checked_field('it is checked')
-    end if RSpec::Version::STRING.to_f >= 3.0
+    end
   end
 
   describe "have_unchecked_field matcher" do
@@ -776,7 +775,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
 
     it "supports compounding" do
       expect(html).to have_unchecked_field('it is checked').or have_unchecked_field('unchecked field')
-    end if RSpec::Version::STRING.to_f >= 3.0
+    end
   end
 
   describe "have_select matcher" do
@@ -802,7 +801,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
 
     it "supports compounding" do
       expect(html).to have_select('Not this one').or have_select('Select Box')
-    end if RSpec::Version::STRING.to_f >= 3.0
+    end
   end
 
   describe "have_table matcher" do
@@ -831,100 +830,98 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, mode|
 
     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
   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
+  context "compounding", requires: [:js] do
+    before(:each) do
+      @session = session
+      @session.visit('/with_js')
+      @el = @session.find(:css, '#reload-me')
+    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
+    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 do
+              expect(@el).to matcher
+            end.to raise_error RSpec::Expectations::ExpectationNotMetError
+          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
+      it "should run 'concurrently' and retry" do
+        @session.click_link('reload-link')
+        @session.using_wait_time(2) do
+          expect(Benchmark.realtime do
+            expect do
+              expect(@el).to have_text('waiting to be reloaded').and(have_text('has been reloaded'))
+            end.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 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
+      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 do
+              expect(@el).to matcher
+            end.to raise_error RSpec::Expectations::ExpectationNotMetError
+          end).to be_between(2, 3)
         end
       end
 
-      context "#and_then" do
-        it "should run sequentially" do
+      it "should work on the session" do
+        @session.using_wait_time(2) do
           @session.click_link('reload-link')
-          expect(@el).to have_text('waiting to be reloaded').and_then have_text('has been reloaded')
+          expect(@session).to have_selector(:css, 'h1', text: 'FooBar').and have_text('has been reloaded')
         end
       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
+    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
+      it "should retry" do
+        @session.using_wait_time(3) do
+          expect(Benchmark.realtime do
+            expect do
+              expect(@el).to have_text('has been reloaded').or have_text('random stuff')
+            end.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
+      it "should ignore :wait options" do
+        @session.using_wait_time(2) do
+          expect(Benchmark.realtime do
+            expect do
+              expect(@el).to have_text('this is not there', wait: 10).or have_text('neither is this', wait: 15)
+            end.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
+      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

data/spec/rspec/views_spec.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe "capybara/rspec", type: :view do
   it "allows matchers to be used on strings" do
-    expect(%{<h1>Test header</h1>}).to have_css("h1", text: "Test header")
+    expect(%(<h1>Test header</h1>)).to have_css("h1", text: "Test header")
   end
 
   it "doesn't include RSpecMatcherProxies" do

data/spec/rspec_matchers_spec.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
-RSpec.describe 'Capybara RSpec Matchers', :type => :feature do
+RSpec.describe 'Capybara RSpec Matchers', type: :feature do
   context "after called on session" do
     it "HaveSelector should allow getting a description of the matcher" do
       visit('/with_html')
@@ -16,6 +17,18 @@ RSpec.describe 'Capybara RSpec Matchers', :type => :feature do
       expect(page).to matcher
       expect { matcher.description }.not_to raise_error
     end
+
+    it "should produce the same error for .to have_no_xxx and .not_to have_xxx" do
+      visit('/with_html')
+      not_to_msg = error_msg_for { expect(page).not_to have_selector(:css, '#referrer') }
+      have_no_msg = error_msg_for { expect(page).to have_no_selector(:css, '#referrer') }
+      expect(not_to_msg).to eq have_no_msg
+
+      not_to_msg = error_msg_for { expect(page).not_to have_text('This is a test') }
+      have_no_msg = error_msg_for { expect(page).to have_no_text('This is a test') }
+      puts not_to_msg
+      expect(not_to_msg).to eq have_no_msg
+    end
   end
 
   context "after called on element" do
@@ -43,4 +56,8 @@ RSpec.describe 'Capybara RSpec Matchers', :type => :feature do
       expect { matcher.description }.not_to raise_error
     end
   end
-end
+
+  def error_msg_for(&block)
+    expect(&block).to(raise_error { |e| return e.message })
+  end
+end