capybara 2.18.0 → 3.0.0

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,17 @@ 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') }
+      expect(not_to_msg).to eq have_no_msg
+    end
   end
 
   context "after called on element" do
@@ -43,4 +55,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

data/spec/rspec_spec.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
-RSpec.describe 'capybara/rspec', :type => :feature do
+RSpec.describe 'capybara/rspec', type: :feature do
   it "should include Capybara in rspec" do
     visit('/foo')
     expect(page.body).to include('Another World')
@@ -37,21 +38,20 @@ RSpec.describe 'capybara/rspec', :type => :feature do
     expect(Capybara.current_driver).to eq(Capybara.javascript_driver)
   end
 
-  it "switches to the given driver when giving it as metadata", :driver => :culerity do
+  it "switches to the given driver when giving it as metadata", driver: :culerity do
     expect(Capybara.current_driver).to eq(:culerity)
   end
 
   context "#all" do
     it "allows access to the Capybara finder" do
       visit('/with_html')
-      expect(all(:css, 'h2.head').size).to eq(5)
+      found = all(:css, 'h2') { |element| element[:class] == 'head' }
+      expect(found.size).to eq(5)
     end
 
     it "allows access to the RSpec matcher" do
-      skip "RSpec < 3 doesn't have an `all` matcher" if rspec2?
-
       visit('/with_html')
-      expect(["test1", "test2"]).to all(be_a(String))
+      expect(%w[test1 test2]).to all(be_a(String))
     end
   end
 
@@ -64,7 +64,6 @@ RSpec.describe 'capybara/rspec', :type => :feature do
     end
 
     it "allows access to the RSpec matcher" do
-      skip "RSpec version doesn't have a 'within' matcher" unless ::RSpec::Matchers.instance_methods.include?(:within)
       visit('/with_html')
       # This reads terribly, but must call #within
       expect(find(:css, 'span.number').text.to_i).to within(1).of(41)
@@ -72,15 +71,15 @@ RSpec.describe 'capybara/rspec', :type => :feature do
   end
 end
 
-RSpec.describe 'capybara/rspec', :type => :other do
+RSpec.describe 'capybara/rspec', type: :other do
   context "when RSpec::Matchers is included after Capybara::DSL" do
     before do
-      class DSL_MatchersTest
+      class DSLMatchersTest
         include Capybara::DSL
         include RSpec::Matchers
       end
 
-      @test_class_instance = DSL_MatchersTest.new
+      @test_class_instance = DSLMatchersTest.new
     end
 
     context "#all" do
@@ -90,10 +89,8 @@ RSpec.describe 'capybara/rspec', :type => :other do
       end
 
       it "allows access to the RSpec matcher" do
-        skip "RSpec < 3 doesn't have an `all` matcher" if rspec2?
-
         @test_class_instance.visit('/with_html')
-        expect(["test1", "test2"]).to @test_class_instance.all(be_a(String))
+        expect(%w[test1 test2]).to @test_class_instance.all(be_a(String))
       end
     end
 
@@ -106,7 +103,6 @@ RSpec.describe 'capybara/rspec', :type => :other do
       end
 
       it "allows access to the RSpec matcher" do
-        skip "RSpec version doesn't have a 'within' matcher" unless ::RSpec::Matchers.instance_methods.include?(:within)
         @test_class_instance.visit('/with_html')
         # This reads terribly, but must call #within
         expect(@test_class_instance.find(:css, 'span.number').text.to_i).to @test_class_instance.within(1).of(41)
@@ -115,7 +111,7 @@ RSpec.describe 'capybara/rspec', :type => :other do
   end
 end
 
-RSpec.describe 'capybara/rspec', :type => :other do
+RSpec.describe 'capybara/rspec', type: :other do
   it "should not include Capybara" do
     expect { visit('/') }.to raise_error(NoMethodError)
   end

data/spec/selector_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Capybara do
@@ -56,7 +57,7 @@ RSpec.describe Capybara do
       it "can set default visiblity" do
         Capybara.add_selector :hidden_field do
           visible :hidden
-          css { |sel| 'input[type="hidden"]' }
+          css { |_sel| 'input[type="hidden"]' }
         end
 
         expect(string).to have_no_css('input[type="hidden"]')
@@ -77,7 +78,7 @@ RSpec.describe Capybara do
 
       it "doesn't change existing filters" do
         Capybara.modify_selector :custom_selector do
-          css { |css_class| "p.#{css_class}"}
+          css { |css_class| "p.#{css_class}" }
         end
         expect(string).to have_selector(:custom_selector, 'b', count: 1)
         expect(string).to have_selector(:custom_selector, 'b', not_empty: false, count: 1)
@@ -92,7 +93,7 @@ RSpec.describe Capybara do
             field: ".//*[self::input | self::textarea | self::select][not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]",
             fieldset: ".//fieldset",
             link: ".//a[./@href]",
