capybara 2.18.0 → 3.0.0.rc1

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#has_button?' do
   before do
     @session.visit('/form')
@@ -7,7 +8,7 @@ Capybara::SpecHelper.spec '#has_button?' do
   it "should be true if the given button is on the page" do
     expect(@session).to have_button('med')
     expect(@session).to have_button('crap321')
-    expect(@session).to have_button(:'crap321')
+    expect(@session).to have_button(:crap321)
   end
 
   it "should be true for disabled buttons if disabled: true" do

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#has_css?' do
   before do
     @session.visit('/with_html')
@@ -36,7 +37,7 @@ Capybara::SpecHelper.spec '#has_css?' do
     end
 
     it "should be false if the content occurs more or fewer times than range" do
-      expect(@session).not_to have_css("p", between: 6..11 )
+      expect(@session).not_to have_css("p", between: 6..11)
       expect(@session).not_to have_css("p a#foo", between: 4..7)
       expect(@session).not_to have_css("p a.doesnotexist", between: 3..8)
     end
@@ -162,7 +163,7 @@ Capybara::SpecHelper.spec '#has_no_css?' do
     end
 
     it "should be true if the content occurs more or fewer times than range" do
-      expect(@session).to have_no_css("p", between: 6..11 )
+      expect(@session).to have_no_css("p", between: 6..11)
       expect(@session).to have_no_css("p a#foo", between: 4..7)
       expect(@session).to have_no_css("p a.doesnotexist", between: 3..8)
     end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#has_current_path?' do
   before do
     @session.visit('/with_js')
@@ -65,7 +66,7 @@ Capybara::SpecHelper.spec '#has_current_path?' do
 
   it "should default to full url if value is a url" do
     url = @session.current_url
-    expect(url).to match /with_js$/
+    expect(url).to match(/with_js$/)
     expect(@session).to have_current_path(url)
     expect(@session).not_to have_current_path("http://www.not_example.com/with_js")
   end
@@ -73,36 +74,24 @@ Capybara::SpecHelper.spec '#has_current_path?' do
   it "should ignore the query" do
     @session.visit('/with_js?test=test')
     expect(@session).to have_current_path('/with_js?test=test')
-    expect(@session).to have_current_path('/with_js', only_path: true)
     expect(@session).to have_current_path('/with_js', ignore_query: true)
     uri = ::Addressable::URI.parse(@session.current_url)
     uri.query = nil
     expect(@session).to have_current_path(uri.to_s, ignore_query: true)
   end
 
-  it "should not allow url and only_path at the same time" do
-    expect {
-      expect(@session).to have_current_path('/with_js', url: true, only_path: true)
-    }.to raise_error ArgumentError
-  end
-
   it "should not raise an exception if the current_url is nil" do
     allow_any_instance_of(Capybara::Session).to receive(:current_url) { nil }
 
-    # Without only_path option
-    expect {
+    # Without ignore_query option
+    expect do
       expect(@session).to have_current_path(nil)
-    }.not_to raise_exception
-
-    # With only_path option
-    expect {
-      expect(@session).to have_current_path(nil, only_path: true)
-    }.not_to raise_exception
+    end.not_to raise_exception
 
     # With ignore_query option
-    expect {
+    expect do
       expect(@session).to have_current_path(nil, ignore_query: true)
-    }.not_to raise_exception
+    end.not_to raise_exception
   end
 end
 
@@ -134,19 +123,14 @@ Capybara::SpecHelper.spec '#has_no_current_path?' do
   it "should not raise an exception if the current_url is nil" do
     allow_any_instance_of(Capybara::Session).to receive(:current_url) { nil }
 
-    # Without only_path option
-    expect {
+    # Without ignore_query option
+    expect do
       expect(@session).not_to have_current_path('/with_js')
-    }. not_to raise_exception
-
-    # With only_path option
-    expect {
-      expect(@session).not_to have_current_path('/with_js', only_path: true)
-    }. not_to raise_exception
+    end. not_to raise_exception
 
     # With ignore_query option
