capybara 3.29.0 → 3.30.0

data/lib/capybara/session/config.rb

@@ -79,14 +79,18 @@ module Capybara
 
     remove_method :app_host=
     def app_host=(url)
-      raise ArgumentError, "Capybara.app_host should be set to a url (http://www.example.com). Attempted to set #{url.inspect}." unless url.nil? || url.match?(URI::DEFAULT_PARSER.make_regexp)
+      unless url.nil? || url.match?(URI::DEFAULT_PARSER.make_regexp)
+        raise ArgumentError, "Capybara.app_host should be set to a url (http://www.example.com). Attempted to set #{url.inspect}."
+      end
 
       @app_host = url
     end
 
     remove_method :default_host=
     def default_host=(url)
-      raise ArgumentError, "Capybara.default_host should be set to a url (http://www.example.com). Attempted to set #{url.inspect}." unless url.nil? || url.match?(URI::DEFAULT_PARSER.make_regexp)
+      unless url.nil? || url.match?(URI::DEFAULT_PARSER.make_regexp)
+        raise ArgumentError, "Capybara.default_host should be set to a url (http://www.example.com). Attempted to set #{url.inspect}."
+      end
 
       @default_host = url
     end

data/lib/capybara/session/matchers.rb

@@ -20,7 +20,7 @@ module Capybara
     # @return [true]
     #
     def assert_current_path(path, **options)
-      _verify_current_path(path, options) do |query|
+      _verify_current_path(path, **options) do |query|
         raise Capybara::ExpectationNotMet, query.failure_message unless query.resolves_for?(self)
       end
     end
@@ -36,7 +36,7 @@ module Capybara
     # @return [true]
     #
     def assert_no_current_path(path, **options)
-      _verify_current_path(path, options) do |query|
+      _verify_current_path(path, **options) do |query|
         raise Capybara::ExpectationNotMet, query.negative_failure_message if query.resolves_for?(self)
       end
     end
@@ -51,7 +51,7 @@ module Capybara
     # @return [Boolean]
     #
     def has_current_path?(path, **options)
-      make_predicate(options) { assert_current_path(path, options) }
+      make_predicate(options) { assert_current_path(path, **options) }
     end
 
     ##
@@ -64,13 +64,13 @@ module Capybara
     # @return [Boolean]
     #
     def has_no_current_path?(path, **options)
-      make_predicate(options) { assert_no_current_path(path, options) }
+      make_predicate(options) { assert_no_current_path(path, **options) }
     end
 
   private
 
-    def _verify_current_path(path, options)
-      query = Capybara::Queries::CurrentPathQuery.new(path, options)
+    def _verify_current_path(path, **options)
+      query = Capybara::Queries::CurrentPathQuery.new(path, **options)
       document.synchronize(query.wait) do
         yield(query)
       end

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

