capybara 2.9.2 → 2.10.0

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

@@ -6,7 +6,7 @@ Capybara::SpecHelper.spec "#unselect" do
 
   context "with multiple select" do
     it "should unselect an option from a select box by id" do
-      @session.unselect('Commando', :from => 'form_underwear')
+      @session.unselect('Commando', from: 'form_underwear')
       @session.click_button('awesome')
       expect(extract_results(@session)['underwear']).to include('Briefs', 'Boxerbriefs')
       expect(extract_results(@session)['underwear']).not_to include('Commando')
@@ -20,27 +20,27 @@ Capybara::SpecHelper.spec "#unselect" do
     end
 
     it "should unselect an option from a select box by label" do
-      @session.unselect('Commando', :from => 'Underwear')
+      @session.unselect('Commando', from: 'Underwear')
       @session.click_button('awesome')
       expect(extract_results(@session)['underwear']).to include('Briefs', 'Boxerbriefs')
       expect(extract_results(@session)['underwear']).not_to include('Commando')
     end
 
     it "should favour exact matches to option labels" do
-      @session.unselect("Briefs", :from => 'Underwear')
+      @session.unselect("Briefs", from: 'Underwear')
       @session.click_button('awesome')
       expect(extract_results(@session)['underwear']).to include('Commando', 'Boxerbriefs')
       expect(extract_results(@session)['underwear']).not_to include('Briefs')
     end
 
     it "should escape quotes" do
-      @session.unselect("Frenchman's Pantalons", :from => 'Underwear')
+      @session.unselect("Frenchman's Pantalons", from: 'Underwear')
       @session.click_button('awesome')
       expect(extract_results(@session)['underwear']).not_to include("Frenchman's Pantalons")
     end
 
     it "casts to string" do
-      @session.unselect(:"Briefs", :from => :'Underwear')
+      @session.unselect(:"Briefs", from: :'Underwear')
       @session.click_button('awesome')
       expect(extract_results(@session)['underwear']).to include('Commando', 'Boxerbriefs')
       expect(extract_results(@session)['underwear']).not_to include('Briefs')
@@ -49,7 +49,7 @@ Capybara::SpecHelper.spec "#unselect" do
 
   context "with single select" do
     it "should raise an error" do
-      expect { @session.unselect("English", :from => 'form_locale') }.to raise_error(Capybara::UnselectNotAllowed)
+      expect { @session.unselect("English", from: 'form_locale') }.to raise_error(Capybara::UnselectNotAllowed)
     end
   end
 
@@ -57,7 +57,7 @@ Capybara::SpecHelper.spec "#unselect" do
     it "should raise an error" do
       msg = "Unable to find select box \"does not exist\""
       expect do
-        @session.unselect('foo', :from => 'does not exist')
+        @session.unselect('foo', from: 'does not exist')
       end.to raise_error(Capybara::ElementNotFound, msg)
     end
   end
@@ -66,7 +66,7 @@ Capybara::SpecHelper.spec "#unselect" do
     it "should raise an error" do
       msg = "Unable to find option \"Does not Exist\""
       expect do
-        @session.unselect('Does not Exist', :from => 'form_underwear')
+        @session.unselect('Does not Exist', from: 'form_underwear')
       end.to raise_error(Capybara::ElementNotFound, msg)
     end
   end
@@ -74,19 +74,19 @@ Capybara::SpecHelper.spec "#unselect" do
   context "with :exact option" do
     context "when `false`" do
       it "can match select box approximately" do
-        @session.unselect("Boxerbriefs", :from => "Under", :exact => false)
+        @session.unselect("Boxerbriefs", from: "Under", exact:  false)
         @session.click_button("awesome")
         expect(extract_results(@session)["underwear"]).not_to include("Boxerbriefs")
       end
 
       it "can match option approximately" do
-        @session.unselect("Boxerbr", :from => "Underwear", :exact => false)
+        @session.unselect("Boxerbr", from: "Underwear", exact:  false)
         @session.click_button("awesome")
         expect(extract_results(@session)["underwear"]).not_to include("Boxerbriefs")
       end
 
       it "can match option approximately when :from not given" do
-        @session.unselect("Boxerbr", :exact => false)
+        @session.unselect("Boxerbr", exact:  false)
         @session.click_button("awesome")
         expect(extract_results(@session)["underwear"]).not_to include("Boxerbriefs")
       end
@@ -95,19 +95,19 @@ Capybara::SpecHelper.spec "#unselect" do
     context "when `true`" do
       it "can match select box approximately" do
         expect do