-    expect {
+    expect do
       expect(@session).not_to have_current_path('/with_js', ignore_query: true)
-    }. not_to raise_exception
+    end. not_to raise_exception
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#has_field' do
   before { @session.visit('/form') }
 
@@ -6,7 +7,7 @@ Capybara::SpecHelper.spec '#has_field' do
     expect(@session).to have_field('Dog')
     expect(@session).to have_field('form_description')
     expect(@session).to have_field('Region')
-    expect(@session).to have_field(:'Region')
+    expect(@session).to have_field(:Region)
   end
 
   it "should be false if the field is not on the page" do
@@ -269,7 +270,7 @@ Capybara::SpecHelper.spec '#has_unchecked_field?' do
 
   it "should support locator-less usage" do
     expect(@session.has_unchecked_field?(disabled: true, id: "form_disabled_unchecked_checkbox"))
-    expect(@session).to have_unchecked_field(disabled: true, id: "form_disabled_unchecked_checkbox" )
+    expect(@session).to have_unchecked_field(disabled: true, id: "form_disabled_unchecked_checkbox")
   end
 end
 
@@ -304,6 +305,6 @@ Capybara::SpecHelper.spec '#has_no_unchecked_field?' do
 
   it "should support locator-less usage" do
     expect(@session.has_no_unchecked_field?(disabled: false, id: "form_disabled_unchecked_checkbox")).to eq true
-    expect(@session).to have_no_unchecked_field(disabled: false, id: "form_disabled_unchecked_checkbox" )
+    expect(@session).to have_no_unchecked_field(disabled: false, id: "form_disabled_unchecked_checkbox")
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#has_link?' do
   before do
     @session.visit('/with_html')

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

@@ -4,58 +4,58 @@ Capybara::SpecHelper.spec '#have_none_of_selectors' do
   end
 
   it "should be false if any of the given locators are on the page" do
-    expect {
+    expect do
       expect(@session).to have_none_of_selectors(:xpath, "//p", "//a")
-    }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
-    expect {
+    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    expect do
       expect(@session).to have_none_of_selectors(:css, "p a#foo")
-    }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
   end
 
   it "should be true if none of the given locators are on the page" do
-    expect(@session).to have_none_of_selectors(:xpath, "//abbr", "//td" )
+    expect(@session).to have_none_of_selectors(:xpath, "//abbr", "//td")
     expect(@session).to have_none_of_selectors(:css, "p a#doesnotexist", "abbr")
   end
 
   it "should use default selector" do
     Capybara.default_selector = :css
     expect(@session).to have_none_of_selectors("p a#doesnotexist", "abbr")
-    expect {
+    expect do
       expect(@session).to have_none_of_selectors("abbr", "p a#foo")
-    }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+    end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
   end
 
   context "should respect scopes" do
     it "when used with `within`" do
       @session.within "//p[@id='first']" do
-        expect {
+        expect do
           expect(@session).to have_none_of_selectors(".//a[@id='foo']")
-        }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+        end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
         expect(@session).to have_none_of_selectors(".//a[@id='red']")
       end
     end
 
     it "when called on an element" do
       el = @session.find "//p[@id='first']"
-      expect {
+      expect do
         expect(el).to have_none_of_selectors(".//a[@id='foo']")
-      }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
       expect(el).to have_none_of_selectors(".//a[@id='red']")
     end
   end
 
   context "with options" do
     it "should apply the options to all locators" do
-      expect {
+      expect do
         expect(@session).to have_none_of_selectors("//p//a", text: "Redirect")
-      }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
       expect(@session).to have_none_of_selectors("//p", text: "Doesnotexist")
     end
 
     it "should discard all matches where the given regexp is matched" do
-      expect {
+      expect do
         expect(@session).to have_none_of_selectors("//p//a", text: /re[dab]i/i, count: 1)
-      }.to raise_error ::RSpec::Expectations::ExpectationNotMetError
+      end.to raise_error ::RSpec::Expectations::ExpectationNotMetError
       expect(@session).to have_none_of_selectors("//p//a", text: /Red$/)
     end
   end
