capybara 2.18.0 → 3.0.0.rc1

data/spec/rspec_spec.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
-RSpec.describe 'capybara/rspec', :type => :feature do
+RSpec.describe 'capybara/rspec', type: :feature do
   it "should include Capybara in rspec" do
     visit('/foo')
     expect(page.body).to include('Another World')
@@ -37,21 +38,20 @@ RSpec.describe 'capybara/rspec', :type => :feature do
     expect(Capybara.current_driver).to eq(Capybara.javascript_driver)
   end
 
-  it "switches to the given driver when giving it as metadata", :driver => :culerity do
+  it "switches to the given driver when giving it as metadata", driver: :culerity do
     expect(Capybara.current_driver).to eq(:culerity)
   end
 
   context "#all" do
     it "allows access to the Capybara finder" do
       visit('/with_html')
-      expect(all(:css, 'h2.head').size).to eq(5)
+      found = all(:css, 'h2') { |element| element[:class] == 'head' }
+      expect(found.size).to eq(5)
     end
 
     it "allows access to the RSpec matcher" do
-      skip "RSpec < 3 doesn't have an `all` matcher" if rspec2?
-
       visit('/with_html')
-      expect(["test1", "test2"]).to all(be_a(String))
+      expect(%w[test1 test2]).to all(be_a(String))
     end
   end
 
@@ -64,7 +64,6 @@ RSpec.describe 'capybara/rspec', :type => :feature do
     end
 
     it "allows access to the RSpec matcher" do
-      skip "RSpec version doesn't have a 'within' matcher" unless ::RSpec::Matchers.instance_methods.include?(:within)
       visit('/with_html')
       # This reads terribly, but must call #within
       expect(find(:css, 'span.number').text.to_i).to within(1).of(41)
@@ -72,15 +71,15 @@ RSpec.describe 'capybara/rspec', :type => :feature do
   end
 end
 
-RSpec.describe 'capybara/rspec', :type => :other do
+RSpec.describe 'capybara/rspec', type: :other do
   context "when RSpec::Matchers is included after Capybara::DSL" do
     before do
-      class DSL_MatchersTest
+      class DSLMatchersTest
         include Capybara::DSL
         include RSpec::Matchers
       end
 
-      @test_class_instance = DSL_MatchersTest.new
+      @test_class_instance = DSLMatchersTest.new
     end
 
     context "#all" do
@@ -90,10 +89,8 @@ RSpec.describe 'capybara/rspec', :type => :other do
       end
 
       it "allows access to the RSpec matcher" do
-        skip "RSpec < 3 doesn't have an `all` matcher" if rspec2?
-
         @test_class_instance.visit('/with_html')
-        expect(["test1", "test2"]).to @test_class_instance.all(be_a(String))
+        expect(%w[test1 test2]).to @test_class_instance.all(be_a(String))
       end
     end
 
@@ -106,7 +103,6 @@ RSpec.describe 'capybara/rspec', :type => :other do
       end
 
       it "allows access to the RSpec matcher" do
-        skip "RSpec version doesn't have a 'within' matcher" unless ::RSpec::Matchers.instance_methods.include?(:within)
         @test_class_instance.visit('/with_html')
         # This reads terribly, but must call #within
         expect(@test_class_instance.find(:css, 'span.number').text.to_i).to @test_class_instance.within(1).of(41)
@@ -115,7 +111,7 @@ RSpec.describe 'capybara/rspec', :type => :other do
   end
 end
 
-RSpec.describe 'capybara/rspec', :type => :other do
+RSpec.describe 'capybara/rspec', type: :other do
   it "should not include Capybara" do
     expect { visit('/') }.to raise_error(NoMethodError)
   end

data/spec/selector_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Capybara do
@@ -56,7 +57,7 @@ RSpec.describe Capybara do
       it "can set default visiblity" do
         Capybara.add_selector :hidden_field do
           visible :hidden
-          css { |sel| 'input[type="hidden"]' }
+          css { |_sel| 'input[type="hidden"]' }
         end
 
         expect(string).to have_no_css('input[type="hidden"]')
@@ -77,7 +78,7 @@ RSpec.describe Capybara do
 
       it "doesn't change existing filters" do
         Capybara.modify_selector :custom_selector do
-          css { |css_class| "p.#{css_class}"}
+          css { |css_class| "p.#{css_class}" }
         end
         expect(string).to have_selector(:custom_selector, 'b', count: 1)
         expect(string).to have_selector(:custom_selector, 'b', not_empty: false, count: 1)
@@ -92,7 +93,7 @@ RSpec.describe Capybara do
             field: ".//*[self::input | self::textarea | self::select][not(./@type = 'submit' or ./@type = 'image' or ./@type = 'hidden')]",
             fieldset: ".//fieldset",
             link: ".//a[./@href]",