@@ -12,10 +12,21 @@ $(function() {
   $('#drag_html5, #drag_html5_scroll').on('dragstart', function(ev){
     ev.originalEvent.dataTransfer.setData("text", ev.target.id);
   });
+  $('#drag_html5, #drag_html5_scroll').on('dragend', function(ev){
+    $(this).after('<div class="log">DragEnd with client position: ' + ev.clientX + ',' + ev.clientY)
+  });
   $('#drop_html5, #drop_html5_scroll').on('dragover', function(ev){
     $(this).after('<div class="log">DragOver with client position: ' + ev.clientX + ',' + ev.clientY)
     if ($(this).hasClass('drop')) { ev.preventDefault(); }
   });
+  $('#drop_html5, #drop_html5_scroll').on('dragleave', function(ev){
+    $(this).after('<div class="log">DragLeave with client position: ' + ev.clientX + ',' + ev.clientY)
+    if ($(this).hasClass('drop')) { ev.preventDefault(); }
+  });
+  $('#drop_html5, #drop_html5_scroll').on('drop', function(ev){
+    $(this).after('<div class="log">Drop with client position: ' + ev.clientX + ',' + ev.clientY)
+    if ($(this).hasClass('drop')) { ev.preventDefault(); }
+  });
   $('#drop_html5, #drop_html5_scroll').on('drop', function(ev){
     ev.preventDefault();
     var oev = ev.originalEvent;

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

@@ -36,6 +36,13 @@ Capybara::SpecHelper.spec '#all' do
     expect(@result).to include('Smith', 'John', 'John Smith')
   end
 
+  it 'should allow reversing the order' do
+    @session.visit('/form')
+    fields = @session.all(:fillable_field, 'Name', exact: false).to_a
+    reverse_fields = @session.all(:fillable_field, 'Name', order: :reverse, exact: false).to_a
+    expect(fields).to eq(reverse_fields.reverse)
+  end
+
   it 'should raise an error when given invalid options' do
     expect { @session.all('//p', schmoo: 'foo') }.to raise_error(ArgumentError)
   end
@@ -128,6 +135,7 @@ Capybara::SpecHelper.spec '#all' do
       it 'should succeed when the number of elements founds matches the expectation' do
         expect { @session.all(:css, 'h1, p', count: 4) }.not_to raise_error
       end
+
       it 'should raise ExpectationNotMet when the number of elements founds does not match the expectation' do
         expect { @session.all(:css, 'h1, p', count: 5) }.to raise_error(Capybara::ExpectationNotMet)
       end
@@ -137,6 +145,7 @@ Capybara::SpecHelper.spec '#all' do
       it 'should succeed when the number of elements founds matches the expectation' do
         expect { @session.all(:css, 'h1, p', minimum: 0) }.not_to raise_error
       end
+
       it 'should raise ExpectationNotMet when the number of elements founds does not match the expectation' do
         expect { @session.all(:css, 'h1, p', minimum: 5) }.to raise_error(Capybara::ExpectationNotMet)
       end
@@ -146,6 +155,7 @@ Capybara::SpecHelper.spec '#all' do
       it 'should succeed when the number of elements founds matches the expectation' do
         expect { @session.all(:css, 'h1, p', maximum: 4) }.not_to raise_error
       end
+
       it 'should raise ExpectationNotMet when the number of elements founds does not match the expectation' do
         expect { @session.all(:css, 'h1, p', maximum: 0) }.to raise_error(Capybara::ExpectationNotMet)
       end
@@ -155,6 +165,7 @@ Capybara::SpecHelper.spec '#all' do
       it 'should succeed when the number of elements founds matches the expectation' do
         expect { @session.all(:css, 'h1, p', between: 2..7) }.not_to raise_error
       end
+
       it 'should raise ExpectationNotMet when the number of elements founds does not match the expectation' do
         expect { @session.all(:css, 'h1, p', between: 0..3) }.to raise_error(Capybara::ExpectationNotMet)
       end
@@ -175,6 +186,7 @@ Capybara::SpecHelper.spec '#all' do
               between: 0..3 }
         expect { @session.all(:css, 'h1, p', o) }.not_to raise_error
       end
+
       context 'with no :count expectation' do
         it 'fails if :minimum is not met' do
           o = { minimum: 5,
@@ -182,18 +194,21 @@ Capybara::SpecHelper.spec '#all' do
                 between: 2..7 }
           expect { @session.all(:css, 'h1, p', o) }.to raise_error(Capybara::ExpectationNotMet)
         end
+
         it 'fails if :maximum is not met' do
           o = { minimum: 0,
                 maximum: 0,
                 between: 2..7 }
           expect { @session.all(:css, 'h1, p', o) }.to raise_error(Capybara::ExpectationNotMet)
         end
+
         it 'fails if :between is not met' do
           o = { minimum: 0,
                 maximum: 4,
                 between: 0..3 }
           expect { @session.all(:css, 'h1, p', o) }.to raise_error(Capybara::ExpectationNotMet)
         end
+
         it 'succeeds if all combineable expectations are met' do
           o = { minimum: 0,
                 maximum: 4,

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

@@ -20,6 +20,11 @@ Capybara::SpecHelper.spec '#ancestor' do
     expect(el.ancestor('//div', text: "Ancestor\nAncestor\nAncestor")[:id]).to eq('ancestor3')
   end
 
+  it 'should find the closest ancestor' do
+    el = @session.find(:css, '#child')
+    expect(el.ancestor('.//div', order: :reverse, match: :first)[:id]).to eq('ancestor1')
+  end
+
   it 'should raise an error if there are multiple matches' do
     el = @session.find(:css, '#child')
     expect { el.ancestor('//div') }.to raise_error(Capybara::Ambiguous)

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

@@ -159,6 +159,7 @@ Capybara::SpecHelper.spec '#assert_text' do
             between: 0..4 }
       expect { @session.assert_text('Header', o) }.not_to raise_error
     end
+
     context 'with no :count expectation' do
       it 'fails if :minimum is not met' do
         o = { minimum: 6,
@@ -166,18 +167,21 @@ Capybara::SpecHelper.spec '#assert_text' do
               between: 2..7 }
         expect { @session.assert_text('Header', o) }.to raise_error(Capybara::ExpectationNotMet)
       end
+
       it 'fails if :maximum is not met' do
         o = { minimum: 0,
               maximum: 0,
               between: 2..7 }
         expect { @session.assert_text('Header', o) }.to raise_error(Capybara::ExpectationNotMet)
       end
+
       it 'fails if :between is not met' do
         o = { minimum: 0,
               maximum: 5,
               between: 0..4 }
         expect { @session.assert_text('Header', o) }.to raise_error(Capybara::ExpectationNotMet)
       end
+
       it 'succeeds if all combineable expectations are met' do
         o = { minimum: 0,
               maximum: 5,

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

@@ -186,6 +186,11 @@ Capybara::SpecHelper.spec '#click_button' do
       @session.click_button(name: 'form[awesome]')
       expect(extract_results(@session)['first_name']).to eq('John')
     end
+
+    it 'should submit by specific button name regex' do
+      @session.click_button(name: /form\[awes.*\]/)
+      expect(extract_results(@session)['first_name']).to eq('John')
+    end
   end
 
   context 'with fields associated with the form using the form attribute', requires: [:form_attribute] do

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

@@ -275,14 +275,17 @@ Capybara::SpecHelper.spec '#find' do
           @session.find(:css, '.multiple', match: :one)
         end.to raise_error(Capybara::Ambiguous)
       end
+
       it 'raises an error even if there the match is exact and the others are inexact' do
         expect do
           @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular')], exact: false, match: :one)
         end.to raise_error(Capybara::Ambiguous)
       end
+
       it 'returns the element if there is only one' do
         expect(@session.find(:css, '.singular', match: :one).text).to eq('singular')
       end
+
       it 'raises an error if there is no match' do
         expect do
           @session.find(:css, '.does-not-exist', match: :one)
@@ -294,6 +297,7 @@ Capybara::SpecHelper.spec '#find' do
       it 'returns the first matched element' do
         expect(@session.find(:css, '.multiple', match: :first).text).to eq('multiple one')
       end
+
       it 'raises an error if there is no match' do
         expect do
           @session.find(:css, '.does-not-exist', match: :first)
@@ -308,19 +312,23 @@ Capybara::SpecHelper.spec '#find' do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('multiple')], match: :smart, exact: false)
           end.to raise_error(Capybara::Ambiguous)
         end
+
         it 'finds a single exact match when there also are inexact matches' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular')], match: :smart, exact: false)
           expect(result.text).to eq('almost singular')
         end
+
         it 'raises an error when there are multiple inexact matches' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singul')], match: :smart, exact: false)
           end.to raise_error(Capybara::Ambiguous)
         end
+
         it 'finds a single inexact match' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular but')], match: :smart, exact: false)
           expect(result.text).to eq('almost singular but not quite')
         end
+
         it 'raises an error if there is no match' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('does-not-exist')], match: :smart, exact: false)