@@ -69,8 +69,8 @@ Capybara::SpecHelper.spec '#have_none_of_selectors' do
   end
 
   it "cannot be negated" do
-    expect {
+    expect do
       expect(@session).not_to have_none_of_selectors(:css, "p a#foo", "h2#h2one", "h2#h2two")
-    }.to raise_error ArgumentError
+    end.to raise_error ArgumentError
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#has_select?' do
   before { @session.visit('/form') }
 
@@ -6,7 +7,7 @@ Capybara::SpecHelper.spec '#has_select?' do
     expect(@session).to have_select('Locale')
     expect(@session).to have_select('form_region')
     expect(@session).to have_select('Languages')
-    expect(@session).to have_select(:'Languages')
+    expect(@session).to have_select(:Languages)
   end
 
   it "should be false if the field is not on the page" do
@@ -33,7 +34,7 @@ Capybara::SpecHelper.spec '#has_select?' do
         'Boxerbriefs', 'Briefs', 'Boxers', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
       expect(@session).not_to have_select('Underwear', selected: [
-        'Boxerbriefs', 'Briefs','Commando', "Frenchman's Pantalons"
+        'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons"
       ])
     end
 
@@ -69,25 +70,25 @@ Capybara::SpecHelper.spec '#has_select?' do
 
   context 'with partial select' do
     it "should be true if a field with the given partial values is on the page" do
-      expect(@session).to have_select('Underwear', with_selected: ['Boxerbriefs', 'Briefs'])
+      expect(@session).to have_select('Underwear', with_selected: %w[Boxerbriefs Briefs])
     end
 
     it "should be false if a field with the given partial values is not on the page" do
-      expect(@session).not_to have_select('Underwear', with_selected: ['Boxerbriefs', 'Boxers'])
+      expect(@session).not_to have_select('Underwear', with_selected: %w[Boxerbriefs Boxers])
     end
 
     it "should be true after the given partial value is selected" do
       @session.select('Boxers', from: 'Underwear')
-      expect(@session).to have_select('Underwear', with_selected: ['Boxerbriefs', 'Boxers'])
+      expect(@session).to have_select('Underwear', with_selected: %w[Boxerbriefs Boxers])
     end
 
     it "should be false after one of the given partial values is unselected" do
       @session.unselect('Briefs', from: 'Underwear')
-      expect(@session).not_to have_select('Underwear', with_selected: ['Boxerbriefs', 'Briefs'])
+      expect(@session).not_to have_select('Underwear', with_selected: %w[Boxerbriefs Briefs])
     end
 
     it "should be true even when the selected values are invisible, regardless of the select's visibility" do
-      expect(@session).to have_select('Dessert', visible: false, with_options: ['Pudding', 'Tiramisu'])
+      expect(@session).to have_select('Dessert', visible: false, with_options: %w[Pudding Tiramisu])
       expect(@session).to have_select('Cake', with_selected: ['Chocolate Cake', 'Sponge Cake'])
     end
 
@@ -99,7 +100,7 @@ Capybara::SpecHelper.spec '#has_select?' do
 
   context 'with exact options' do
     it "should be true if a field with the given options is on the page" do
-      expect(@session).to have_select('Region', options: ['Norway', 'Sweden', 'Finland'])
+      expect(@session).to have_select('Region', options: %w[Norway Sweden Finland])
       expect(@session).to have_select('Tendency', options: [])
     end
 
@@ -107,29 +108,29 @@ Capybara::SpecHelper.spec '#has_select?' do
       expect(@session).not_to have_select('Locale', options: ['Swedish'])
       expect(@session).not_to have_select('Does not exist', options: ['John'])
       expect(@session).not_to have_select('City', options: ['London', 'Made up city'])
