capybara 3.29.0 → 3.31.0

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

@@ -1,21 +1,57 @@
 var activeRequests = 0;
 $(function() {
   $('#change').text('I changed it');
-  $('#drag, #drag_scroll, #drag_link').draggable();
+  $('#drag, #drag_scroll, #drag_link').draggable({
+    start: function(event, ui){
+      $(document.body).append(
+        "<div class='drag_start'>Dragged!" +
+          (event.altKey ? "-alt" : "") +
+          (event.ctrlKey ? "-ctrl" : "") +
+          (event.metaKey ? "-meta" : "") +
+          (event.shiftKey ? "-shift" : "") +
+          "</div>"
+      );
+    }
+  });
   $('#drop, #drop_scroll').droppable({
     tolerance: 'touch',
     drop: function(event, ui) {
       ui.draggable.remove();
-      $(this).html('Dropped!');
+      $(this).html(
+        "Dropped!" +
+          (event.altKey ? "-alt" : "") +
+          (event.ctrlKey ? "-ctrl" : "") +
+          (event.metaKey ? "-meta" : "") +
+          (event.shiftKey ? "-shift" : "")
+      );
     }
   });
   $('#drag_html5, #drag_html5_scroll').on('dragstart', function(ev){
+    $(document.body).append(
+        "<div class='drag_start'>HTML5 Dragged!" +
+          (event.altKey ? "-alt" : "") +
+          (event.ctrlKey ? "-ctrl" : "") +
+          (event.metaKey ? "-meta" : "") +
+          (event.shiftKey ? "-shift" : "") +
+          "</div>"
+    );
     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;
@@ -27,10 +63,19 @@ $(function() {
           $(this).append('HTML5 Dropped file: ' + file.name);
         } else {
           var _this = this;
-          var callback = (function(type){
-            return function(s){
-              $(_this).append('HTML5 Dropped string: ' + type + ' ' + s)
-            }
+          var callback = (function(type) {
+            return function(s) {
+              $(_this).append(
+                "HTML5 Dropped string: " +
+                  type +
+                  " " +
+                  s +
+                  (ev.altKey ? "-alt" : "") +
+                  (ev.ctrlKey ? "-ctrl" : "") +
+                  (ev.metaKey ? "-meta" : "") +
+                  (ev.shiftKey ? "-shift" : "")
+              );
+            };
           })(item.type);
           item.getAsString(callback);
         }

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

@@ -36,10 +36,50 @@ 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
 
+  it 'should not reload by default', requires: [:driver] do
+    paras = @session.all(:css, 'p', minimum: 3)
+    expect { paras[0].text }.not_to raise_error
+    @session.refresh
+    expect { paras[0].text }.to raise_error do |err|
+      expect(err).to be_an_invalid_element_error(@session)
+    end
+  end
+
+  context 'with allow_reload' do
+    it 'should reload if true' do
+      paras = @session.all(:css, 'p', allow_reload: true, minimum: 3)
+      expect { paras[0].text }.not_to raise_error
+      @session.refresh
+      sleep 1 # Ensure page has started to reload
+      expect(paras[0]).to have_text('Lorem ipsum dolor')
+      expect(paras[1]).to have_text('Duis aute irure dolor')
+    end
+
+    it 'should not reload if false', requires: [:driver] do
+      paras = @session.all(:css, 'p', allow_reload: false, minimum: 3)
+      expect { paras[0].text }.not_to raise_error
+      @session.refresh
+      sleep 1 # Ensure page has started to reload
+      expect { paras[0].text }.to raise_error do |err|
+        expect(err).to be_an_invalid_element_error(@session)
+      end
+      expect { paras[2].text }.to raise_error do |err|
+        expect(err).to be_an_invalid_element_error(@session)
+      end
+    end
+  end
+
   context 'with css selectors' do
     it 'should find all elements using the given selector' do
       expect(@session.all(:css, 'h1').first.text).to eq('This is a test')
@@ -128,6 +168,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 +178,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 +188,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 +198,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
@@ -165,6 +209,13 @@ Capybara::SpecHelper.spec '#all' do
           expect { @session.all(:css, 'h1, p', between: 5..) }.to raise_error(Capybara::ExpectationNotMet)
         end
       TEST
+
+      eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.6
+        it'treats a beginless range as maximum' do
+          expect { @session.all(:css, 'h1, p', between: ..7) }.not_to raise_error
+          expect { @session.all(:css, 'h1, p', between: ..3) }.to raise_error(Capybara::ExpectationNotMet)
+        end
+      TEST
     end
 
     context 'with multiple count filters' do
@@ -173,32 +224,36 @@ Capybara::SpecHelper.spec '#all' do
               minimum: 5,
               maximum: 0,
               between: 0..3 }
-        expect { @session.all(:css, 'h1, p', o) }.not_to raise_error
+        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,
                 maximum: 4,
                 between: 2..7 }
-          expect { @session.all(:css, 'h1, p', o) }.to raise_error(Capybara::ExpectationNotMet)
+          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)
+          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)
+          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,
                 between: 2..7 }
-          expect { @session.all(:css, 'h1, p', o) }.not_to raise_error
+          expect { @session.all(:css, 'h1, p', **o) }.not_to raise_error
         end
       end
     end

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

@@ -157,32 +157,36 @@ Capybara::SpecHelper.spec '#assert_text' do
             minimum: 6,
             maximum: 0,
             between: 0..4 }
-      expect { @session.assert_text('Header', o) }.not_to raise_error
+      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,
               maximum: 5,
               between: 2..7 }
-        expect { @session.assert_text('Header', o) }.to raise_error(Capybara::ExpectationNotMet)
+        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)
+        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)
+        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,
               between: 2..7 }
-        expect { @session.assert_text('Header', o) }.not_to raise_error
+        expect { @session.assert_text('Header', **o) }.not_to raise_error
       end
     end
   end

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/fill_in_spec.rb

@@ -95,6 +95,26 @@ Capybara::SpecHelper.spec '#fill_in' do
     expect(extract_results(@session)['html5_color']).to eq('#112233')
   end
 
+  describe 'with input[type="range"]' do
+    it 'should set the range slider correctly' do
+      @session.fill_in('form_age', with: 51)
+      @session.click_button('awesome')
+      expect(extract_results(@session)['age'].to_f).to eq 51
+    end
+
+    it 'should set the range slider to valid values' do
+      @session.fill_in('form_age', with: '37.6')
+      @session.click_button('awesome')
+      expect(extract_results(@session)['age'].to_f).to eq 37.5
+    end
+
+    it 'should respect the range slider limits' do
+      @session.fill_in('form_age', with: '3')
+      @session.click_button('awesome')
+      expect(extract_results(@session)['age'].to_f).to eq 13
+    end
+  end
+
   it 'should fill in a field with a custom type' do
     @session.fill_in('Schmooo', with: 'Schmooo is the game')
     @session.click_button('awesome')

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)