-            link_or_button: ".//a[./@href] | .//input[./@type = 'submit' or ./@type = 'reset' or ./@type = 'image' or ./@type = 'button'] | .//button" ,
+            link_or_button: ".//a[./@href] | .//input[./@type = 'submit' or ./@type = 'reset' or ./@type = 'image' or ./@type = 'button'] | .//button",
             fillable_field: ".//*[self::input | self::textarea][not(./@type = 'submit' or ./@type = 'image' or ./@type = 'radio' or ./@type = 'checkbox' or ./@type = 'hidden' or ./@type = 'file')]",
             radio_button: ".//input[./@type = 'radio']",
             checkbox: ".//input[./@type = 'checkbox']",
@@ -102,7 +103,7 @@ RSpec.describe Capybara do
             table: ".//table"
           }
           selectors.each do |selector, xpath|
-            results = string.all(selector,nil).to_a.map(&:native)
+            results = string.all(selector, nil).to_a.map(&:native)
             expect(results.size).to be > 0
             expect(results).to eq string.all(:xpath, xpath).to_a.map(&:native)
           end
@@ -116,7 +117,6 @@ RSpec.describe Capybara do
         end
 
         it "works with 'special' characters" do
-          skip "We support old Nokogiris but they have their limits" if Gem::Version.new(Nokogiri::VERSION) < Gem::Version.new('1.6.8')
           expect(string.find(:custom_css_selector, "div", id: "#special")[:id]).to eq '#special'
           expect(string.find(:custom_css_selector, "input", id: "2checkbox")[:id]).to eq '2checkbox'
         end
@@ -129,7 +129,6 @@ RSpec.describe Capybara do
         end
 
         it "works with 'special' characters" do
-          skip "We support old Nokogiris but they have their limits" if Gem::Version.new(Nokogiri::VERSION) < Gem::Version.new('1.6.8')
           expect(string.find(:custom_css_selector, "input", class: ".special")[:id]).to eq 'file'
           expect(string.find(:custom_css_selector, "input", class: "2checkbox")[:id]).to eq '2checkbox'
         end

data/spec/selenium_spec_chrome.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
+require 'rspec/shared_spec_matchers'
 
-CHROME_DRIVER = if ENV['HEADLESS'] then :selenium_chrome_headless else :selenium_chrome end
+CHROME_DRIVER = ENV['HEADLESS'] ? :selenium_chrome_headless : :selenium_chrome
 
 # if ENV['HEADLESS'] && ENV['TRAVIS']
 #   Selenium::WebDriver::Chrome.path='/usr/bin/google-chrome-beta'
@@ -12,7 +14,7 @@ CHROME_DRIVER = if ENV['HEADLESS'] then :selenium_chrome_headless else :selenium
 Capybara.register_driver :selenium_chrome_clear_storage do |app|
   chrome_options = {
     browser: :chrome,
-    options: ::Selenium::WebDriver::Chrome::Options.new()
+    options: ::Selenium::WebDriver::Chrome::Options.new
   }
   chrome_options[:options].args << 'headless' if ENV['HEADLESS']
   Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: true, clear_session_storage: true))
@@ -22,15 +24,18 @@ module TestSessions
   Chrome = Capybara::Session.new(CHROME_DRIVER, TestApp)
 end
 
-skipped_tests = [:response_headers, :status_code, :trigger]
+skipped_tests = %i[response_headers status_code trigger]
 # skip window tests when headless for now - closing a window not supported by chromedriver/chrome
-skipped_tests << :windows if ENV['TRAVIS']  && (ENV['SKIP_WINDOW'] || ENV['HEADLESS'])
+skipped_tests << :windows if ENV['TRAVIS'] && (ENV['SKIP_WINDOW'] || ENV['HEADLESS'])
+
+$stdout.puts `#{Selenium::WebDriver::Chrome.driver_path} --version` if ENV['CI']
 
 Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybara_skip: skipped_tests
 
 RSpec.describe "Capybara::Session with chrome" do
   include Capybara::SpecHelper
   include_examples  "Capybara::Session", TestSessions::Chrome, CHROME_DRIVER
+  include_examples  Capybara::RSpecMatchers, TestSessions::Chrome, CHROME_DRIVER
 
   context "storage" do
     describe "#reset!" do

data/spec/selenium_spec_edge.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require "selenium-webdriver"
+require 'shared_selenium_session'
+require 'rspec/shared_spec_matchers'
+
+Capybara.register_driver :selenium_edge do |app|
+  # ::Selenium::WebDriver.logger.level = "debug"
+  Capybara::Selenium::Driver.new(app, browser: :edge)
+end
+
+module TestSessions
+  SeleniumEdge = Capybara::Session.new(:selenium_edge, TestApp)
+end
+
+skipped_tests = %i[response_headers status_code trigger modals]
+
+$stdout.puts `#{Selenium::WebDriver::Edge.driver_path} --version` if ENV['CI']
+
+Capybara::SpecHelper.run_specs TestSessions::SeleniumEdge, "selenium", capybara_skip: skipped_tests
+
+RSpec.describe "Capybara::Session with Edge", capybara_skip: skipped_tests do
+  include Capybara::SpecHelper
+  include_examples  "Capybara::Session", TestSessions::SeleniumEdge, :selenium_edge
+  include_examples  Capybara::RSpecMatchers, TestSessions::SeleniumEdge, :selenium_edge
+end