capybara 2.13.0 → 2.14.0

data/lib/capybara/session/config.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+require 'delegate'
+
+module Capybara
+  class SessionConfig
+    OPTIONS = [:always_include_port, :run_server, :default_selector, :default_max_wait_time, :ignore_hidden_elements,
+               :automatic_reload, :match, :exact, :exact_text, :raise_server_errors, :visible_text_only, :wait_on_first_by_default,
+               :automatic_label_click, :enable_aria_label, :save_path, :exact_options, :asset_host, :default_host, :app_host,
+               :save_and_open_page_path, :server_host, :server_port, :server_errors]
+
+    attr_accessor *OPTIONS
+
+    ##
+    #@!method always_include_port
+    #  See {Capybara#configure}
+    #@!method run_server
+    #  See {Capybara#configure}
+    #@!method default_selector
+    #  See {Capybara#configure}
+    #@!method default_max_wait_time
+    #  See {Capybara#configure}
+    #@!method ignore_hidden_elements
+    #  See {Capybara#configure}
+    #@!method automatic_reload
+    #  See {Capybara#configure}
+    #@!method match
+    #  See {Capybara#configure}
+    #@!method exact
+    #  See {Capybara#configure}
+    #@!method raise_server_errors
+    #  See {Capybara#configure}
+    #@!method visible_text_only
+    #  See {Capybara#configure}
+    #@!method wait_on_first_by_default
+    #  See {Capybara#configure}
+    #@!method automatic_label_click
+    #  See {Capybara#configure}
+    #@!method enable_aria_label
+    #  See {Capybara#configure}
+    #@!method save_path
+    #  See {Capybara#configure}
+    #@!method exact_options
+    #  See {Capybara#configure}
+    #@!method asset_host
+    #  See {Capybara#configure}
+    #@!method default_host
+    #  See {Capybara#configure}
+    #@!method app_host
+    #  See {Capybara#configure}
+    #@!method save_and_open_page_path
+    #  See {Capybara#configure}
+    #@!method server_host
+    #  See {Capybara#configure}
+    #@!method server_port
+    #  See {Capybara#configure}
+    #@!method server_errors
+    #  See {Capybara#configure}
+
+    ##
+    #
+    # @return [String]    The IP address bound by default server
+    #
+    def server_host
+      @server_host || '127.0.0.1'
+    end
+
+    def server_errors=(errors)
+      (@server_errors ||= []).replace(errors.dup)
+    end
+
+    def app_host=(url)
+      raise ArgumentError.new("Capybara.app_host should be set to a url (http://www.example.com)") unless url.nil? || (url =~ URI::Parser.new.make_regexp)
+      @app_host = url
+    end
+
+    def default_host=(url)
+      raise ArgumentError.new("Capybara.default_host should be set to a url (http://www.example.com)") unless url.nil? || (url =~ URI::Parser.new.make_regexp)
+      @default_host = url
+    end
+
+    def save_and_open_page_path=(path)
+      warn "DEPRECATED: #save_and_open_page_path is deprecated, please use #save_path instead. \n"\
+           "Note: Behavior is slightly different with relative paths - see documentation" unless path.nil?
+      @save_and_open_page_path = path
+    end
+
+    def initialize_copy(other)
+      super
+      @server_errors = @server_errors.dup
+    end
+  end
+
+  class ReadOnlySessionConfig < SimpleDelegator
+    SessionConfig::OPTIONS.each do |m|
+      define_method "#{m}=" do |val|
+        raise "Per session settings are only supported when Capybara.threadsafe == true"
+      end
+    end
+  end
+end

data/lib/capybara/spec/public/test.js