-          @session.unselect("Boxerbriefs", :from => "Under", :exact => true)
+          @session.unselect("Boxerbriefs", from: "Under", exact:  true)
         end.to raise_error(Capybara::ElementNotFound)
       end
 
       it "can match option approximately" do
         expect do
-          @session.unselect("Boxerbr", :from => "Underwear", :exact => true)
+          @session.unselect("Boxerbr", from: "Underwear", exact:  true)
         end.to raise_error(Capybara::ElementNotFound)
       end
 
       it "can match option approximately when :from not given" do
         expect do
-          @session.unselect("Boxerbr", :exact => true)
+          @session.unselect("Boxerbr", exact:  true)
         end.to raise_error(Capybara::ElementNotFound)
       end
     end

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

@@ -27,7 +27,7 @@ Capybara::SpecHelper.spec '#visit' do
     expect(@session).to have_content('Hello world!')
   end
 
-  it "raises any errors caught inside the server", :requires => [:server] do
+  it "raises any errors caught inside the server", requires: [:server] do
     quietly { @session.visit("/error") }
     expect do
       @session.visit("/")
@@ -65,7 +65,7 @@ Capybara::SpecHelper.spec '#visit' do
     end
   end
 
-  context "without a server", :requires => [:server] do
+  context "without a server", requires: [:server] do
     it "should respect `app_host`" do
       serverless_session = Capybara::Session.new(@session.mode, nil)
       Capybara.app_host = "http://#{@session.server.host}:#{@session.server.port}"

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

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-Capybara::SpecHelper.spec '#within_frame', :requires => [:frames] do
+Capybara::SpecHelper.spec '#within_frame', requires: [:frames] do
   before(:each) do
     @session.visit('/within_frames')
   end
@@ -58,7 +58,7 @@ Capybara::SpecHelper.spec '#within_frame', :requires => [:frames] do
     end
   end
 
-  it "works if the frame is closed", :requires => [:frames, :js] do
+  it "works if the frame is closed", requires: [:frames, :js] do
     @session.within_frame 'parentFrame' do
       @session.within_frame 'childFrame' do
         @session.click_link 'Close Window'

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

@@ -20,7 +20,7 @@ Capybara::SpecHelper.spec '#within' do
     end
 
     it "should accept additional options" do
-      @session.within(:css, "#for_bar li", :text => 'With Simple HTML') do
+      @session.within(:css, "#for_bar li", text: 'With Simple HTML') do
         @session.click_link('Go')
       end
       expect(@session).to have_content('Bar')
@@ -114,7 +114,7 @@ Capybara::SpecHelper.spec '#within' do
     expect(extract_results(@session)['first_name']).to eq('Peter')
     @session.visit('/with_scope')
     @session.within("//li[contains(.,'Bar')]") do
-      @session.fill_in('First Name', :with => 'Dagobert')
+      @session.fill_in('First Name', with: 'Dagobert')
       @session.click_button('Go')
     end
     expect(extract_results(@session)['first_name']).to eq('Dagobert')
@@ -128,7 +128,7 @@ Capybara::SpecHelper.spec '#within_fieldset' do
 
   it "should restrict scope to a fieldset given by id" do
     @session.within_fieldset("villain_fieldset") do
-      @session.fill_in("Name", :with => 'Goldfinger')
+      @session.fill_in("Name", with: 'Goldfinger')
       @session.click_button("Create")
     end
     expect(extract_results(@session)['villain_name']).to eq('Goldfinger')
@@ -136,7 +136,7 @@ Capybara::SpecHelper.spec '#within_fieldset' do
 
   it "should restrict scope to a fieldset given by legend" do
     @session.within_fieldset("Villain") do
-      @session.fill_in("Name", :with => 'Goldfinger')
+      @session.fill_in("Name", with: 'Goldfinger')
       @session.click_button("Create")
     end
     expect(extract_results(@session)['villain_name']).to eq('Goldfinger')
@@ -150,7 +150,7 @@ Capybara::SpecHelper.spec '#within_table' do
 
   it "should restrict scope to a fieldset given by id" do
     @session.within_table("girl_table") do
-      @session.fill_in("Name", :with => 'Christmas')
+      @session.fill_in("Name", with: 'Christmas')
       @session.click_button("Create")
     end
     expect(extract_results(@session)['girl_name']).to eq('Christmas')
@@ -158,7 +158,7 @@ Capybara::SpecHelper.spec '#within_table' do
 
   it "should restrict scope to a fieldset given by legend" do
     @session.within_table("Villain") do
