capybara 3.8.1 → 3.33.0

data/spec/result_spec.rb

@@ -44,9 +44,9 @@ RSpec.describe Capybara::Result do
   end
 
   it 'can be selected' do
-    expect(result.select do |element|
+    expect(result.count do |element|
       element.text.include? 't'
-    end.length).to eq(2)
+    end).to eq(2)
   end
 
   it 'can be reduced' do
@@ -65,42 +65,56 @@ RSpec.describe Capybara::Result do
     end).to eq(2)
   end
 
-  it 'supports all modes of []' do
-    expect(result[1].text).to eq 'Beta'
-    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]
+  def recalc_result
+    string.all '//li', minimum: 0 # pass minimum: 0 so lazy evaluation doesn't get triggered yet
   end
 
+  it 'supports all modes of []' do
+    expect(recalc_result[1].text).to eq 'Beta'
+    expect(recalc_result[0, 2].map(&:text)).to eq %w[Alpha Beta]
+    expect(recalc_result[1..3].map(&:text)).to eq %w[Beta Gamma Delta]
+    expect(recalc_result[-1].text).to eq 'Delta'
+    expect(recalc_result[-2, 3].map(&:text)).to eq %w[Gamma Delta]
+    expect(recalc_result[1...3].map(&:text)).to eq %w[Beta Gamma]
+    expect(recalc_result[1..7].map(&:text)).to eq %w[Beta Gamma Delta]
+    expect(recalc_result[2...-1].map(&:text)).to eq %w[Gamma]
+    expect(recalc_result[2..-1].map(&:text)).to eq %w[Gamma Delta]
+  end
+
+  eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.5
+    it 'supports endless ranges' do
+      expect(result[2..].map(&:text)).to eq %w[Gamma Delta]
+    end
+  TEST
+
+  eval <<~TEST, binding, __FILE__, __LINE__ + 1 if RUBY_VERSION.to_f > 2.6
+    it 'supports inclusive positive beginless ranges' do
+      expect(result[..2].map(&:text)).to eq %w[Alpha Beta Gamma]
+    end
+
+    it 'supports inclusive negative beginless ranges' do
+      expect(result[..-2].map(&:text)).to eq %w[Alpha Beta Gamma]
+      expect(result[..-1].map(&:text)).to eq %w[Alpha Beta Gamma Delta]
+    end
+
+    it 'supports exclusive positive beginless ranges' do
+      expect(result[...2].map(&:text)).to eq %w[Alpha Beta]
+    end
+
+    it 'supports exclusive negative beginless ranges' do
+      expect(result[...-2].map(&:text)).to eq %w[Alpha Beta]
+      expect(result[...-1].map(&:text)).to eq %w[Alpha Beta Gamma]
+    end
+  TEST
+
   it 'works with filter blocks' do
     result = string.all('//li') { |node| node.text == 'Alpha' }
     expect(result.size).to eq 1
   end
 
-  it 'should catch invalid element errors during filtering' do
-    allow_any_instance_of(Capybara::Node::Simple).to receive(:text).and_raise(StandardError)
-    allow_any_instance_of(Capybara::Node::Simple).to receive(:session).and_return(
-      instance_double('Capybara::Session', driver: instance_double('Capybara::Driver::Base', invalid_element_errors: [StandardError]))
-    )
-    result = string.all('//li', text: 'Alpha')
-    expect(result.size).to eq 0
-  end
-
-  it 'should return non-invalid element errors during filtering' do
-    allow_any_instance_of(Capybara::Node::Simple).to receive(:text).and_raise(StandardError)
-    allow_any_instance_of(Capybara::Node::Simple).to receive(:session).and_return(
-      instance_double('Capybara::Session', driver: instance_double('Capybara::Driver::Base', invalid_element_errors: [ArgumentError]))
-    )
-    expect do
-      string.all('//li', text: 'Alpha').to_a
-    end.to raise_error(StandardError)
-  end
-
   # Not a great test but it indirectly tests what is needed
   it 'should evaluate filters lazily for idx' do
-    skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+    skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     # Not processed until accessed
     expect(result.instance_variable_get('@result_cache').size).to be 0
 
@@ -121,7 +135,7 @@ RSpec.describe Capybara::Result do
   end
 
   it 'should evaluate filters lazily for range' do
-    skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+    skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     result[0..1]
     expect(result.instance_variable_get('@result_cache').size).to be 2
 
@@ -130,7 +144,7 @@ RSpec.describe Capybara::Result do
   end
 
   it 'should evaluate filters lazily for idx and length' do
-    skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+    skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     result[1, 2]
     expect(result.instance_variable_get('@result_cache').size).to be 3
 
@@ -139,7 +153,7 @@ RSpec.describe Capybara::Result do
   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'
+    skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
     result.any?
     expect(result.instance_variable_get('@result_cache').size).to be 1
   end
@@ -150,9 +164,9 @@ RSpec.describe Capybara::Result do
     expect(result.instance_variable_get('@result_cache').size).to eq 4
   end
 
-  context '#each' do
+  describe '#each' do
     it 'lazily evaluates' do
-      skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+      skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
       results = []
       result.each do |el|
         results << el
@@ -168,7 +182,7 @@ RSpec.describe Capybara::Result do
       end
 
       it 'lazily evaluates' do
-        skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
+        skip 'JRuby has an issue with lazy enumerator evaluation' if jruby_lazy_enumerator_workaround?
         result.each.with_index do |_el, idx|
           expect(result.instance_variable_get('@result_cache').size).to eq(idx + 1) # 0 indexing
         end
@@ -176,19 +190,7 @@ RSpec.describe Capybara::Result do
     end
   end
 
-  context 'lazy select' do
-    it 'is compatible' do
-      # This test will let us know when JRuby fixes lazy select so we can re-enable it in Result
-      pending 'JRuby has an issue with lazy enumberator evaluation' if RUBY_PLATFORM == 'java'
-      eval_count = 0
-      enum = %w[Text1 Text2 Text3].lazy.select do
-        eval_count += 1
-        true
-      end
-      expect(eval_count).to eq 0
-      enum.next
-      sleep 1
-      expect(eval_count).to eq 1
-    end
+  def jruby_lazy_enumerator_workaround?
+    RUBY_PLATFORM == 'java'
   end
 end

data/spec/rspec/features_spec.rb

@@ -3,6 +3,7 @@
 require 'spec_helper'
 require 'capybara/rspec'
 
+# rubocop:disable RSpec/InstanceVariable
 RSpec.configuration.before(:each, file_path: './spec/rspec/features_spec.rb') do
   @in_filtered_hook = true
 end
@@ -53,6 +54,7 @@ feature "Capybara's feature DSL" do
     end
   end
 end
+# rubocop:enable RSpec/InstanceVariable
 
 feature 'given and given! aliases to let and let!' do
   given(:value) { :available }
@@ -79,6 +81,7 @@ xfeature 'if xfeature aliases to pending then' do
   scenario "this should be 'temporarily disabled with xfeature'" do
     # dummy
   end
+
   scenario "this also should be 'temporarily disabled with xfeature'" do
     # dummy
   end