capybara 3.8.0 → 3.9.0

data/lib/capybara.rb

@@ -299,7 +299,7 @@ module Capybara
     # @return [Capybara::Session]     The currently used session
     #
     def current_session
-      session_pool["#{current_driver}:#{session_name}:#{app.object_id}"] ||= Capybara::Session.new(current_driver, app)
+      specified_session || session_pool["#{current_driver}:#{session_name}:#{app.object_id}"]
     end
 
     ##
@@ -337,22 +337,25 @@ module Capybara
 
     ##
     #
-    # Yield a block using a specific session name.
+    # Yield a block using a specific session name or Capybara::Session instance.
     #
-    def using_session(name)
+    def using_session(name_or_session)
       previous_session_info = {
+        specified_session: specified_session,
         session_name: session_name,
         current_driver: current_driver,
         app: app
       }
-      self.session_name = name
+      self.specified_session = self.session_name = nil
+      if name_or_session.is_a? Capybara::Session
+        self.specified_session = name_or_session
+      else
+        self.session_name = name_or_session
+      end
       yield
     ensure
-      self.session_name = previous_session_info[:session_name]
-      if threadsafe
-        self.current_driver = previous_session_info[:current_driver]
-        self.app = previous_session_info[:app]
-      end
+      self.session_name, self.specified_session = previous_session_info.values_at(:session_name, :specified_session)
+      self.current_driver, self.app = previous_session_info.values_at(:current_driver, :app) if threadsafe
     end
 
     ##
@@ -381,7 +384,25 @@ module Capybara
     end
 
     def session_pool
-      @session_pool ||= {}
+      @session_pool ||= Hash.new do |hash, name|
+        hash[name] = Capybara::Session.new(current_driver, app)
+      end
+    end
+
+    def specified_session
+      if threadsafe
+        Thread.current['capybara_specified_session']
+      else
+        @specified_session
+      end
+    end
+
+    def specified_session=(session)
+      if threadsafe
+        Thread.current['capybara_specified_session'] = session
+      else
+        @specified_session = session
+      end
     end
   end
 
@@ -393,6 +414,7 @@ module Capybara
   module RackTest; end
   module Selenium; end
 
+  require 'capybara/xpath_patches'
   require 'capybara/helpers'
   require 'capybara/session'
   require 'capybara/window'

data/spec/dsl_spec.rb

@@ -9,7 +9,12 @@ end
 
 Capybara::SpecHelper.run_specs TestClass.new, 'DSL', capybara_skip: %i[
   js modals screenshot frames windows send_keys server hover about_scheme psc download css driver
-]
+] do |example|
+  case example.metadata[:full_description]
+  when /has_css\? should support case insensitive :class and :id options/
+    pending "Nokogiri doesn't support case insensitive CSS attribute matchers"
+  end
+end
 
 RSpec.describe Capybara::DSL do
   after do
@@ -224,6 +229,15 @@ RSpec.describe Capybara::DSL do
       end
       expect(Capybara.session_name).to eq(:default)
     end
+
+    it 'should allow a session object' do
+      original_session = Capybara.current_session
+      new_session = Capybara::Session.new(:rack_test, proc {})
+      Capybara.using_session(new_session) do
+        expect(Capybara.current_session).to eq(new_session)
+      end
+      expect(Capybara.current_session).to eq(original_session)
+    end
   end
 
   describe '#session_name' do

data/spec/rack_test_spec.rb

@@ -19,7 +19,12 @@ skipped_tests = %i[
   download
   css
 ]
-Capybara::SpecHelper.run_specs TestSessions::RackTest, 'RackTest', capybara_skip: skipped_tests
+Capybara::SpecHelper.run_specs TestSessions::RackTest, 'RackTest', capybara_skip: skipped_tests do |example|
+  case example.metadata[:full_description]
+  when /has_css\? should support case insensitive :class and :id options/
+    pending "Nokogiri doesn't support case insensitive CSS attribute matchers"
+  end
+end
 
 RSpec.describe Capybara::Session do # rubocop:disable RSpec/MultipleDescribes
   context 'with rack test driver' do

data/spec/regexp_dissassembler_spec.rb

