capybara 2.9.0 → 2.10.0

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

@@ -5,9 +5,9 @@
 
   <p>
     <label for="form_title">Title</label>
-    <select name="form[title]" id="form_title">
-      <option>Mrs</option>
-      <option>Mr</option>
+    <select name="form[title]" id="form_title" class="title">
+      <option class="title">Mrs</option>
+      <option class="title">Mr</option>
       <option>Miss</option>
       <option disabled="disabled">Other</option>
     </select>
@@ -183,6 +183,8 @@ New line after and before textarea tag
     <label for="form_cars_tesla">Tesla</label>
     <input type="checkbox" value="ferrari" name="form[cars][]" id="form_cars_ferrari" checked="checked" style="display: none"/>
     <label for="form_cars_ferrari">Ferrari</label>
+    <input type="checkbox" value="pagani" name="form[cars][]" id="form_cars_pagani" style="position: absolute; left: -9999px"/>
+    <label for="form_cars_pagani">Pagani</label>
     <input type="checkbox" value="ariel" name="form[cars][]" id="form_cars_ariel" style="display: none"/>
     <label>
       McLaren
@@ -349,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.0'
+  VERSION = '2.10.0'
 end

data/lib/capybara.rb

@@ -225,7 +225,7 @@ module Capybara
     #     HTML
     #
     #     node.find('#projects').text # => 'Projects'
-    #     node.has_selector?('li#home', :text => 'Home')
+    #     node.has_selector?('li#home', text: 'Home')
     #     node.has_selector?('#projects')
     #     node.find('ul').find('li:first-child').text # => 'Home'
     #
@@ -475,7 +475,7 @@ end
 
 Capybara.register_server :webrick do |app, port, host|
   require 'rack/handler/webrick'
-  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.register_server :puma do |app, port, host|

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

@@ -18,10 +18,14 @@ RSpec.describe Capybara do
               <p class="b">Some Content</p>
               <p class="b"></p>
             </div>
-            <input type="checkbox"/>
+            <div id="#special">
+            </div>
+            <input id="2checkbox" class="2checkbox" type="checkbox"/>
             <input type="radio"/>
-            <input type="text"/>
-            <input type="file"/>
+            <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>
@@ -42,6 +46,22 @@ RSpec.describe Capybara do
         css { |css_class| "div.#{css_class}" }
         filter(:not_empty, boolean: true, default: true, skip_if: :all) { |node, value| value ^ (node.text == '') }
       end
+
+      Capybara.add_selector :custom_css_selector do
+        css { |selector| selector }
+      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
@@ -89,6 +109,77 @@ RSpec.describe Capybara do
         end
       end
 
+      context "with :id option" do
+        it "works with compound css selectors" do
+          expect(string.all(:custom_css_selector, "div, h1", id: 'page').size).to eq 1
+          expect(string.all(:custom_css_selector, "h1, div", id: 'page').size).to eq 1
+        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
+      end
+
+      context "with :class option" do
+        it "works with compound css selectors" do
+          expect(string.all(:custom_css_selector, "div, h1", class: 'a').size).to eq 2
+          expect(string.all(:custom_css_selector, "h1, div", class: 'a').size).to eq 2
+        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
+      end
+
+      # :css, :xpath, :id, :field, :fieldset, :link, :button, :link_or_button, :fillable_field, :radio_button, :checkbox, :select,
+      # :option, :file_field, :label, :table, :frame
+
+      describe ":css selector" do
+        it "finds by CSS locator" do
+          expect(string.find(:css, "input#my_text_input")[:name]).to eq 'form[my_text_input]'
+        end
+      end
+
+      describe ":xpath selector" do
+        it "finds by XPath locator" do
+          expect(string.find(:xpath, './/input[@id="my_text_input"]')[:name]).to eq 'form[my_text_input]'
+        end
+      end
+
+      describe ":id selector" do
+        it "finds by locator" do
+          expect(string.find(:id, "my_text_input")[:name]).to eq 'form[my_text_input]'
+        end
+      end
+
+      describe ":field selector" do
+        it "finds by locator" do
+          expect(string.find(:field, 'My Text Input')[:id]).to eq 'my_text_input'
+          expect(string.find(:field, 'my_text_input')[:id]).to eq 'my_text_input'
+          expect(string.find(:field, 'form[my_text_input]')[:id]).to eq 'my_text_input'
+        end
+
+        it "finds by id" do
+          expect(string.find(:field, id: 'my_text_input')[:name]).to eq 'form[my_text_input]'
+        end
+
+        it "finds by name" do
+          expect(string.find(:field, name: 'form[my_text_input]')[:id]).to eq 'my_text_input'
+        end
+
+        it "finds by placeholder" do
+          expect(string.find(:field, placeholder: 'my text')[:id]).to eq 'my_text_input'
+        end
+
+        it "finds by type" do
+          expect(string.find(:field, type: 'file')[:id]).to eq 'file'
+        end
+      end
+
       describe ":option selector" do
         it "finds disabled options" do
           expect(string.find(:option, disabled: true).value).to eq 'b'

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2016-09-19 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -284,6 +284,7 @@ files:
 - lib/capybara/rspec/features.rb
 - lib/capybara/rspec/matchers.rb
 - lib/capybara/selector.rb
+- lib/capybara/selector/css.rb
 - lib/capybara/selector/filter.rb
 - lib/capybara/selector/filter_set.rb
 - lib/capybara/selector/selector.rb