-      @session.fill_in("Name", :with => 'Quantum')
+      @session.fill_in("Name", with: 'Quantum')
       @session.click_button("Create")
     end
     expect(extract_results(@session)['villain_name']).to eq('Quantum')

data/lib/capybara/spec/spec_helper.rb

@@ -19,7 +19,7 @@ module Capybara
   module SpecHelper
     class << self
       def configure(config)
-        config.filter_run_excluding :requires => method(:filter).to_proc
+        config.filter_run_excluding requires: method(:filter).to_proc
         config.before { Capybara::SpecHelper.reset! }
         config.after { Capybara::SpecHelper.reset! }
         # Test in 3.5+ where metadata doesn't autotrigger shared context inclusion - will be only behavior in RSpec 4

data/lib/capybara/spec/test_app.rb

@@ -175,5 +175,5 @@ class TestApp < Sinatra::Base
 end
 
 if __FILE__ == $0
-  Rack::Handler::WEBrick.run TestApp, :Port => 8070
+  Rack::Handler::WEBrick.run TestApp, Port: 8070
 end

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

@@ -351,6 +351,7 @@ New line after and before textarea tag
     <button type="submit" id="click_me_123" title="Click Title button" value="click_me">Click me!</button>
     <button type="submit" name="form[no_value]">No Value!</button>
     <button id="no_type">No Type!</button>
+    <button><img alt="A horse eating hay"/></button>
     <input type="button" disabled="disabled" value="Disabled button"/>
   </p>
 

data/lib/capybara/version.rb

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

data/spec/basic_node_spec.rb

@@ -69,13 +69,13 @@ RSpec.describe Capybara do
     end
 
     it "allows using matchers with text option" do
-      expect(string).to have_css('h1', :text => 'Totally awesome')
-      expect(string).not_to have_css('h1', :text => 'Not so awesome')
+      expect(string).to have_css('h1', text: 'Totally awesome')
+      expect(string).not_to have_css('h1', text: 'Not so awesome')
     end
 
     it "allows finding only visible nodes" do
-      expect(string.all(:css, '#secret', :visible => true)).to be_empty
-      expect(string.all(:css, '#secret', :visible => false).size).to eq(1)
+      expect(string.all(:css, '#secret', visible: true)).to be_empty
+      expect(string.all(:css, '#secret', visible: false).size).to eq(1)
     end
 
     it "allows finding elements and extracting text from them" do
@@ -101,7 +101,7 @@ RSpec.describe Capybara do
 
     it "allows finding elements and checking if they are visible" do
       expect(string.find('//h1')).to be_visible
-      expect(string.find(:css, "#secret", :visible => false)).not_to be_visible
+      expect(string.find(:css, "#secret", visible: false)).not_to be_visible
     end
 
     it "allows finding elements and checking if they are disabled" do

data/spec/capybara_spec.rb

@@ -47,7 +47,7 @@ RSpec.describe Capybara do
 
     it "should add a new server" do
       Capybara.register_server :blob do |app, port, host|
-        Rack::Handler::WEBrick.run(app, :Host => host, :Port => port, :AccessLog => [], :Logger => WEBrick::Log::new(nil, 0))
+        Rack::Handler::WEBrick.run(app, Host: host, Port: port, AccessLog: [], Logger: WEBrick::Log::new(nil, 0))
       end
       Capybara.server = :blob
       session = Capybara::Session.new(:selenium, TestApp.dup)

data/spec/dsl_spec.rb

@@ -6,7 +6,7 @@ class TestClass
   include Capybara::DSL
 end
 