@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Capybara::Selector::RegexpDisassembler do
+  it 'handles strings' do
+    verify_strings(
+      /abcdef/ => %w[abcdef],
+      /abc def/ => ['abc def']
+    )
+  end
+
+  it 'handles escaped characters' do
+    verify_strings(
+      /abc\\def/ => %w[abc def],
+      /\nabc/ => %w[abc],
+      %r{abc/} => %w[abc/]
+    )
+  end
+
+  it 'handles wildcards' do
+    verify_strings(
+      /abc.*def/ => %w[abc def],
+      /.*def/ => %w[def],
+      /abc./ => %w[abc],
+      /abc.*/ => %w[abc],
+      /abc.def/ => %w[abc def],
+      /abc.def.ghi/ => %w[abc def ghi]
+    )
+  end
+
+  it 'handles optional characters' do
+    verify_strings(
+      /abc*def/ => %w[ab def],
+      /abc*/ => %w[ab],
+      /abc?def/ => %w[ab def],
+      /abc?/ => %w[ab],
+      /abc?def?/ => %w[ab de],
+      /abc?def?g/ => %w[ab de g]
+    )
+  end
+
+  it 'handles character classes' do
+    verify_strings(
+      /abc[a-z]/ => %w[abc],
+      /abc[a-z]def[0-9]g/ => %w[abc def g],
+      /[0-9]abc/ => %w[abc],
+      /[0-9]+/ => %w[],
+      /abc[0-9&&[^7]]/ => %w[abc]
+    )
+  end
+
+  it 'handles posix bracket expressions' do
+    verify_strings(
+      /abc[[:alpha:]]/ => %w[abc],
+      /[[:digit:]]abc/ => %w[abc],
+      /abc[[:print:]]def/ => %w[abc def]
+    )
+  end
+
+  it 'handles repitition' do
+    verify_strings(
+      /abc{3}/ => %w[abccc],
+      /abc{3}d/ => %w[abcccd],
+      /abc{0}/ => %w[ab],
+      /abc{,2}/ => %w[ab],
+      /abc{2,}/ => %w[abcc],
+      /def{1,5}/ => %w[def],
+      /abc+def/ => %w[abc def],
+      /ab(cde){,4}/ => %w[ab],
+      /(ab){,2}cd/ => %w[cd],
+      /(abc){2,3}/ => %w[abcabc],
+      /(abc){3}/ => %w[abcabcabc],
+      /ab{2,3}cd/ => %w[abb cd],
+      /(ab){2,3}cd/ => %w[abab cd]
+    )
+  end
+
+  it 'handles non-greedy repetition' do
+    verify_strings(
+      /abc.*?/ => %w[abc],
+      /abc+?/ => %w[abc],
+      /abc*?cde/ => %w[ab cde],
+      /(abc)+?def/ => %w[abc def],
+      /ab(cde)*?fg/ => %w[ab fg]
+    )
+  end
+
+  it 'handles alternation' do
+    verify_strings(
+      /abc|def/ => [],
+      /ab(?:c|d)/ => %w[ab],
+      /ab(c|d)ef/ => %w[ab ef]
+    )
+  end
+
+  it 'handles grouping' do
+    verify_strings(
+      /(abc)/ => %w[abc],
+      /(abc)?/ => [],
+      /ab(cde)/ => %w[abcde],
+      /(abc)de/ => %w[abcde],
+      /ab(cde)fg/ => %w[abcdefg],
+      /ab(?<name>cd)ef/ => %w[abcdef],
+      /gh(?>ij)kl/ => %w[ghijkl],
+      /m(n.*p)q/ => %w[mn pq],
+      /(?:ab(cd)*){2,3}/ => %w[ab],
+      /(ab(cd){3})?/ => [],
+      /(ab(cd)+){2}/ => %w[abcd]
+    )
+  end
+
+  it 'handles meta characters' do
+    verify_strings(
+      /abc\d/ => %w[abc],
+      /abc\wdef/ => %w[abc def],
+      /\habc/ => %w[abc]
+    )
+  end
+
+  it 'handles character properties' do
+    verify_strings(
+      /ab\p{Alpha}cd/ => %w[ab cd],
+      /ab\p{Blank}/ => %w[ab],
+      /\p{Digit}cd/ => %w[cd]
+    )
+  end
+
+  it 'handles backreferences' do
+    verify_strings(
+      /a(?<group>abc).\k<group>.+/ => %w[aabc]
+    )
+  end
+
+  it 'handles subexpressions' do
+    verify_strings(
+      /\A(?<paren>a\g<paren>*b)+\z/ => %w[a b]
+    )
+  end
+
+  it 'handles anchors' do
+    verify_strings(
+      /^abc/ => %w[abc],
+      /def$/ => %w[def],
+      /^abc$/ => %w[abc]
+    )
+  end
+
+  def verify_strings(hsh)
+    hsh.each do |regexp, expected|
+      expect(Capybara::Selector::RegexpDisassembler.new(regexp).substrings).to eq expected
+    end
+  end
+end

data/spec/selector_spec.rb