-      expect(@session).not_to have_select('Region', options: ['Norway', 'Sweden'])
-      expect(@session).not_to have_select('Region', options: ['Norway', 'Norway', 'Norway'])
+      expect(@session).not_to have_select('Region', options: %w[Norway Sweden])
+      expect(@session).not_to have_select('Region', options: %w[Norway Norway Norway])
     end
 
     it "should be true even when the options are invisible, if the select itself is invisible" do
-      expect(@session).to have_select("Icecream", visible: false, options: ['Chocolate', 'Vanilla', 'Strawberry'])
+      expect(@session).to have_select("Icecream", visible: false, options: %w[Chocolate Vanilla Strawberry])
     end
   end
 
   context 'with partial options' do
     it "should be true if a field with the given partial options is on the page" do
-      expect(@session).to have_select('Region', with_options: ['Norway', 'Sweden'])
+      expect(@session).to have_select('Region', with_options: %w[Norway Sweden])
       expect(@session).to have_select('City', with_options: ['London'])
     end
 
     it "should be false if a field with the given partial options is not on the page" do
       expect(@session).not_to have_select('Locale', with_options: ['Uruguayan'])
       expect(@session).not_to have_select('Does not exist', with_options: ['John'])
-      expect(@session).not_to have_select('Region', with_options: ['Norway', 'Sweden', 'Finland', 'Latvia'])
+      expect(@session).not_to have_select('Region', with_options: %w[Norway Sweden Finland Latvia])
     end
 
     it "should be true even when the options are invisible, if the select itself is invisible" do
-      expect(@session).to have_select("Icecream", visible: false, with_options: ['Vanilla', 'Strawberry'])
+      expect(@session).to have_select("Icecream", visible: false, with_options: %w[Vanilla Strawberry])
     end
   end
 
@@ -151,9 +152,9 @@ Capybara::SpecHelper.spec '#has_select?' do
   end
 
   it "should support locator-less usage" do
-    expect(@session.has_select?(with_options: ['Norway', 'Sweden'])).to eq true
+    expect(@session.has_select?(with_options: %w[Norway Sweden])).to eq true
     expect(@session).to have_select(with_options: ['London'])
-    expect(@session.has_select?(with_selected: ['Commando', 'Boxerbriefs'])).to eq true
+    expect(@session.has_select?(with_selected: %w[Commando Boxerbriefs])).to eq true
     expect(@session).to have_select(with_selected: ['Briefs'])
   end
 end
@@ -191,7 +192,7 @@ Capybara::SpecHelper.spec '#has_no_select?' do
         'Boxerbriefs', 'Briefs', 'Boxers', 'Commando', "Frenchman's Pantalons", 'Long Johns'
       ])
       expect(@session).to have_no_select('Underwear', selected: [
-        'Boxerbriefs', 'Briefs','Commando', "Frenchman's Pantalons"
+        'Boxerbriefs', 'Briefs', 'Commando', "Frenchman's Pantalons"
       ])
     end
 
@@ -222,21 +223,21 @@ Capybara::SpecHelper.spec '#has_no_select?' do
 
   context 'with partial select' do
     it "should be false if a field with the given partial values is on the page" do
-      expect(@session).not_to have_no_select('Underwear', with_selected: ['Boxerbriefs', 'Briefs'])
+      expect(@session).not_to have_no_select('Underwear', with_selected: %w[Boxerbriefs Briefs])
     end
 
     it "should be true if a field with the given partial values is not on the page" do
-      expect(@session).to have_no_select('Underwear', with_selected: ['Boxerbriefs', 'Boxers'])
+      expect(@session).to have_no_select('Underwear', with_selected: %w[Boxerbriefs Boxers])
     end
 
     it "should be false after the given partial value is selected" do
       @session.select('Boxers', from: 'Underwear')
-      expect(@session).not_to have_no_select('Underwear', with_selected: ['Boxerbriefs', 'Boxers'])
+      expect(@session).not_to have_no_select('Underwear', with_selected: %w[Boxerbriefs Boxers])
     end
 
     it "should be true after one of the given partial values is unselected" do
       @session.unselect('Briefs', from: 'Underwear')
