RubyGems - capybara - Versions diffs - 3.1.1 → 3.2.0 - Mend

capybara 3.1.1 → 3.2.0

Files changed (73) hide show

checksums.yaml +4 -4
data/History.md +19 -0
data/README.md +1 -1
data/lib/capybara.rb +2 -0
data/lib/capybara/config.rb +2 -1
data/lib/capybara/driver/base.rb +1 -1
data/lib/capybara/driver/node.rb +3 -3
data/lib/capybara/node/actions.rb +90 -92
data/lib/capybara/node/base.rb +2 -2
data/lib/capybara/node/document_matchers.rb +5 -5
data/lib/capybara/node/element.rb +47 -16
data/lib/capybara/node/finders.rb +13 -13
data/lib/capybara/node/matchers.rb +18 -17
data/lib/capybara/node/simple.rb +6 -2
data/lib/capybara/queries/ancestor_query.rb +1 -1
data/lib/capybara/queries/base_query.rb +3 -3
data/lib/capybara/queries/current_path_query.rb +1 -1
data/lib/capybara/queries/match_query.rb +8 -0
data/lib/capybara/queries/selector_query.rb +97 -42
data/lib/capybara/queries/sibling_query.rb +1 -1
data/lib/capybara/queries/text_query.rb +12 -7
data/lib/capybara/rack_test/browser.rb +9 -7
data/lib/capybara/rack_test/form.rb +15 -17
data/lib/capybara/rack_test/node.rb +12 -12
data/lib/capybara/result.rb +26 -15
data/lib/capybara/rspec.rb +1 -2
data/lib/capybara/rspec/compound.rb +4 -4
data/lib/capybara/rspec/matchers.rb +2 -2
data/lib/capybara/selector.rb +75 -225
data/lib/capybara/selector/css.rb +2 -2
data/lib/capybara/selector/filter_set.rb +17 -21
data/lib/capybara/selector/filters/base.rb +24 -1
data/lib/capybara/selector/filters/expression_filter.rb +3 -5
data/lib/capybara/selector/filters/node_filter.rb +4 -4
data/lib/capybara/selector/selector.rb +221 -69
data/lib/capybara/selenium/driver.rb +15 -88
data/lib/capybara/selenium/node.rb +25 -28
data/lib/capybara/server.rb +10 -54
data/lib/capybara/server/animation_disabler.rb +43 -0
data/lib/capybara/server/middleware.rb +55 -0
data/lib/capybara/session.rb +29 -30
data/lib/capybara/session/config.rb +11 -1
data/lib/capybara/session/matchers.rb +5 -5
data/lib/capybara/spec/session/assert_text_spec.rb +1 -1
data/lib/capybara/spec/session/body_spec.rb +10 -12
data/lib/capybara/spec/session/click_link_spec.rb +3 -3
data/lib/capybara/spec/session/element/assert_match_selector_spec.rb +1 -1
data/lib/capybara/spec/session/fill_in_spec.rb +9 -0
data/lib/capybara/spec/session/find_field_spec.rb +1 -1
data/lib/capybara/spec/session/find_spec.rb +8 -3
data/lib/capybara/spec/session/has_link_spec.rb +2 -2
data/lib/capybara/spec/session/node_spec.rb +50 -0
data/lib/capybara/spec/session/node_wrapper_spec.rb +5 -5
data/lib/capybara/spec/session/save_and_open_screenshot_spec.rb +1 -1
data/lib/capybara/spec/session/window/windows_spec.rb +3 -5
data/lib/capybara/spec/spec_helper.rb +4 -2
data/lib/capybara/spec/views/with_animation.erb +46 -0
data/lib/capybara/version.rb +1 -1
data/lib/capybara/window.rb +3 -2
data/spec/filter_set_spec.rb +19 -2
data/spec/result_spec.rb +33 -1
data/spec/rspec/features_spec.rb +6 -10
data/spec/rspec/shared_spec_matchers.rb +4 -4
data/spec/selector_spec.rb +74 -4
data/spec/selenium_spec_marionette.rb +2 -0
data/spec/server_spec.rb +1 -1
data/spec/session_spec.rb +12 -0
data/spec/shared_selenium_session.rb +30 -0
metadata +8 -9
data/.yard/templates_custom/default/class/html/selectors.erb +0 -38
data/.yard/templates_custom/default/class/html/setup.rb +0 -17
data/.yard/yard_extensions.rb +0 -78
data/.yardopts +0 -1