-Capybara::SpecHelper.run_specs TestClass.new, "DSL", :capybara_skip => [
+Capybara::SpecHelper.run_specs TestClass.new, "DSL", capybara_skip: [
   :js,
   :modals,
   :screenshot,

data/spec/rack_test_spec.rb

@@ -5,7 +5,7 @@ module TestSessions
   RackTest = Capybara::Session.new(:rack_test, TestApp)
 end
 
-Capybara::SpecHelper.run_specs TestSessions::RackTest, "RackTest", :capybara_skip => [
+Capybara::SpecHelper.run_specs TestSessions::RackTest, "RackTest", capybara_skip: [
   :js,
   :modals,
   :screenshot,
@@ -122,27 +122,27 @@ RSpec.describe Capybara::RackTest::Driver do
 
   describe ':headers option' do
     it 'should always set headers' do
-      @driver = Capybara::RackTest::Driver.new(TestApp, :headers => {'HTTP_FOO' => 'foobar'})
+      @driver = Capybara::RackTest::Driver.new(TestApp, headers: {'HTTP_FOO' => 'foobar'})
       @driver.visit('/get_header')
       expect(@driver.html).to include('foobar')
     end
 
     it 'should keep headers on link clicks' do
-      @driver = Capybara::RackTest::Driver.new(TestApp, :headers => {'HTTP_FOO' => 'foobar'})
+      @driver = Capybara::RackTest::Driver.new(TestApp, headers: {'HTTP_FOO' => 'foobar'})
       @driver.visit('/header_links')
       @driver.find_xpath('.//a').first.click
       expect(@driver.html).to include('foobar')
     end
 
     it 'should keep headers on form submit' do
-      @driver = Capybara::RackTest::Driver.new(TestApp, :headers => {'HTTP_FOO' => 'foobar'})
+      @driver = Capybara::RackTest::Driver.new(TestApp, headers: {'HTTP_FOO' => 'foobar'})
       @driver.visit('/header_links')
       @driver.find_xpath('.//input').first.click
       expect(@driver.html).to include('foobar')
     end
 
     it 'should keep headers on redirects' do
-      @driver = Capybara::RackTest::Driver.new(TestApp, :headers => {'HTTP_FOO' => 'foobar'})
+      @driver = Capybara::RackTest::Driver.new(TestApp, headers: {'HTTP_FOO' => 'foobar'})
       @driver.visit('/get_header_via_redirect')
       expect(@driver.html).to include('foobar')
     end
@@ -158,7 +158,7 @@ RSpec.describe Capybara::RackTest::Driver do
     end
 
     it "is possible to not follow redirects" do
-      @driver = Capybara::RackTest::Driver.new(TestApp, :follow_redirects => false)
+      @driver = Capybara::RackTest::Driver.new(TestApp, follow_redirects: false)
 
       @driver.visit('/redirect')
       expect(@driver.response.header['Location']).to match %r{/redirect_again$}
@@ -186,7 +186,7 @@ RSpec.describe Capybara::RackTest::Driver do
 
     context "with 21 redirect limit" do
       before do
-        @driver = Capybara::RackTest::Driver.new(TestApp, :redirect_limit => 21)
+        @driver = Capybara::RackTest::Driver.new(TestApp, redirect_limit: 21)
       end
 
       it "should follow 21 redirects" do

data/spec/rspec/matchers_spec.rb

@@ -25,7 +25,7 @@ RSpec.describe Capybara::RSpecMatchers do
         end
 
         it "passes if matched node count equals expected count" do
-          expect("<h1>Text</h1>").to have_css('h1', :count => 1)
+          expect("<h1>Text</h1>").to have_css('h1', count: 1)
         end
 
         it "fails if matched node count does not equal expected count" do
@@ -66,12 +66,12 @@ RSpec.describe Capybara::RSpecMatchers do
         end
 
         it "passes if matched node count does not equal expected count" do
-          expect("<h1>Text</h1>").not_to have_css('h1', :count => 2)
+          expect("<h1>Text</h1>").not_to have_css('h1', count: 2)
         end
 
         it "fails if matched node count equals expected count" do
           expect do
-            expect("<h1>Text</h1>").not_to have_css('h1', :count => 1)
+            expect("<h1>Text</h1>").not_to have_css('h1', count: 1)
           end.to raise_error(/expected not to find css "h1"/)
         end
       end
@@ -220,7 +220,7 @@ RSpec.describe Capybara::RSpecMatchers do
 
       context "with should" do
         it "passes if has_selector? returns true" do
-          expect(page).to have_selector('//h1', :text => 'test')
+          expect(page).to have_selector('//h1', text: 'test')
         end
 
         it "fails if has_selector? returns false" do
@@ -231,7 +231,7 @@ RSpec.describe Capybara::RSpecMatchers do
 
         it "includes text in error message" do
           expect do
-            expect(page).to have_selector("//h1", :text => 'wrong text')
+            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
       end
@@ -243,7 +243,7 @@ RSpec.describe Capybara::RSpecMatchers do
 
         it "fails if has_no_selector? returns false" do
           expect do
-            expect(page).not_to have_selector(:css, 'h1', :text => 'test')
+            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
       end

data/spec/rspec_spec.rb

@@ -29,7 +29,7 @@ RSpec.describe 'capybara/rspec', :type => :feature do
     end
   end
 
-  it "switches to the javascript driver when giving it as metadata", :js => true do
+  it "switches to the javascript driver when giving it as metadata", js: true do
     expect(Capybara.current_driver).to eq(Capybara.javascript_driver)
   end
 

data/spec/selector_spec.rb

@@ -25,6 +25,7 @@ RSpec.describe Capybara do
             <label for="my_text_input">My Text Input</label>
             <input type="text" name="form[my_text_input]" placeholder="my text" id="my_text_input"/>
             <input type="file" id="file" class=".special file"/>
+            <input type="hidden" id="hidden_field" value="this is hidden"/>
             <a href="#">link</a>
             <fieldset></fieldset>
             <select>
@@ -51,6 +52,18 @@ RSpec.describe Capybara do
       end
     end
 
+    describe "adding a selector" do
+      it "can set default visiblity" do
+        Capybara.add_selector :hidden_field do
+          visible :hidden
+          css { |sel| 'input[type="hidden"]' }
+        end
+
+        expect(string).to have_no_css('input[type="hidden"]')
+        expect(string).to have_selector(:hidden_field)
+      end
+    end
+
     describe "modify_selector" do
       it "allows modifying a selector" do
         el = string.find(:custom_selector, 'a')

data/spec/selenium_firefox_spec.rb

@@ -21,7 +21,7 @@ skipped_tests = [
 ]
 skipped_tests << :windows if ENV['TRAVIS'] && !ENV['WINDOW_TEST']
 
-Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", :capybara_skip => skipped_tests
+Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", capybara_skip: skipped_tests
 
 RSpec.describe "Capybara::Session with firefox" do
   include_examples  "Capybara::Session", TestSessions::Selenium, :selenium_focus

data/spec/selenium_spec_chrome.rb

@@ -12,7 +12,7 @@ module TestSessions
   Chrome = Capybara::Session.new(:selenium_chrome, TestApp)
 end
 
-Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", :capybara_skip => [
+Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", capybara_skip: [
   :response_headers,
   :status_code,
   :trigger

data/spec/shared_selenium_session.rb

@@ -62,37 +62,37 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
       end
     end
 
-    context "#fill_in with { :clear => :backspace } fill_option", :requires => [:js] do
+    context "#fill_in with { :clear => :backspace } fill_option", requires: [:js] do
       it 'should fill in a field, replacing an existing value' do
         @session.visit('/form')
-        @session.fill_in('form_first_name', :with => 'Harry',
+        @session.fill_in('form_first_name', with: 'Harry',
                           fill_options: { clear: :backspace} )
         expect(@session.find(:fillable_field, 'form_first_name').value).to eq('Harry')
       end
 
       it 'should only trigger onchange once' do
         @session.visit('/with_js')
-        @session.fill_in('with_change_event', :with => 'some value',
-                         :fill_options => { :clear => :backspace })
+        @session.fill_in('with_change_event', with: 'some value',
+                         fill_options: { :clear => :backspace })
         # click outside the field to trigger the change event
         @session.find(:css, 'body').click
-        expect(@session.find(:css, '.change_event_triggered', :match => :one)).to have_text 'some value'
+        expect(@session.find(:css, '.change_event_triggered', match: :one)).to have_text 'some value'
       end
 
       it 'should trigger change when clearing field' do
         @session.visit('/with_js')
-        @session.fill_in('with_change_event', :with => '',
-                         :fill_options => { :clear => :backspace })
+        @session.fill_in('with_change_event', with: '',
+                         fill_options: { :clear => :backspace })
         # click outside the field to trigger the change event
         @session.find(:css, 'body').click
-        expect(@session).to have_selector(:css, '.change_event_triggered', :match => :one)
+        expect(@session).to have_selector(:css, '.change_event_triggered', match: :one)
       end
     end
 
     context "#fill_in with { clear: :none } fill_options" do
       it 'should append to content in a field' do
         @session.visit('/form')
-        @session.fill_in('form_first_name', :with => 'Harry',
+        @session.fill_in('form_first_name', with: 'Harry',
                           fill_options: { clear: :none} )
         expect(@session.find(:fillable_field, 'form_first_name').value).to eq('JohnHarry')
       end
@@ -102,7 +102,7 @@ RSpec.shared_examples "Capybara::Session" do |session, mode|
       it 'should pass the array through to the element' do
         #this is mainly for use with [[:ctrl, 'a'], :backspace] - however since that is platform dependant I'm testing with something less useful
         @session.visit('/form')
-        @session.fill_in('form_first_name', :with => 'Harry',
+        @session.fill_in('form_first_name', with: 'Harry',
                           fill_options: { clear: [[:shift, 'abc'], :backspace] } )
         expect(@session.find(:fillable_field, 'form_first_name').value).to eq('JohnABHarry')
       end