capybara 2.18.0 → 3.0.0.rc1

data/spec/dsl_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'capybara/dsl'
 
@@ -6,17 +7,8 @@ class TestClass
   include Capybara::DSL
 end
 
-Capybara::SpecHelper.run_specs TestClass.new, "DSL", capybara_skip: [
-  :js,
-  :modals,
-  :screenshot,
-  :frames,
-  :windows,
-  :send_keys,
-  :server,
-  :hover,
-  :about_scheme,
-  :psc
+Capybara::SpecHelper.run_specs TestClass.new, "DSL", capybara_skip: %i[
+  js modals screenshot frames windows send_keys server hover about_scheme psc
 ]
 
 RSpec.describe Capybara::DSL do
@@ -93,7 +85,7 @@ RSpec.describe Capybara::DSL do
       driver_before_block = Capybara.current_driver
       begin
         Capybara.using_driver(:selenium) { raise "ohnoes!" }
-      rescue Exception
+      rescue Exception # rubocop:disable Lint/RescueException
       end
       expect(Capybara.current_driver).to eq(driver_before_block)
     end
@@ -211,7 +203,7 @@ RSpec.describe Capybara::DSL do
         Capybara.using_session(:raise) do
           raise
         end
-      rescue Exception
+      rescue Exception # rubocop:disable Lint/RescueException
       end
       expect(Capybara.session_name).to eq(:default)
     end

data/spec/filter_set_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Capybara::Selector::FilterSet do
@@ -8,8 +9,8 @@ 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 }
-      expression_filter(:expression_test, :boolean) { |expr, value| true }
+      filter(:node_test, :boolean) { |_node, _value| true }
+      expression_filter(:expression_test, :boolean) { |_expr, _value| true }
     end
 
     expect(fs.node_filters.keys).to include(:node_test)
@@ -18,8 +19,8 @@ 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 }
-      expression_filter(:expression_test, :boolean) { |expr, value| true }
+      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)

data/spec/fixtures/selenium_driver_rspec_failure.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'selenium-webdriver'
 
 RSpec.describe Capybara::Selenium::Driver do
   it "should exit with a non-zero exit status" do
     options = { browser: (ENV['SELENIUM_BROWSER'] || :firefox).to_sym }
-    options[:desired_capabilities] = Selenium::WebDriver::Remote::Capabilities.firefox(marionette: false) if ENV['LEGACY_FIREFOX']
     browser = Capybara::Selenium::Driver.new(TestApp, options).browser
+    expect(browser).to be
     expect(true).to eq(false)
   end
 end

data/spec/fixtures/selenium_driver_rspec_success.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'selenium-webdriver'
 
 RSpec.describe Capybara::Selenium::Driver do
   it "should exit with a zero exit status" do
     options = { browser: (ENV['SELENIUM_BROWSER'] || :firefox).to_sym }
-    options[:desired_capabilities] = Selenium::WebDriver::Remote::Capabilities.firefox(marionette: false) if ENV['LEGACY_FIREFOX']
-    browser = Capybara::Selenium::Driver.new(TestApp, options ).browser
+    browser = Capybara::Selenium::Driver.new(TestApp, options).browser
+    expect(browser).to be
     expect(true).to eq(true)
   end
 end

data/spec/minitest_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'capybara/minitest'
 
@@ -37,7 +38,7 @@ class MinitestTest < Minitest::Test
     assert_xpath('.//select[@id="form_title"]')
     assert_xpath('.//select', count: 1) { |el| el[:id] == "form_title" }
     assert_no_xpath('.//select[@id="not_form_title"]')
-    assert_no_xpath('.//select') { |el| el[:id] == "not_form_title"}
+    assert_no_xpath('.//select') { |el| el[:id] == "not_form_title" }
     refute_xpath('.//select[@id="not_form_title"]')
   end
 
@@ -49,13 +50,13 @@ class MinitestTest < Minitest::Test
   def test_assert_link
     visit('/with_html')
     assert_link('A link')