data/lib/capybara/spec/session/node_wrapper_spec.rb CHANGED

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
+class NodeWrapper
+  def initialize(element); @element = element end
+  def to_capybara_node(); @element end
+end
 Capybara::SpecHelper.spec "#to_capybara_node" do
   before do
     @session.visit('/with_html')
   end
-  class NodeWrapper
-    def initialize(element); @element = element end
-    def to_capybara_node(); @element end
-  end
   it "should support have_xxx expectations" do
     para = NodeWrapper.new(@session.find(:css, '#first'))
     expect(para).to have_link("ullamco")

data/lib/capybara/spec/session/save_and_open_screenshot_spec.rb CHANGED

@@ -8,7 +8,7 @@ Capybara::SpecHelper.spec '#save_and_open_screenshot' do
   end
   it 'opens file from the default directory', requires: [:screenshot] do
-    expected_file_regex = %r{capybara-\d+\.png}
+    expected_file_regex = /capybara-\d+\.png/
     allow(@session.driver).to receive(:save_screenshot)
     allow(Launchy).to receive(:open)

data/lib/capybara/spec/session/window/windows_spec.rb CHANGED

@@ -11,10 +11,7 @@ Capybara::SpecHelper.spec '#windows', requires: [:windows] do
     end
   end
   after do
-    (@session.windows - [@window]).each do |w|
-      @session.switch_to_window w
-      w.close
-    end
+    (@session.windows - [@window]).each(&:close)
     @session.switch_to_window(@window)
   end
@@ -22,7 +19,8 @@ Capybara::SpecHelper.spec '#windows', requires: [:windows] do
     expect(@session.windows.map { |window| window.instance_of?(Capybara::Window) }).to eq([true] * 3)
   end
-  it 'should switchable windows' do
+  it 'should be able to switch to windows' do
+    sleep 1 # give windows enough time to fully load
     titles = @session.windows.map do |window|
       @session.within_window(window) { @session.title }
     end

data/lib/capybara/spec/spec_helper.rb CHANGED

@@ -29,11 +29,13 @@ module Capybara
         Capybara.visible_text_only = false
         Capybara.match = :smart
         Capybara.enable_aria_label = false
+        Capybara.default_set_options = {}
+        Capybara.disable_animation = false
         reset_threadsafe
       end
       def filter(requires, metadata)
-        if requires and metadata[:capybara_skip]
+        if requires && metadata[:capybara_skip]
           requires.any? do |require|
             metadata[:capybara_skip].include?(require)
           end
@@ -86,7 +88,7 @@ module Capybara
         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
+        session&.instance_variable_set(:@config, nil)
       end
     end

data/lib/capybara/spec/views/with_animation.erb ADDED

@@ -0,0 +1,46 @@
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
+  <head>
+    <meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
+    <title>with_animation</title>
+    <script src="/jquery.js" type="text/javascript" charset="utf-8"></script>
+    <script src="/jquery-ui.js" type="text/javascript" charset="utf-8"></script>
+    <script src="/test.js" type="text/javascript" charset="utf-8"></script>
+    <style>
+      .transition.away {
+          width: 0%;
+      }
+      a {
+          display: inline-block;
+          width: 100%;
+          overflow: hidden;
+      }
+      a:not(.away) {
+        height: 20px;
+      }
+      a.transition {
+        transition: all 3s ease-in-out;
+      }
+      @keyframes animation {
+          0%   {height: 20px; width: 100%;}
+          100% {height: 0px; width: 0%;}
+      }
+      a.animation.away {
+        animation-name: animation;
+        animation-duration: 3s;
+        animation-fill-mode: forwards;
+      }
+    </style>
+  </head>
+  <body id="with_animation">
+    <a href='#' class='transition' onclick='this.classList.add("away")'>transition me away</a>
+    <a href='#' class='animation' onclick='this.classList.add("away")'>animate me away</a>
+  </body>
+</html>