-            link_or_button: ".//a[./@href] | .//input[./@type = 'submit' or ./@type = 'reset' or ./@type = 'image' or ./@type = 'button'] | .//button" ,
+            link_or_button: ".//a[./@href] | .//input[./@type = 'submit' or ./@type = 'reset' or ./@type = 'image' or ./@type = 'button'] | .//button",
             fillable_field: ".//*[self::input | self::textarea][not(./@type = 'submit' or ./@type = 'image' or ./@type = 'radio' or ./@type = 'checkbox' or ./@type = 'hidden' or ./@type = 'file')]",
             radio_button: ".//input[./@type = 'radio']",
             checkbox: ".//input[./@type = 'checkbox']",
@@ -102,7 +103,7 @@ RSpec.describe Capybara do
             table: ".//table"
           }
           selectors.each do |selector, xpath|
-            results = string.all(selector,nil).to_a.map(&:native)
+            results = string.all(selector, nil).to_a.map(&:native)
             expect(results.size).to be > 0
             expect(results).to eq string.all(:xpath, xpath).to_a.map(&:native)
           end
@@ -116,7 +117,6 @@ RSpec.describe Capybara do
         end
 
         it "works with 'special' characters" do
-          skip "We support old Nokogiris but they have their limits" if Gem::Version.new(Nokogiri::VERSION) < Gem::Version.new('1.6.8')
           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
@@ -129,7 +129,6 @@ RSpec.describe Capybara do
         end
 
         it "works with 'special' characters" do
-          skip "We support old Nokogiris but they have their limits" if Gem::Version.new(Nokogiri::VERSION) < Gem::Version.new('1.6.8')
           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

data/spec/selenium_spec_chrome.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require 'selenium-webdriver'
 require 'shared_selenium_session'
+require 'rspec/shared_spec_matchers'
 
-CHROME_DRIVER = if ENV['HEADLESS'] then :selenium_chrome_headless else :selenium_chrome end
+CHROME_DRIVER = ENV['HEADLESS'] ? :selenium_chrome_headless : :selenium_chrome
 
 # if ENV['HEADLESS'] && ENV['TRAVIS']
 #   Selenium::WebDriver::Chrome.path='/usr/bin/google-chrome-beta'
@@ -12,7 +14,7 @@ CHROME_DRIVER = if ENV['HEADLESS'] then :selenium_chrome_headless else :selenium
 Capybara.register_driver :selenium_chrome_clear_storage do |app|
   chrome_options = {
     browser: :chrome,
-    options: ::Selenium::WebDriver::Chrome::Options.new()
+    options: ::Selenium::WebDriver::Chrome::Options.new
   }
   chrome_options[:options].args << 'headless' if ENV['HEADLESS']
   Capybara::Selenium::Driver.new(app, chrome_options.merge(clear_local_storage: true, clear_session_storage: true))
@@ -22,15 +24,16 @@ module TestSessions
   Chrome = Capybara::Session.new(CHROME_DRIVER, TestApp)
 end
 
-skipped_tests = [:response_headers, :status_code, :trigger]
+skipped_tests = %i[response_headers status_code trigger]
 # skip window tests when headless for now - closing a window not supported by chromedriver/chrome
-skipped_tests << :windows if ENV['TRAVIS']  && (ENV['SKIP_WINDOW'] || ENV['HEADLESS'])
+skipped_tests << :windows if ENV['TRAVIS'] && (ENV['SKIP_WINDOW'] || ENV['HEADLESS'])
 
 Capybara::SpecHelper.run_specs TestSessions::Chrome, CHROME_DRIVER.to_s, capybara_skip: skipped_tests
 
 RSpec.describe "Capybara::Session with chrome" do
   include Capybara::SpecHelper
   include_examples  "Capybara::Session", TestSessions::Chrome, CHROME_DRIVER
+  include_examples  Capybara::RSpecMatchers, TestSessions::Chrome, CHROME_DRIVER
 
   context "storage" do
     describe "#reset!" do

data/spec/selenium_spec_marionette.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 require "selenium-webdriver"
 require 'shared_selenium_session'
 require 'rspec/shared_spec_matchers'
 
-browser_options = ::Selenium::WebDriver::Firefox::Options.new()
+browser_options = ::Selenium::WebDriver::Firefox::Options.new
 browser_options.args << '--headless' if ENV['HEADLESS']
 browser_options.add_preference 'dom.file.createInChild', true
 # browser_options.add_option("log", {"level": "trace"})