@@ -58,7 +58,7 @@ $(function() {
   $('#change-title').click(function() {
     setTimeout(function() {
       $('title').text('changed title')
-    }, 250)
+    }, 400)
   });
   $('#click-test').on({
     dblclick: function() {

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

@@ -66,6 +66,17 @@ Capybara::SpecHelper.spec "#all" do
       Capybara.ignore_hidden_elements = false
       expect(@session.all(:css, "a.simple").size).to eq(2)
     end
+
+    context "with per session config", requires: [:psc] do
+      it "should use the sessions ignore_hidden_elements", psc: true do
+        Capybara.ignore_hidden_elements = true
+        @session.config.ignore_hidden_elements = false
+        expect(Capybara.ignore_hidden_elements).to eq(true)
+        expect(@session.all(:css, "a.simple").size).to eq(2)
+        @session.config.ignore_hidden_elements = true
+        expect(@session.all(:css, "a.simple").size).to eq(1)
+      end
+    end
   end
 
   context 'with element count filters' do

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

@@ -18,10 +18,18 @@ Capybara::SpecHelper.spec '#assert_all_of_selectors' do
     @session.assert_all_of_selectors("p a#foo", "h2#h2two", "h2#h2one" )
   end
 
-  it "should respect scopes" do
-    @session.within "//p[@id='first']" do
-      @session.assert_all_of_selectors(".//a[@id='foo']")
-      expect { @session.assert_all_of_selectors(".//a[@id='red']") }.to raise_error(Capybara::ElementNotFound)
+  context "should respect scopes" do
+    it "when used with `within`" do
+      @session.within "//p[@id='first']" do
+        @session.assert_all_of_selectors(".//a[@id='foo']")
+        expect { @session.assert_all_of_selectors(".//a[@id='red']") }.to raise_error(Capybara::ElementNotFound)
+      end
+    end
+
+    it "when called on elements" do
+      el = @session.find "//p[@id='first']"
+      el.assert_all_of_selectors(".//a[@id='foo']")
+      expect { el.assert_all_of_selectors(".//a[@id='red']") }.to raise_error(Capybara::ElementNotFound)
     end
   end
 
@@ -65,10 +73,18 @@ Capybara::SpecHelper.spec '#assert_none_of_selectors' do
     expect { @session.assert_none_of_selectors("abbr", "p a#foo") }.to raise_error(Capybara::ElementNotFound)
   end
 
-  it "should respect scopes" do
-    @session.within "//p[@id='first']" do
-      expect { @session.assert_none_of_selectors(".//a[@id='foo']") }.to raise_error(Capybara::ElementNotFound)
-      @session.assert_none_of_selectors(".//a[@id='red']")
+  context "should respect scopes" do
+    it "when used with `within`" do
+      @session.within "//p[@id='first']" do
+        expect { @session.assert_none_of_selectors(".//a[@id='foo']") }.to raise_error(Capybara::ElementNotFound)
+        @session.assert_none_of_selectors(".//a[@id='red']")
+      end
+    end
+
+    it "when called on an element" do
+      el = @session.find "//p[@id='first']"
+      expect { el.assert_none_of_selectors(".//a[@id='foo']") }.to raise_error(Capybara::ElementNotFound)
+      el.assert_none_of_selectors(".//a[@id='red']")
     end
   end
 

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

@@ -106,6 +106,12 @@ Capybara::SpecHelper.spec "#fill_in" do
     expect(extract_results(@session)['first_name']).to eq('Thomas')
   end
 
+  it "should fill in a field based on type" do
+    @session.fill_in(type: 'schmooo', with: 'Schmooo for all')
+    @session.click_button('awesome')
+    expect(extract_results(@session)['schmooo']).to eq('Schmooo for all')
+  end
+
   it "should throw an exception if a hash containing 'with' is not provided" do
     expect {@session.fill_in 'Name', 'ignu'}.to raise_error(RuntimeError, /with/)
   end

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

@@ -8,6 +8,7 @@ Capybara::SpecHelper.spec '#find_field' do
     expect(@session.find_field('Dog').value).to eq('dog')
     expect(@session.find_field('form_description').text).to eq('Descriptive text goes here')
     expect(@session.find_field('Region')[:name]).to eq('form[region]')
+    expect(@session.find_field('With Asterisk*')).to be
   end
 
   context "aria_label attribute with Capybara.enable_aria_label" do

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

@@ -421,8 +421,9 @@ Capybara::SpecHelper.spec '#find' do
     end
   end
 
-  it "should warn if selector type is unknown" do
-    expect_any_instance_of(Kernel).to receive(:warn).with(/^Unknown selector type/)
-    @session.find(:unknown, '//h1')
+  it "should raise if selector type is unknown" do
+    expect do
+      @session.find(:unknown, '//h1')
+    end.to raise_error(ArgumentError)
   end
 end

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

@@ -131,9 +131,7 @@ Capybara::SpecHelper.spec '#has_no_selector?' do
   end
 
   it "should accept a filter block" do
-    if !defined?(::RSpec::Expectations::Version) || (Gem::Version.new(RSpec::Expectations::Version::STRING) < Gem::Version.new('3.0'))
-      skip "RSpec < 3 doesn't pass the block along to the matcher for the Builtin::Has matcher"
-    end
+    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
 

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

@@ -122,23 +122,25 @@ Capybara::SpecHelper.spec "node" do
       expect(@session.first('//textarea[@readonly]').set('changed')).to raise_error(Capybara::ReadOnlyElementError)
     end if Capybara::VERSION.to_f > 3.0
 
-    it 'should allow me to change the contents of a contenteditable element', requires: [:js] do
-      @session.visit('/with_js')
-      @session.find(:css,'#existing_content_editable').set('WYSIWYG')
-      expect(@session.find(:css,'#existing_content_editable').text).to eq('WYSIWYG')
-    end
+    context "with a contenteditable element", requires: [:js] do
+      it 'should allow me to change the contents' do
+        @session.visit('/with_js')
+        @session.find(:css,'#existing_content_editable').set('WYSIWYG')
+        expect(@session.find(:css,'#existing_content_editable').text).to eq('WYSIWYG')
+      end
 
-    it 'should allow me to set the contents of a contenteditable element', requires: [:js] do
-      @session.visit('/with_js')
-      @session.find(:css,'#blank_content_editable').set('WYSIWYG')
-      expect(@session.find(:css,'#blank_content_editable').text).to eq('WYSIWYG')
-    end
+      it 'should allow me to set the contents' do
+        @session.visit('/with_js')
+        @session.find(:css,'#blank_content_editable').set('WYSIWYG')
+        expect(@session.find(:css,'#blank_content_editable').text).to eq('WYSIWYG')
+      end
 
-    it 'should allow me to change the contents of a contenteditable elements child', requires: [:js] do
-      @session.visit('/with_js')
-      @session.find(:css,'#existing_content_editable_child').set('WYSIWYG')
-      expect(@session.find(:css,'#existing_content_editable_child').text).to eq('WYSIWYG')
-      expect(@session.find(:css,'#existing_content_editable_child_parent').text).to eq('Some content WYSIWYG')
+      it 'should allow me to change the contents of a child element' do
+        @session.visit('/with_js')
+        @session.find(:css,'#existing_content_editable_child').set('WYSIWYG')
+        expect(@session.find(:css,'#existing_content_editable_child').text).to eq('WYSIWYG')
+        expect(@session.find(:css,'#existing_content_editable_child_parent').text).to eq('Some content WYSIWYG')
+      end
     end
   end
 
@@ -289,7 +291,6 @@ Capybara::SpecHelper.spec "node" do
 
   describe '#drag_to', requires: [:js, :drag] do
     it "should drag and drop an object" do
-      pending "selenium-webdriver/geckodriver doesn't support mouse move_to" if marionette?(@session)
       @session.visit('/with_js')
       element = @session.find('//div[@id="drag"]')
       target = @session.find('//div[@id="drop"]')
@@ -300,7 +301,6 @@ Capybara::SpecHelper.spec "node" do
 
   describe '#hover', requires: [:hover] do
     it "should allow hovering on an element" do
-      pending "selenium-webdriver/geckodriver doesn't support mouse move_to" if marionette?(@session)
       @session.visit('/with_hover')
       expect(@session.find(:css,'.hidden_until_hover', visible: false)).not_to be_visible
       @session.find(:css,'.wrapper').hover
@@ -314,6 +314,12 @@ Capybara::SpecHelper.spec "node" do
       expect(@session.current_url).to match(%r{/with_html$})
     end
 
+    it "should go to the same page if href is blank" do
+      @session.find(:css, '#link_blank_href').click
+      sleep 1
+      expect(@session).to have_current_path('/with_html')
+    end
+
     it "should be able to check a checkbox" do
       @session.visit('form')
       cbox = @session.find(:checkbox, 'form_terms_of_use')

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

@@ -88,7 +88,7 @@ Capybara::SpecHelper.spec '#reset_session!' do
   end
 
   it "raises configured errors caught inside the server", requires: [:server] do
-    prev_errors = Capybara.server_errors
+    prev_errors = Capybara.server_errors.dup
 
     Capybara.server_errors = [LoadError]
     quietly { @session.visit("/error") }

data/lib/capybara/spec/session/window/become_closed_spec.rb

@@ -60,18 +60,18 @@ Capybara::SpecHelper.spec '#become_closed', requires: [:windows, :js] do
   end
 
   context 'with not_to' do
-    it 'should raise error if default_max_wait_time is more than timeout' do
+    it "should not raise error if window doesn't close before default_max_wait_time" do
       @session.within_window @other_window do
-        @session.execute_script('setTimeout(function(){ window.close(); }, 700);')
+        @session.execute_script('setTimeout(function(){ window.close(); }, 1000);')
       end
-      Capybara.using_wait_time 0.4 do
+      Capybara.using_wait_time 0.3 do
         expect do
           expect(@other_window).not_to become_closed
         end
       end
     end
 
-    it 'should raise error if default_max_wait_time is more than timeout' do
+    it 'should raise error if window closes before default_max_wait_time' do
       @session.within_window @other_window do
         @session.execute_script('setTimeout(function(){ window.close(); }, 700);')
       end

data/lib/capybara/spec/spec_helper.rb

@@ -39,6 +39,7 @@ module Capybara
         Capybara.match = :smart
         Capybara.wait_on_first_by_default = false
         Capybara.enable_aria_label = false
+        reset_threadsafe
       end
 
       def filter(requires, metadata)
@@ -64,9 +65,19 @@ module Capybara
           before do
             @session = session
           end
+
           after do
             @session.reset_session!
           end
+
+          before :each, psc: true do
+            SpecHelper.reset_threadsafe(true, @session)
+          end
+
+          after psc: true do
+            SpecHelper.reset_threadsafe(false, @session)
+          end
+
           specs.each do |spec_name, spec_options, block|
             describe spec_name, spec_options do
               class_eval(&block)
@@ -74,6 +85,13 @@ module Capybara
           end
         end
       end
+
+      def reset_threadsafe(bool = false, session = nil)
+        Capybara::Session.class_variable_set(:@@instance_created, false) # Work around limit on when threadsafe can be changed
+        Capybara.threadsafe = bool
+        session = session.current_session if session.respond_to?(:current_session)
+        session.instance_variable_set(:@config, nil) if session
+      end
     end # class << self
 
     def silence_stream(stream)
@@ -101,6 +119,10 @@ module Capybara
     def marionette?(session)
       session.driver.respond_to?(:marionette?) && session.driver.marionette?
     end
+
+    def rspec2?
+      !defined?(::RSpec::Expectations::Version) || (Gem::Version.new(RSpec::Expectations::Version::STRING) < Gem::Version.new('3.0'))
+    end
   end
 end
 

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

@@ -586,6 +586,11 @@ New line after and before textarea tag
 </label>
 
 <label>Confusion
-  <textarea id="confusion_textarea" class="confusion confusion-textarea"/>
+  <textarea id="confusion_textarea" class="confusion confusion-textarea"></textarea>
 </label>
 
+<p>
+  <label for="asterisk_input">With Asterisk<abbr title="required">*</abbr></label>
+  <input id="asterisk_input" type="number"value="2016"/>
+</p>
+

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

@@ -119,4 +119,5 @@ banana</textarea>
 
 <div>
   <a id="link_placeholder">No href</a>
+  <a id="link_blank_href" href="">Blank href</a>
 </div>

data/lib/capybara/version.rb

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

data/lib/capybara/window.rb

@@ -115,7 +115,7 @@ module Capybara
 
     private
 
-    def wait_for_stable_size(seconds=Capybara.default_max_wait_time)
+    def wait_for_stable_size(seconds=session.config.default_max_wait_time)
       res = yield if block_given?
       prev_size = size
       start_time = Capybara::Helpers.monotonic_time

data/spec/capybara_spec.rb

@@ -14,8 +14,8 @@ RSpec.describe Capybara do
     end
 
     it "should be accesible as the deprecated default_wait_time" do
-      expect(Capybara).to receive(:warn).ordered.with('DEPRECATED: #default_wait_time= is deprecated, please use #default_max_wait_time= instead')
-      expect(Capybara).to receive(:warn).ordered.with('DEPRECATED: #default_wait_time is deprecated, please use #default_max_wait_time instead')
+      expect(Capybara.send(:config)).to receive(:warn).ordered.with('DEPRECATED: #default_wait_time= is deprecated, please use #default_max_wait_time= instead')
+      expect(Capybara.send(:config)).to receive(:warn).ordered.with('DEPRECATED: #default_wait_time is deprecated, please use #default_max_wait_time instead')
       @previous_default_time = Capybara.default_max_wait_time
       Capybara.default_wait_time = 5
       expect(Capybara.default_wait_time).to eq(5)
@@ -114,6 +114,18 @@ RSpec.describe Capybara do
       expect { Capybara.default_host = "http://www.example.com" }.not_to raise_error
     end
   end
+
+  describe "configure" do
+    it 'deprecates calling non configuration option methods in configure' do
+      expect_any_instance_of(Kernel).to receive(:warn).
+        with('Calling register_driver from Capybara.configure is deprecated - please call it on Capybara directly ( Capybara.register_driver(...) )')
+      Capybara.configure do |config|
+        config.register_driver(:random_name) do
+          #just a random block
+        end
+      end
+    end
+  end
 end
 
 RSpec.describe Capybara::Session do

data/spec/dsl_spec.rb

@@ -16,6 +16,7 @@ Capybara::SpecHelper.run_specs TestClass.new, "DSL", capybara_skip: [
   :server,
   :hover,
   :about_scheme,
+  :psc
 ]
 
 RSpec.describe Capybara::DSL do