-    assert_link(count: 1){ |el| el.text == 'A link'}
+    assert_link(count: 1) { |el| el.text == 'A link' }
     assert_no_link('Not on page')
   end
 
   def test_assert_button
     assert_button('fresh_btn')
-    assert_button(count: 1){ |el| el[:id] == 'fresh_btn' }
+    assert_button(count: 1) { |el| el[:id] == 'fresh_btn' }
     assert_no_button('not_btn')
   end
 

data/spec/minitest_spec_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'capybara/minitest'
 require 'capybara/minitest/spec'
@@ -39,7 +40,7 @@ class MinitestSpecTest < Minitest::Spec
     page.wont_have_xpath('.//input[@id="customer_email"]') { |el| el[:id] == "not_customer_email" }
     select = find(:select, 'form_title')
     select.must_have_xpath('.//option[@class="title"]')
-    select.must_have_xpath('.//option', count: 1) { |option| option[:class] != 'title' && !option.disabled?}
+    select.must_have_xpath('.//option', count: 1) { |option| option[:class] != 'title' && !option.disabled? }
     select.wont_have_xpath('.//input[@id="customer_email"]')
   end
 
@@ -129,7 +130,7 @@ RSpec.describe 'capybara/minitest/spec' do
     MinitestSpecTest.run reporter, {}
     reporter.report
     expect(output.string).to include("18 runs, 41 assertions, 1 failures, 0 errors, 0 skips")
-    #Make sure error messages are displayed
+    # Make sure error messages are displayed
     expect(output.string).to include('expected to find visible select box "non_existing_form_title" that is not disabled but there were no matches')
   end
 end

data/spec/per_session_config_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'capybara/dsl'
 
@@ -7,13 +8,13 @@ RSpec.describe Capybara::SessionConfig do
     it "defaults to global session options" do
       Capybara.threadsafe = true
       session = Capybara::Session.new(:rack_test, TestApp)
-      [:default_host, :app_host, :save_and_open_page_path,
-       :always_include_port, :run_server, :default_selector, :default_max_wait_time, :ignore_hidden_elements,
-       :automatic_reload, :match, :exact, :raise_server_errors, :visible_text_only, :wait_on_first_by_default,
-       :automatic_label_click, :enable_aria_label,
-       :save_path, :exact_options, :asset_host].each do |m|
-         expect(session.config.public_send(m)).to eq Capybara.public_send(m)
-       end
+      %i[default_host app_host always_include_port run_server
+         default_selector default_max_wait_time ignore_hidden_elements
+         automatic_reload match exact raise_server_errors visible_text_only
+         automatic_label_click enable_aria_label save_path
+         asset_host].each do |m|
+           expect(session.config.public_send(m)).to eq Capybara.public_send(m)
+         end
     end
 
     it "doesn't change global session when changed" do
@@ -64,4 +65,4 @@ RSpec.describe Capybara::SessionConfig do
       expect { Capybara.threadsafe = true }.to raise_error(/Threadsafe setting cannot be changed once a session is created/)
     end
   end
-end
+end

data/spec/rack_test_spec.rb

@@ -1,20 +1,21 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 module TestSessions
   RackTest = Capybara::Session.new(:rack_test, TestApp)
 end
 