data/lib/capybara/version.rb CHANGED

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Capybara
-  VERSION = '3.1.1'.freeze
+  VERSION = '3.2.0'
 end

data/lib/capybara/window.rb CHANGED

@@ -120,12 +120,13 @@ module Capybara
       res = yield if block_given?
       prev_size = size
       start_time = Capybara::Helpers.monotonic_time
-      begin
+      loop do
         sleep 0.05
         cur_size = size
         return res if cur_size == prev_size
         prev_size = cur_size
-      end while (Capybara::Helpers.monotonic_time - start_time) < seconds
+        break if (Capybara::Helpers.monotonic_time - start_time) >= seconds
+      end
       raise Capybara::WindowError, "Window size not stable within #{seconds} seconds."
     end

data/spec/filter_set_spec.rb CHANGED

@@ -9,7 +9,7 @@ RSpec.describe Capybara::Selector::FilterSet do
   it "allows node filters" do
     fs = Capybara::Selector::FilterSet.add(:test) do
-      filter(:node_test, :boolean) { |_node, _value| true }
+      node_filter(:node_test, :boolean) { |_node, _value| true }
       expression_filter(:expression_test, :boolean) { |_expr, _value| true }
     end
@@ -19,11 +19,28 @@ RSpec.describe Capybara::Selector::FilterSet do
   it "allows expression filters" do
     fs = Capybara::Selector::FilterSet.add(:test) do
-      filter(:node_test, :boolean) { |_node, _value| true }
+      node_filter(:node_test, :boolean) { |_node, _value| true }
       expression_filter(:expression_test, :boolean) { |_expr, _value| true }
     end
     expect(fs.expression_filters.keys).to include(:expression_test)
     expect(fs.expression_filters.keys).not_to include(:node_test)
   end
+  it "allows node filter and expression filter with the same name" do
+    fs = Capybara::Selector::FilterSet.add(:test) do
+      node_filter(:test, :boolean) { |_node, _value| true }
+      expression_filter(:test, :boolean) { |_expr, _value| true }
+    end
+    expect(fs.expression_filters[:test]).not_to eq fs.node_filters[:test]
+  end
+  it "allows `filter` as an alias of `node_filter`" do
+    fs = Capybara::Selector::FilterSet.add(:test) do
+      filter(:node_test, :boolean) { |_node, _value| true }
+    end
+    expect(fs.node_filters.keys).to include(:node_test)
+  end
 end

data/spec/result_spec.rb CHANGED

@@ -70,6 +70,8 @@ RSpec.describe Capybara::Result do
     expect(result[0, 2].map(&:text)).to eq %w[Alpha Beta]
     expect(result[1..3].map(&:text)).to eq %w[Beta Gamma Delta]
     expect(result[-1].text).to eq 'Delta'
+    expect(result[-2, 3].map(&:text)).to eq %w[Gamma Delta]
+    expect(result[1..7].map(&:text)).to eq %w[Beta Gamma Delta]
   end
   it 'works with filter blocks' do
@@ -97,7 +99,7 @@ RSpec.describe Capybara::Result do
   end
   # Not a great test but it indirectly tests what is needed
-  it "should evaluate filters lazily" do
+  it "should evaluate filters lazily for idx" do
     skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
     # Not processed until accessed
     expect(result.instance_variable_get('@result_cache').size).to be 0
@@ -118,6 +120,36 @@ RSpec.describe Capybara::Result do
     expect(result.instance_variable_get('@result_cache').size).to eq 4
   end