@@ -334,20 +342,24 @@ Capybara::SpecHelper.spec '#find' do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('multiple')], match: :smart, exact: true)
           end.to raise_error(Capybara::Ambiguous)
         end
+
         it 'finds a single exact match when there also are inexact matches' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular')], match: :smart, exact: true)
           expect(result.text).to eq('almost singular')
         end
+
         it 'raises an error when there are multiple inexact matches' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singul')], match: :smart, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
+
         it 'raises an error when there is a single inexact matches' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular but')], match: :smart, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
+
         it 'raises an error if there is no match' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('does-not-exist')], match: :smart, exact: true)
@@ -362,18 +374,22 @@ Capybara::SpecHelper.spec '#find' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('multiple')], match: :prefer_exact, exact: false)
           expect(result.text).to eq('multiple one')
         end
+
         it 'finds a single exact match when there also are inexact matches' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular')], match: :prefer_exact, exact: false)
           expect(result.text).to eq('almost singular')
         end
+
         it 'picks the first one when there are multiple inexact matches' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singul')], match: :prefer_exact, exact: false)
           expect(result.text).to eq('almost singular but not quite')
         end
+
         it 'finds a single inexact match' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular but')], match: :prefer_exact, exact: false)
           expect(result.text).to eq('almost singular but not quite')
         end
+
         it 'raises an error if there is no match' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('does-not-exist')], match: :prefer_exact, exact: false)
@@ -386,20 +402,24 @@ Capybara::SpecHelper.spec '#find' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('multiple')], match: :prefer_exact, exact: true)
           expect(result.text).to eq('multiple one')
         end
+
         it 'finds a single exact match when there also are inexact matches' do
           result = @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular')], match: :prefer_exact, exact: true)
           expect(result.text).to eq('almost singular')
         end
+
         it 'raises an error if there are multiple inexact matches' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singul')], match: :prefer_exact, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