-      expect(@session).to have_no_select('Underwear', with_selected: ['Boxerbriefs', 'Briefs'])
+      expect(@session).to have_no_select('Underwear', with_selected: %w[Boxerbriefs Briefs])
     end
 
     it "should support non array partial values" do
@@ -247,35 +248,35 @@ Capybara::SpecHelper.spec '#has_no_select?' do
 
   context 'with exact options' do
     it "should be false if a field with the given options is on the page" do
-      expect(@session).not_to have_no_select('Region', options: ['Norway', 'Sweden', 'Finland'])
+      expect(@session).not_to have_no_select('Region', options: %w[Norway Sweden Finland])
     end
 
     it "should be true if the given field is not on the page" do
       expect(@session).to have_no_select('Locale', options: ['Swedish'])
       expect(@session).to have_no_select('Does not exist', options: ['John'])
       expect(@session).to have_no_select('City', options: ['London', 'Made up city'])
-      expect(@session).to have_no_select('Region', options: ['Norway', 'Sweden'])
-      expect(@session).to have_no_select('Region', options: ['Norway', 'Norway', 'Norway'])
+      expect(@session).to have_no_select('Region', options: %w[Norway Sweden])
+      expect(@session).to have_no_select('Region', options: %w[Norway Norway Norway])
     end
   end
 
   context 'with partial options' do
     it "should be false if a field with the given partial options is on the page" do
-      expect(@session).not_to have_no_select('Region', with_options: ['Norway', 'Sweden'])
+      expect(@session).not_to have_no_select('Region', with_options: %w[Norway Sweden])
       expect(@session).not_to have_no_select('City', with_options: ['London'])
     end
 
     it "should be true if a field with the given partial options is not on the page" do
       expect(@session).to have_no_select('Locale', with_options: ['Uruguayan'])
       expect(@session).to have_no_select('Does not exist', with_options: ['John'])
-      expect(@session).to have_no_select('Region', with_options: ['Norway', 'Sweden', 'Finland', 'Latvia'])
+      expect(@session).to have_no_select('Region', with_options: %w[Norway Sweden Finland Latvia])
     end
   end
 
   it "should support locator-less usage" do
-    expect(@session.has_no_select?(with_options: ['Norway', 'Sweden', 'Finland', 'Latvia'])).to eq true
-    expect(@session).to have_no_select(with_options: ['New London'] )
+    expect(@session.has_no_select?(with_options: %w[Norway Sweden Finland Latvia])).to eq true
+    expect(@session).to have_no_select(with_options: ['New London'])
     expect(@session.has_no_select?(with_selected: ['Boxers'])).to eq true
-    expect(@session).to have_no_select(with_selected: ['Commando', 'Boxers'])
+    expect(@session).to have_no_select(with_selected: %w[Commando Boxers])
   end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#has_selector?' do
   before do
     @session.visit('/with_html')
@@ -72,9 +73,10 @@ Capybara::SpecHelper.spec '#has_selector?' do
       expect(@session).not_to have_selector("//p//a", text: /Red$/)
     end
 
-    it "should warn when extra parameters passed" do
-      expect_any_instance_of(Kernel).to receive(:warn).with(/extra/)
-      expect(@session).to have_selector(:css, "p a#foo", 'extra')
+    it "should raise when extra parameters passed" do
+      expect do
+        expect(@session).to have_selector(:css, "p a#foo", 'extra')
+      end.to raise_error ArgumentError, /extra/
     end
   end
 
@@ -131,7 +133,6 @@ Capybara::SpecHelper.spec '#has_no_selector?' do
   end
 
   it "should accept a filter block" do
-    skip "RSpec < 3 doesn't pass the block along to the matcher for the Builtin::Has matcher" if rspec2?
     expect(@session).to have_no_selector(:css, "a#foo") { |el| el[:id] != "foo" }
   end