@@ -11,13 +11,13 @@ RSpec.describe Capybara do
             <title>selectors</title>
           </head>
           <body>
-            <div class="a" id="page">
-              <div class="b" id="content">
-                <h1 class="a">Totally awesome</h1>
+            <div class="aa" id="page">
+              <div class="bb" id="content">
+                <h1 class="aa">Totally awesome</h1>
                 <p>Yes it is</p>
               </div>
-              <p class="b c">Some Content</p>
-              <p class="b d"></p>
+              <p class="bb cc">Some Content</p>
+              <p class="bb dd"></p>
             </div>
             <div id="#special">
             </div>
@@ -31,6 +31,7 @@ RSpec.describe Capybara do
             <input type="file" id="file" class=".special file"/>
             <input type="hidden" id="hidden_field" value="this is hidden"/>
             <input type="submit" value="click me" title="submit button"/>
+            <input type="button" value="don't click me" title="Other button 1"/>
             <a href="#">link</a>
             <fieldset></fieldset>
             <select id="select">
@@ -84,12 +85,12 @@ RSpec.describe Capybara do
 
     describe 'modify_selector' do
       it 'allows modifying a selector' do
-        el = string.find(:custom_selector, 'a')
+        el = string.find(:custom_selector, 'aa')
         expect(el.tag_name).to eq 'div'
         Capybara.modify_selector :custom_selector do
           css { |css_class| "h1.#{css_class}" }
         end
-        el = string.find(:custom_selector, 'a')
+        el = string.find(:custom_selector, 'aa')
         expect(el.tag_name).to eq 'h1'
       end
 
@@ -97,9 +98,9 @@ RSpec.describe Capybara do
         Capybara.modify_selector :custom_selector do
           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)
-        expect(string).to have_selector(:custom_selector, 'b', not_empty: :all, count: 2)
+        expect(string).to have_selector(:custom_selector, 'bb', count: 1)
+        expect(string).to have_selector(:custom_selector, 'bb', not_empty: false, count: 1)
+        expect(string).to have_selector(:custom_selector, 'bb', not_empty: :all, count: 2)
       end
     end
 
@@ -147,19 +148,28 @@ RSpec.describe Capybara do
           expect { string.find(:custom_css_selector, 'div', id: XPath.contains('peci')) }
             .to raise_error(ArgumentError, /not supported/)
         end
+
+        it 'accepts Regexp for xpath based selectors' do
+          expect(string.find(:custom_xpath_selector, './/div', id: /peci/)[:id]).to eq '#special'
+          expect(string.find(:custom_xpath_selector, './/div', id: /pEcI/i)[:id]).to eq '#special'
+        end
+
+        it 'accepts Regexp for css based selectors' do
+          expect(string.find(:custom_css_selector, 'div', id: /sp.*al/)[:id]).to eq '#special'
+        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
+          expect(string.all(:custom_css_selector, 'div, h1', class: 'aa').size).to eq 2
+          expect(string.all(:custom_css_selector, 'h1, div', class: 'aa').size).to eq 2
         end
 
         it 'handles negated classes' do
-          expect(string.all(:custom_css_selector, 'div, p', class: ['b', '!c']).size).to eq 2
-          expect(string.all(:custom_css_selector, 'div, p', class: ['!c', '!d', 'b']).size).to eq 1
-          expect(string.all(:custom_xpath_selector, XPath.descendant(:div, :p), class: ['b', '!c']).size).to eq 2
-          expect(string.all(:custom_xpath_selector, XPath.descendant(:div, :p), class: ['!c', '!d', 'b']).size).to eq 1
+          expect(string.all(:custom_css_selector, 'div, p', class: ['bb', '!cc']).size).to eq 2
+          expect(string.all(:custom_css_selector, 'div, p', class: ['!cc', '!dd', 'bb']).size).to eq 1
+          expect(string.all(:custom_xpath_selector, XPath.descendant(:div, :p), class: ['bb', '!cc']).size).to eq 2
+          expect(string.all(:custom_xpath_selector, XPath.descendant(:div, :p), class: ['!cc', '!dd', 'bb']).size).to eq 1
         end
 
         it "works with 'special' characters" do
@@ -176,6 +186,15 @@ RSpec.describe Capybara do
           expect { string.find(:custom_css_selector, 'div', class: XPath.contains('random')) }
             .to raise_error(ArgumentError, /not supported/)
         end