+
         it 'raises an error if there is a single inexact match' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('almost_singular but')], match: :prefer_exact, exact: true)
           end.to raise_error(Capybara::ElementNotFound)
         end
+
         it 'raises an error if there is no match' do
           expect do
             @session.find(:xpath, XPath.descendant[XPath.attr(:class).is('does-not-exist')], match: :prefer_exact, exact: true)

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

@@ -143,10 +143,56 @@ Capybara::SpecHelper.spec '#has_no_table?' do
      ])
   end
 
-  it 'should consider columns' do
-    expect(@session).to have_no_table('Vertical Headers', with_cols:
-      [
-        { 'First Name' => 'Joe' }
-      ])
+  context 'using :with_cols' do
+    it 'should consider a single column' do
+      expect(@session).to have_no_table('Vertical Headers', with_cols:
+        [
+          { 'First Name' => 'Joe' }
+        ])
+    end
+
+    it 'should be true even if the last column does exist' do
+      expect(@session).to have_no_table('Vertical Headers', with_cols:
+        [
+          {
+            'First Name' => 'What?',
+            'What?' => 'Walpole',
+            'City' => 'Oceanside' # This line makes the example fail
+          }
+        ])
+    end
+
+    it 'should be true if none of the columns exist' do
+      expect(@session).to have_no_table('Vertical Headers', with_cols:
+        [
+          {
+            'First Name' => 'What?',
+            'What?' => 'Walpole',
+            'City' => 'What?'
+          }
+        ])
+    end
+
+    it 'should be true if the first column does match' do
+      expect(@session).to have_no_table('Vertical Headers', with_cols:
+        [
+          {
+            'First Name' => 'Thomas',
+            'Last Name' => 'What',
+            'City' => 'What'
+          }
+        ])
+    end
+
+    it 'should be true if none of the columns match' do
+      expect(@session).to have_no_table('Vertical Headers', with_cols:
+        [
+          {
+            'First Name' => 'What',
+            'Last Name' => 'What',
+            'City' => 'What'
+          }
+        ])
+    end
   end
 end

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

@@ -111,6 +111,37 @@ Capybara::SpecHelper.spec '#has_text?' do
     expect(@session).not_to have_text(/xxxxyzzz/)
   end
 
+  context 'with object implementing to_s and to_hash' do
+    it 'should work if the object is passed alone' do
+      with_to_hash = Class.new do
+        def to_s; '42' end
+        def to_hash; { value: 'Other hash' } end
+      end.new
+      @session.visit('/with_html')
+      expect(@session).to have_text(with_to_hash)
+    end
+
+    it 'should work if passed with empty options' do
+      with_to_hash = Class.new do
+        def to_s; '42' end
+        def to_hash; { value: 'Other hash' } end
+      end.new
+      @session.visit('/with_html')
+      expect(@session).to have_text(:visible, with_to_hash, {})
+    end
+
+    it 'should fail if passed without empty options' do
+      with_to_hash = Class.new do
+        def to_s; '42' end
+        def to_hash; { blah: 'Other hash' } end
+      end.new
+      @session.visit('/with_html')
+      expect do
+        expect(@session).to have_text(:visible, with_to_hash)
+      end.to raise_error(ArgumentError)
+    end
+  end
+
   context 'with exact: true option' do
     it 'should be true if text matches exactly' do
       @session.visit('/with_html')

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

@@ -493,6 +493,21 @@ Capybara::SpecHelper.spec 'node' do
         expect(@session).to have_css('div.log', text: /DragOver with client position: [1-9]\d*,[1-9]\d*/, count: 2)
       end
 
+      it 'should preserve clientX/Y from last dragover event' do
+        @session.visit('/with_js')
+        element = @session.find('//div[@id="drag_html5"]')
+        target = @session.find('//div[@id="drop_html5"]')
+        element.drag_to(target)
+
+        # The first "DragOver" div is inserted by the last dragover event dispatched
+        drag_over_div = @session.find('//div[@class="log" and starts-with(text(), "DragOver")]', match: :first)
+        position = drag_over_div.text.sub('DragOver ', '')
+
+        expect(@session).to have_css('div.log', text: /DragLeave #{position}/, count: 1)
+        expect(@session).to have_css('div.log', text: /Drop #{position}/, count: 1)
+        expect(@session).to have_css('div.log', text: /DragEnd #{position}/, count: 1)
+      end
+
       it 'should not HTML5 drag and drop on a non HTML5 drop element' do
         @session.visit('/with_js')
         element = @session.find('//div[@id="drag_html5"]')