+  it "should evaluate filters lazily for range" do
+    skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+    result[0..1]
+    expect(result.instance_variable_get('@result_cache').size).to be 2
+    expect(result[0..7].size).to eq 4
+    expect(result.instance_variable_get('@result_cache').size).to be 4
+  end
+  it "should evaluate filters lazily for idx and length" do
+    skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+    result[1, 2]
+    expect(result.instance_variable_get('@result_cache').size).to be 3
+    expect(result[2, 5].size).to eq 2
+    expect(result.instance_variable_get('@result_cache').size).to be 4
+  end
+  it "should only need to evaluate one result for any?" do
+    skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+    result.any?
+    expect(result.instance_variable_get('@result_cache').size).to be 1
+  end
+  it "should evaluate all elements when #to_a called" do
+    # All cached when converted to array
+    result.to_a
+    expect(result.instance_variable_get('@result_cache').size).to eq 4
+  end
   context '#each' do
     it 'lazily evaluates' do
       skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'

data/spec/rspec/features_spec.rb CHANGED

@@ -12,17 +12,13 @@ feature "Capybara's feature DSL" do
     @in_background = true
   end
-  def current_example(context)
-    RSpec.respond_to?(:current_example) ? RSpec.current_example : context.example
-  end
   scenario "includes Capybara" do
     visit('/')
     expect(page).to have_content('Hello world!')
   end
-  scenario "preserves description" do
-    expect(current_example(self).metadata[:full_description])
+  scenario "preserves description" do |ex|
+    expect(ex.metadata[:full_description])
       .to eq("Capybara's feature DSL preserves description")
   end
@@ -48,12 +44,12 @@ feature "Capybara's feature DSL" do
       expect(page).to have_content 'Hello world!'
     end
-    scenario 'are marked in the metadata as capybara_feature' do
-      expect(current_example(self).metadata[:capybara_feature]).to be_truthy
+    scenario 'are marked in the metadata as capybara_feature' do |ex|
+      expect(ex.metadata[:capybara_feature]).to be_truthy
     end
-    scenario 'have a type of :feature' do
-      expect(current_example(self).metadata[:type]).to eq :feature
+    scenario 'have a type of :feature' do |ex|
+      expect(ex.metadata[:type]).to eq :feature
     end
   end
 end

data/spec/rspec/shared_spec_matchers.rb CHANGED

@@ -215,7 +215,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
         it "fails if has_no_selector? returns false" do
           expect do
             expect("<h1>Text</h1>").not_to have_selector(:css, 'h1')
-          end.to raise_error(%r{expected not to find visible css "h1"})
+          end.to raise_error(/expected not to find visible css "h1"/)
         end
       end
     end
@@ -251,7 +251,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
         it "fails if has_no_selector? returns false" do
           expect do
             expect(page).not_to have_selector(:css, 'h1', text: 'test')
-          end.to raise_error(%r{expected not to find visible css "h1" with text "test"})
+          end.to raise_error(/expected not to find visible css "h1" with text "test"/)
         end
       end
     end
@@ -558,7 +558,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
         it 'waits if wait time is more than timeout' do
           @session.click_link("Change title")
           using_wait_time 0 do
-            expect(@session).to have_title('changed title', wait: 0.5)
+            expect(@session).to have_title('changed title', wait: 2)
           end
         end
@@ -603,7 +603,7 @@ RSpec.shared_examples Capybara::RSpecMatchers do |session, _mode|
         it 'waits if wait time is more than timeout' do
           @session.click_link("Change page")
           using_wait_time 0 do
-            expect(@session).to have_current_path('/with_html', wait: 1)
+            expect(@session).to have_current_path('/with_html', wait: 2)
           end
         end

data/spec/selector_spec.rb CHANGED

@@ -16,11 +16,14 @@ RSpec.describe Capybara do
                 <h1 class="a">Totally awesome</h1>
                 <p>Yes it is</p>
               </div>
-              <p class="b">Some Content</p>
-              <p class="b"></p>
+              <p class="b c">Some Content</p>
+              <p class="b d"></p>
             </div>
             <div id="#special">
             </div>
+            <div class="some random words" id="random_words">
+              Something
+            </div>
             <input id="2checkbox" class="2checkbox" type="checkbox"/>
             <input type="radio"/>
             <label for="my_text_input">My Text Input</label>