+
+        it 'accepts Regexp for XPath based selectors' do
+          expect(string.find(:custom_xpath_selector, './/div', class: /dom wor/)[:id]).to eq 'random_words'
+          expect(string.find(:custom_xpath_selector, './/div', class: /dOm WoR/i)[:id]).to eq 'random_words'
+        end
+
+        it 'accepts Regexp for CSS base selectors' do
+          expect(string.find(:custom_css_selector, 'div', class: /random/)[:id]).to eq 'random_words'
+        end
       end
 
       # :css, :xpath, :id, :field, :fieldset, :link, :button, :link_or_button, :fillable_field, :radio_button, :checkbox, :select,
@@ -206,10 +225,14 @@ RSpec.describe Capybara do
           expect(string.find(:field, 'form[my_text_input]')[:id]).to eq 'my_text_input'
         end
 
-        it 'finds by id' do
+        it 'finds by id string' do
           expect(string.find(:field, id: 'my_text_input')[:name]).to eq 'form[my_text_input]'
         end
 
+        it 'finds by id regexp' do
+          expect(string.find(:field, id: /my_text_inp/)[: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
@@ -257,6 +280,18 @@ RSpec.describe Capybara do
           expect(string.find(:element, 'input', type: 'submit').value).to eq 'click me'
         end
 
+        it 'supports regexp matching' do
+          expect(string.find(:element, 'input', type: /sub/).value).to eq 'click me'
+          expect(string.find(:element, 'input', title: /sub\w.*button/).value).to eq 'click me'
+          expect(string.find(:element, 'input', title: /sub.* b.*ton/).value).to eq 'click me'
+          expect(string.find(:element, 'input', title: /sub.*mit.*/).value).to eq 'click me'
+          expect(string.find(:element, 'input', title: /^submit button$/).value).to eq 'click me'
+          expect(string.find(:element, 'input', title: /^(?:submit|other) button$/).value).to eq 'click me'
+          expect(string.find(:element, 'input', title: /SuB.*mIt/i).value).to eq 'click me'
+          expect(string.find(:element, 'input', title: /^Su.*Bm.*It/i).value).to eq 'click me'
+          expect(string.find(:element, 'input', title: /^Ot.*he.*r b.*\d/i).value).to eq "don't click me"
+        end
+
         it 'still works with system keys' do
           expect { string.all(:element, 'input', type: 'submit', count: 1) }.not_to raise_error
         end
@@ -289,7 +324,7 @@ RSpec.describe Capybara do
           expect(string.find(:element, 'input', type: XPath.ends_with('ext'))[:type]).to eq 'text'
           expect(string.find(:element, 'input', type: XPath.contains('ckb'))[:type]).to eq 'checkbox'
           expect(string.find(:element, 'input', title: XPath.contains_word('submit'))[:type]).to eq 'submit'
-          expect(string.find(:element, 'input', title: XPath.contains_word('button'))[:type]).to eq 'submit'
+          expect(string.find(:element, 'input', title: XPath.contains_word('button 1'))[:type]).to eq 'button'
         end
       end
     end

data/spec/selenium_spec_chrome.rb

@@ -84,4 +84,32 @@ RSpec.describe 'Capybara::Session with chrome' do
       end
     end
   end
+
+  describe 'filling in Chrome-specific date and time fields with keystrokes' do
+    let(:datetime) { Time.new(1983, 6, 19, 6, 30) }
+
+    before do
+      @session = TestSessions::Chrome
+      @session.visit('/form')
+    end
+
+    it 'should fill in a date input with a String' do
+      @session.fill_in('form_date', with: '06/19/1983')
+      @session.click_button('awesome')
+      expect(Date.parse(extract_results(@session)['date'])).to eq datetime.to_date
+    end
+
+    it 'should fill in a time input with a String' do
+      @session.fill_in('form_time', with: '06:30A')
+      @session.click_button('awesome')
+      results = extract_results(@session)['time']
+      expect(Time.parse(results).strftime('%r')).to eq datetime.strftime('%r')
+    end
+
+    it 'should fill in a datetime input with a String' do
+      @session.fill_in('form_datetime', with: "06/19/1983\t06:30A")
+      @session.click_button('awesome')
+      expect(Time.parse(extract_results(@session)['datetime'])).to eq datetime
+    end
+  end
 end

data/spec/selenium_spec_firefox_remote.rb

@@ -69,6 +69,8 @@ Capybara::SpecHelper.run_specs TestSessions::RemoteFirefox, FIREFOX_REMOTE_DRIVE
             'if files are already set'
   when 'Capybara::Session selenium_firefox_remote #attach_file with multipart form should fire change once when uploading multiple files from empty'
     pending "FF < 62 doesn't support setting all files at once" if marionette_lt?(62, @session)
+  when 'Capybara::Session selenium_firefox_remote #reset_session! removes ALL cookies'
+    pending "Geckodriver doesn't provide a way to remove cookies outside the current domain"
   end
 end
 

data/spec/selenium_spec_marionette.rb

@@ -65,6 +65,8 @@ Capybara::SpecHelper.run_specs TestSessions::SeleniumMarionette, 'selenium', cap
     skip 'Broken in FF 63 - https://bugzilla.mozilla.org/show_bug.cgi?id=1487358' if marionette_gte?(63, @session)
   when 'Capybara::Session selenium #click_link can download a file'
     skip 'Need to figure out testing of file downloading on windows platform' if Gem.win_platform?
+  when 'Capybara::Session selenium #reset_session! removes ALL cookies'
+    pending "Geckodriver doesn't provide a way to remove cookies outside the current domain"
   end
 end
 
@@ -169,4 +171,13 @@ RSpec.describe Capybara::Selenium::Node do
       expect(session).to have_link('Has been alt control meta')
     end
   end
+
+  context '#send_keys' do
+    it 'should process space' do
+      session = TestSessions::SeleniumMarionette
+      session.visit('/form')
+      session.find(:css, '#address1_city').send_keys('ocean', [:shift, :space, 'side'])
+      expect(session.find(:css, '#address1_city').value).to eq 'ocean SIDE'
+    end
+  end
 end

data/spec/shared_selenium_session.rb

@@ -334,6 +334,20 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
       end
     end
 
+    describe 'Capybara#Node#attach_file' do
+      it 'can attach a directory' do
+        pending "Geckodriver doesn't support uploading a directory" if marionette?(session)
+        pending "Selenium remote doesn't support transferring a directory" if remote?(session)
+        pending "Headless Chrome doesn't support directory upload - https://bugs.chromium.org/p/chromedriver/issues/detail?id=2521&q=directory%20upload&colspec=ID%20Status%20Pri%20Owner%20Summary" if chrome?(session) && ENV['HEADLESS']
+
+        session.visit('/form')
+        @test_file_dir = File.expand_path('./fixtures', File.dirname(__FILE__))
+        session.attach_file('Directory Upload', @test_file_dir)
+        session.click_button('Upload Multiple')
+        expect(session.body).to include('5 | ') # number of files
+      end
+    end
+
     context 'Windows' do
       it "can't close the primary window" do
         expect do
@@ -431,6 +445,12 @@ RSpec.shared_examples 'Capybara::Session' do |session, mode|
         expect(session).to have_selector(:element, :circle)
         expect(session).to have_selector(:element, :linearGradient, visible: :all)
       end
+
+      it 'can query attributes with strange characters' do
+        session.visit('/form')
+        expect(session).to have_selector(:element, "{custom}": true)
+        expect(session).to have_selector(:element, "{custom}": 'abcdef')
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -42,6 +42,10 @@ module Capybara
     def browser_name(session)
       session.driver.browser.browser if session.respond_to?(:driver)
     end
+
+    def remote?(session)
+      session.driver.browser.is_a? ::Selenium::WebDriver::Remote::Driver
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 3.8.0
+  version: 3.9.0
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -301,12 +301,15 @@ files:
 - lib/capybara/rspec/matcher_proxies.rb
 - lib/capybara/rspec/matchers.rb
 - lib/capybara/selector.rb
+- lib/capybara/selector/builders/css_builder.rb
+- lib/capybara/selector/builders/xpath_builder.rb
 - lib/capybara/selector/css.rb
 - lib/capybara/selector/filter.rb
 - lib/capybara/selector/filter_set.rb
 - lib/capybara/selector/filters/base.rb
 - lib/capybara/selector/filters/expression_filter.rb
 - lib/capybara/selector/filters/node_filter.rb
+- lib/capybara/selector/regexp_disassembler.rb
 - lib/capybara/selector/selector.rb
 - lib/capybara/selenium/driver.rb
 - lib/capybara/selenium/driver_specializations/chrome_driver.rb
@@ -452,6 +455,7 @@ files:
 - lib/capybara/spec/views/within_frames.erb
 - lib/capybara/version.rb
 - lib/capybara/window.rb
+- lib/capybara/xpath_patches.rb
 - spec/basic_node_spec.rb
 - spec/capybara_spec.rb
 - spec/css_splitter_spec.rb
@@ -466,6 +470,7 @@ files:
 - spec/minitest_spec_spec.rb
 - spec/per_session_config_spec.rb
 - spec/rack_test_spec.rb
+- spec/regexp_dissassembler_spec.rb
 - spec/result_spec.rb
 - spec/rspec/features_spec.rb
 - spec/rspec/scenarios_spec.rb