-Capybara::SpecHelper.run_specs TestSessions::RackTest, "RackTest", capybara_skip: [
-  :js,
-  :modals,
-  :screenshot,
-  :frames,
-  :windows,
-  :send_keys,
-  :server,
-  :hover,
-  :about_scheme,
+Capybara::SpecHelper.run_specs TestSessions::RackTest, "RackTest", capybara_skip: %i[
+  js
+  modals
+  screenshot
+  frames
+  windows
+  send_keys
+  server
+  hover
+  about_scheme
 ]
 
 RSpec.describe Capybara::Session do
@@ -64,10 +65,11 @@ RSpec.describe Capybara::Session do
 
     describe "#fill_in" do
       it "should warn that :fill_options are not supported" do
-        expect_any_instance_of(Capybara::Node::Element).to receive(:warn)
-          .with("Options passed to Capybara::Node#set but the driver doesn't support them")
+        expect_any_instance_of(Capybara::RackTest::Node).to receive(:warn)
+          .with("Options passed to Node#set but the RackTest driver doesn't support any - ignoring")
         @session.visit "/with_html"
-        @session.fill_in 'test_field', with: 'not_moneky', fill_options: { random: true }
+        @session.fill_in 'test_field', with: 'not_monkey', fill_options: { random: true }
+        expect(@session).to have_field('test_field', with: 'not_monkey')
       end
     end
 
@@ -132,27 +134,27 @@ RSpec.describe Capybara::RackTest::Driver do
 
   describe ':headers option' do
     it 'should always set headers' do
-      @driver = Capybara::RackTest::Driver.new(TestApp, headers: {'HTTP_FOO' => 'foobar'})
+      @driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       @driver.visit('/get_header')
       expect(@driver.html).to include('foobar')
     end
 
     it 'should keep headers on link clicks' do
-      @driver = Capybara::RackTest::Driver.new(TestApp, headers: {'HTTP_FOO' => 'foobar'})
+      @driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       @driver.visit('/header_links')
       @driver.find_xpath('.//a').first.click
       expect(@driver.html).to include('foobar')
     end
 
     it 'should keep headers on form submit' do
-      @driver = Capybara::RackTest::Driver.new(TestApp, headers: {'HTTP_FOO' => 'foobar'})
+      @driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       @driver.visit('/header_links')
       @driver.find_xpath('.//input').first.click
       expect(@driver.html).to include('foobar')
     end
 
     it 'should keep headers on redirects' do
-      @driver = Capybara::RackTest::Driver.new(TestApp, headers: {'HTTP_FOO' => 'foobar'})
+      @driver = Capybara::RackTest::Driver.new(TestApp, headers: { 'HTTP_FOO' => 'foobar' })
       @driver.visit('/get_header_via_redirect')
       expect(@driver.html).to include('foobar')
     end
@@ -218,11 +220,10 @@ module CSSHandlerIncludeTester
     raise 'should never be called'
   end
 end
-include CSSHandlerIncludeTester
+include CSSHandlerIncludeTester # rubocop:disable Style/MixinUsage
 
-RSpec.describe  Capybara::RackTest::CSSHandlers do
+RSpec.describe Capybara::RackTest::CSSHandlers do
   it "should not be extended by global includes" do
     expect(Capybara::RackTest::CSSHandlers.new).not_to respond_to(:dont_extend_css_handler)
   end
 end
-

data/spec/result_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Capybara::Result do
@@ -14,7 +15,7 @@ RSpec.describe Capybara::Result do
   end
 
   let :result do
-    string.all '//li'
+    string.all '//li', minimum: 0 # pass minimum: 0 so lazy evaluation doesn't get triggered yet
   end
 
   it "has a length" do
@@ -30,7 +31,7 @@ RSpec.describe Capybara::Result do
   end
 
   it 'can supports values_at method' do
-    expect(result.values_at(0, 2).map(&:text)).to eq(%w(Alpha Gamma))
+    expect(result.values_at(0, 2).map(&:text)).to eq(%w[Alpha Gamma])
   end
 
   it "can return an element by its index" do
@@ -39,7 +40,7 @@ RSpec.describe Capybara::Result do
   end
 
   it "can be mapped" do
-    expect(result.map(&:text)).to eq(%w(Alpha Beta Gamma Delta))
+    expect(result.map(&:text)).to eq(%w[Alpha Beta Gamma Delta])
   end
 
   it "can be selected" do
@@ -50,7 +51,7 @@ RSpec.describe Capybara::Result do
 
   it "can be reduced" do
     expect(result.reduce('') do |memo, element|
-      memo += element.text[0]
+      memo + element.text[0]
     end).to eq('ABGD')
   end
 
@@ -66,8 +67,8 @@ RSpec.describe Capybara::Result do
 
   it 'supports all modes of []' do
     expect(result[1].text).to eq 'Beta'
-    expect(result[0,2].map(&:text)).to eq ['Alpha', 'Beta']
-    expect(result[1..3].map(&:text)).to eq ['Beta', 'Gamma', 'Delta']
+    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'
   end
 
@@ -78,37 +79,37 @@ RSpec.describe Capybara::Result do
 
   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(double("session", driver: double("driver", invalid_element_errors: [StandardError] )))
+    allow_any_instance_of(Capybara::Node::Simple).to receive(:session).and_return(double("session", driver: double("driver", 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(double("session", driver: double("driver", invalid_element_errors: [ArgumentError] )))
+    allow_any_instance_of(Capybara::Node::Simple).to receive(:session).and_return(double("session", driver: double("driver", 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
+  # Not a great test but it indirectly tests what is needed
   it "should evaluate filters lazily" do
     skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
-    #Not processed until accessed
+    # Not processed until accessed
     expect(result.instance_variable_get('@result_cache').size).to be 0
 
-    #Only one retrieved when needed
+    # Only one retrieved when needed
     result.first
     expect(result.instance_variable_get('@result_cache').size).to be 1
 
-    #works for indexed access
+    # works for indexed access
     result[0]
     expect(result.instance_variable_get('@result_cache').size).to be 1
 
     result[2]
     expect(result.instance_variable_get('@result_cache').size).to be 3
 
-    #All cached when converted to array
+    # All cached when converted to array
     result.to_a
     expect(result.instance_variable_get('@result_cache').size).to eq 4
   end
@@ -116,7 +117,7 @@ RSpec.describe Capybara::Result do
   context '#each' do
     it 'lazily evaluates' do
       skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
-      results=[]
+      results = []
       result.each do |el|
         results << el
         expect(result.instance_variable_get('@result_cache').size).to eq results.size
@@ -132,8 +133,8 @@ RSpec.describe Capybara::Result do
 
       it 'lazily evaluates' do
         skip 'JRuby has an issue with lazy enumerator evaluation' if RUBY_PLATFORM == 'java'
-        result.each.with_index do |el, idx|
-          expect(result.instance_variable_get('@result_cache').size).to eq(idx+1)  # 0 indexing
+        result.each.with_index do |_el, idx|
+          expect(result.instance_variable_get('@result_cache').size).to eq(idx + 1) # 0 indexing
         end
       end
     end

data/spec/rspec/features_spec.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'capybara/rspec'
 
-RSpec.configuration.before(:each, { file_path: "./spec/rspec/features_spec.rb" } ) do
+RSpec.configuration.before(:each, file_path: "./spec/rspec/features_spec.rb") do
   @in_filtered_hook = true
 end
 
@@ -25,7 +26,7 @@ feature "Capybara's feature DSL" do
       .to eq("Capybara's feature DSL preserves description")
   end
 
-  scenario "allows driver switching", :driver => :selenium do
+  scenario "allows driver switching", driver: :selenium do
     expect(Capybara.current_driver).to eq(:selenium)
   end
 
@@ -71,25 +72,27 @@ feature "given and given! aliases to let and let!" do
   end
 end
 
-feature "Capybara's feature DSL with driver", :driver => :culerity do
+feature "Capybara's feature DSL with driver", driver: :culerity do
   scenario "switches driver" do
     expect(Capybara.current_driver).to eq(:culerity)
   end
 end
 
-if RSpec::Core::Version::STRING.to_f >= 3.0
-  xfeature "if xfeature aliases to pending then" do
-    scenario "this should be 'temporarily disabled with xfeature'" do; end
-    scenario "this also should be 'temporarily disabled with xfeature'" do; end
+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
+end
 
-  ffeature "if ffeature aliases focused tag then" do
-    scenario "scenario inside this feature has metatag focus tag" do |example|
-      expect(example.metadata[:focus]).to eq true
-    end
+ffeature "if ffeature aliases focused tag then" do
+  scenario "scenario inside this feature has metatag focus tag" do |example|
+    expect(example.metadata[:focus]).to eq true
+  end
 
-    scenario "other scenarios also has metatag focus tag " do |example|
-      expect(example.metadata[:focus]).to eq true
-    end
+  scenario "other scenarios also has metatag focus tag " do |example|
+    expect(example.metadata[:focus]).to eq true
   end
 end