@@ -37,7 +40,7 @@ RSpec.describe Capybara do
             </select>
             <table>
               <tr><td></td></tr>
-            </table
+            </table>
           </body>
         </html>
       STRING
@@ -46,12 +49,25 @@ RSpec.describe Capybara do
     before do
       Capybara.add_selector :custom_selector do
         css { |css_class| "div.#{css_class}" }
-        filter(:not_empty, boolean: true, default: true, skip_if: :all) { |node, value| value ^ (node.text == '') }
+        node_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
+      Capybara.add_selector :custom_xpath_selector do
+        xpath { |selector| selector }
+      end
+    end
+    it "supports `filter` as an alias for `node_filter`" do
+      expect do
+        Capybara.add_selector :filter_alias_selector do
+          css { |_unused| "div" }
+          filter(:something) { |_node, _value| true }
+        end
+      end.not_to raise_error
     end
     describe "adding a selector" do
@@ -121,6 +137,16 @@ RSpec.describe Capybara do
           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
+        it "accepts XPath expression for xpath based selectors" do
+          expect(string.find(:custom_xpath_selector, './/div', id: XPath.contains('peci'))[:id]).to eq '#special'
+          expect(string.find(:custom_xpath_selector, './/input', id: XPath.ends_with('box'))[:id]).to eq '2checkbox'
+        end
+        it "errors XPath expression for CSS based selectors" do
+          expect { string.find(:custom_css_selector, "div", id: XPath.contains('peci')) }
+            .to raise_error(ArgumentError, /not supported/)
+        end
       end
       context "with :class option" do
@@ -129,10 +155,27 @@ RSpec.describe Capybara do
           expect(string.all(:custom_css_selector, "h1, div", class: 'a').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
+        end
         it "works with 'special' characters" do
           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
+        it "accepts XPath expression for xpath based selectors" do
+          expect(string.find(:custom_xpath_selector, './/div', class: XPath.contains('dom wor'))[:id]).to eq 'random_words'
+          expect(string.find(:custom_xpath_selector, './/div', class: XPath.ends_with('words'))[:id]).to eq 'random_words'
+        end
+        it "errors XPath expression for CSS based selectors" do
+          expect { string.find(:custom_css_selector, "div", class: XPath.contains('random')) }
+            .to raise_error(ArgumentError, /not supported/)
+        end
       end
       # :css, :xpath, :id, :field, :fieldset, :link, :button, :link_or_button, :fillable_field, :radio_button, :checkbox, :select,
@@ -208,6 +251,33 @@ RSpec.describe Capybara do
           expect { string.find(:button, 'click me', title: 'click me') }.to raise_error(/with title click me/)
         end
       end
+      describe ":element selector" do
+        it "finds by any attributes" do
+          expect(string.find(:element, 'input', type: 'submit').value).to eq 'click me'
+        end
+        it "still works with system keys" do
+          expect { string.all(:element, 'input', type: 'submit', count: 1) }.not_to raise_error
+        end
+        it "includes wildcarded keys in description" do
+          expect { string.find(:element, 'input', not_there: 'bad', count: 1) }
+            .to(raise_error do |e|
+              expect(e).to be_a(Capybara::ElementNotFound)
+              expect(e.message).to include "not_there => bad"
+              expect(e.message).not_to include "count 1"
+            end)
+        end
+        it "accepts XPath::Expression" do
+          expect(string.find(:element, 'input', type: XPath.starts_with('subm')).value).to eq 'click me'
+          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'
+        end
+      end
     end
   end
 end

data/spec/selenium_spec_marionette.rb CHANGED

@@ -134,11 +134,13 @@ RSpec.describe Capybara::Selenium::Driver do
       @session.visit('/form')
       @session.select('Sweden', from: 'form_region')
       @session.click_button('awesome')
+      sleep 1
       expect do
         @session.accept_confirm(wait: 0.1) do
           @session.refresh
           sleep 2
         end
+        sleep 1
       end.to change { extract_results(@session)['post_count'] }.by(1)
     end
   end