@@ -14,7 +15,7 @@ Capybara.register_driver :selenium_marionette do |app|
   Capybara::Selenium::Driver.new(
     app,
     browser: :firefox,
-    desired_capabilities: {marionette: true, 'moz:webdriverClick': true},
+    desired_capabilities: { marionette: true, 'moz:webdriverClick': true },
     options: browser_options
     # Get a trace level log from geckodriver
     # :driver_opts => { args: ['-vv'] }
@@ -25,24 +26,18 @@ Capybara.register_driver :selenium_marionette_clear_storage do |app|
   Capybara::Selenium::Driver.new(
     app,
     browser: :firefox,
-    desired_capabilities: {marionette: true},
+    desired_capabilities: { marionette: true },
     clear_local_storage: true,
     clear_session_storage: true,
     options: browser_options
   )
 end
 
-
-
 module TestSessions
   SeleniumMarionette = Capybara::Session.new(:selenium_marionette, TestApp)
 end
 
-skipped_tests = [
-  :response_headers,
-  :status_code,
-  :trigger
-]
+skipped_tests = %i[response_headers status_code trigger]
 skipped_tests << :windows if ENV['TRAVIS'] && ENV['SKIP_WINDOW']
 
 Capybara::SpecHelper.run_specs TestSessions::SeleniumMarionette, "selenium", capybara_skip: skipped_tests
@@ -62,7 +57,7 @@ RSpec.describe Capybara::Selenium::Driver do
     it "should reset browser when quit" do
       expect(@driver.browser).to be
       @driver.quit
-      #access instance variable directly so we don't create a new browser instance
+      # access instance variable directly so we don't create a new browser instance
       expect(@driver.instance_variable_get(:@browser)).to be_nil
     end
 
@@ -123,5 +118,24 @@ RSpec.describe Capybara::Selenium::Driver do
       end
     end
   end
-end
 
+  context "#refresh" do
+    def extract_results(session)
+      expect(session).to have_xpath("//pre[@id='results']")
+      YAML.load Nokogiri::HTML(session.body).xpath("//pre[@id='results']").first.inner_html.lstrip
+    end
+
+    it "can repost by accepting confirm" do
+      @session = TestSessions::SeleniumMarionette
+      @session.visit('/form')
+      @session.select('Sweden', from: 'form_region')
+      @session.click_button('awesome')
+      expect do
+        @session.accept_confirm(wait: 0.1) do
+          @session.refresh
+          sleep 2
+        end
+      end.to change { extract_results(@session)['post_count'] }.by(1)
+    end
+  end
+end

data/spec/server_spec.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Capybara::Server do
-
   it "should spool up a rack server" do
-    @app = proc { |env| [200, {}, ["Hello Server!"]]}
+    @app = proc { |_env| [200, {}, ["Hello Server!"]] }
     @server = Capybara::Server.new(@app).boot
 
     @res = Net::HTTP.start(@server.host, @server.port) { |http| http.get('/') }
@@ -19,8 +19,9 @@ RSpec.describe Capybara::Server do
   end
 
   it "should bind to the specified host" do
+    # TODO: travis with jruby in container mode has an issue with this test
     begin
-      app = proc { |env| [200, {}, ['Hello Server!']] }
+      app = proc { |_env| [200, {}, ['Hello Server!']] }
 
       Capybara.server_host = '127.0.0.1'
       server = Capybara::Server.new(app).boot
@@ -34,12 +35,12 @@ RSpec.describe Capybara::Server do
     ensure
       Capybara.server_host = nil
     end
-  end unless ENV['TRAVIS'] and (RUBY_ENGINE == 'jruby') #TODO travis with jruby in container mode has an issue with this test
+  end unless ENV['TRAVIS'] and (RUBY_ENGINE == 'jruby')
 
   it "should use specified port" do
     Capybara.server_port = 22789
 
-    @app = proc { |env| [200, {}, ["Hello Server!"]]}
+    @app = proc { |_env| [200, {}, ["Hello Server!"]] }
     @server = Capybara::Server.new(@app).boot
 
     @res = Net::HTTP.start(@server.host, 22789) { |http| http.get('/') }
@@ -49,7 +50,7 @@ RSpec.describe Capybara::Server do
   end
 
   it "should use given port" do
-    @app = proc { |env| [200, {}, ["Hello Server!"]]}
+    @app = proc { |_env| [200, {}, ["Hello Server!"]] }
     @server = Capybara::Server.new(@app, 22790).boot
 
     @res = Net::HTTP.start(@server.host, 22790) { |http| http.get('/') }
@@ -59,8 +60,8 @@ RSpec.describe Capybara::Server do
   end
 
   it "should find an available port" do
-    @app1 = proc { |env| [200, {}, ["Hello Server!"]]}
-    @app2 = proc { |env| [200, {}, ["Hello Second Server!"]]}
+    @app1 = proc { |_env| [200, {}, ["Hello Server!"]] }
+    @app2 = proc { |_env| [200, {}, ["Hello Second Server!"]] }
 
     @server1 = Capybara::Server.new(@app1).boot
     @server2 = Capybara::Server.new(@app2).boot
@@ -83,7 +84,7 @@ RSpec.describe Capybara::Server do
     end
 
     it "should use the existing server if it already running" do
-      @app = proc { |env| [200, {}, ["Hello Server!"]]}
+      @app = proc { |_env| [200, {}, ["Hello Server!"]] }
 
       @server1 = Capybara::Server.new(@app).boot
       @server2 = Capybara::Server.new(@app).boot
@@ -98,27 +99,25 @@ RSpec.describe Capybara::Server do
     end
 
     it "detects and waits for all reused server sessions pending requests" do
-      done = false
+      done = 0
 
       app = proc do |env|
         request = Rack::Request.new(env)
         sleep request.params['wait_time'].to_f
-        done = true
+        done += 1
         [200, {}, ["Hello Server!"]]
       end
 
       server1 = Capybara::Server.new(app).boot
       server2 = Capybara::Server.new(app).boot
 
-      start_request(server1, 0.5)
-      start_request(server2, 1.0)
-
-      expect {
+      expect do
+        start_request(server1, 1.0)
+        start_request(server2, 3.0)
         server1.wait_for_pending_requests
-      }.to change{done}.from(false).to(true)
+      end.to change { done }.from(0).to(2)
       expect(server2.send(:pending_requests?)).to eq(false)
     end
-
   end
 
   context "When Capybara.reuse_server is false" do
@@ -132,7 +131,7 @@ RSpec.describe Capybara::Server do
     end
 
     it "should not reuse an already running server" do
-      @app = proc { |env| [200, {}, ["Hello Server!"]]}
+      @app = proc { |_env| [200, {}, ["Hello Server!"]] }
 
       @server1 = Capybara::Server.new(@app).boot
       @server2 = Capybara::Server.new(@app).boot
@@ -147,48 +146,48 @@ RSpec.describe Capybara::Server do
     end
 
     it "detects and waits for only one sessions pending requests" do
-      done = false
+      done = 0
 
       app = proc do |env|
         request = Rack::Request.new(env)
         sleep request.params['wait_time'].to_f
-        done = true
+        done += 1
         [200, {}, ["Hello Server!"]]
       end
 
       server1 = Capybara::Server.new(app).boot
       server2 = Capybara::Server.new(app).boot
 
-      start_request(server1, 0.5)
-      start_request(server2, 1.0)
-
-      expect {
+      expect do
+        start_request(server1, 1.0)
+        start_request(server2, 3.0)
         server1.wait_for_pending_requests
-      }.to change{done}.from(false).to(true)
+      end.to change { done }.from(0).to(1)
       expect(server2.send(:pending_requests?)).to eq(true)
+      expect do
+        server2.wait_for_pending_requests
+      end.to change { done }.from(1).to(2)
     end
-
   end
 
   it "should raise server errors when the server errors before the timeout" do
     begin
-      Capybara.server do
+      Capybara.register_server :kaboom do
         sleep 0.1
         raise 'kaboom'
       end
+      Capybara.server = :kaboom
 
       expect do
-        Capybara::Server.new(proc {|e|}).boot
+        Capybara::Server.new(proc { |e| }).boot
       end.to raise_error(RuntimeError, 'kaboom')
     ensure
-      # TODO refactor out the defaults so it's reliant on unset state instead of
-      # a one-time call in capybara.rb
-      Capybara.server {|app, port| Capybara.run_default_server(app, port)}
+      Capybara.server = :default
     end
   end
 
   it "is not #responsive? when Net::HTTP raises a SystemCallError" do
-    app = lambda { [200, {}, ['Hello, world']] }
+    app = -> { [200, {}, ['Hello, world']] }
     server = Capybara::Server.new(app)
     expect(Net::HTTP).to receive(:start).and_raise(SystemCallError.allocate)
     expect(server.responsive?).to eq false
@@ -197,7 +196,8 @@ RSpec.describe Capybara::Server do
   def start_request(server, wait_time)
     # Start request, but don't wait for it to finish
     socket = TCPSocket.new(server.host, server.port)
-    socket.write "GET /?wait_time=#{wait_time.to_s} HTTP/1.0\r\n\r\n"
+    socket.write "GET /?wait_time=#{wait_time} HTTP/1.0\r\n\r\n"
+    sleep 0.1
     socket.close
     sleep 0.1
   end

data/spec/session_spec.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Capybara::Session do
   it "verifies a passed app is a rack app" do
     expect do
-      Capybara::Session.new(:unknown, { random: "hash"})
+      Capybara::Session.new(:unknown, random: "hash")
     end.to raise_error TypeError, "The second parameter to Session::new should be a rack app if passed."
   end