capybara 3.0.3 → 3.1.0

data/lib/capybara/server.rb

@@ -61,10 +61,14 @@ module Capybara
 
     attr_reader :app, :port, :host
 
-    def initialize(app, port = Capybara.server_port, host = Capybara.server_host, server_errors = Capybara.server_errors)
+    def initialize(app, *deprecated_options, port: Capybara.server_port, host: Capybara.server_host, reportable_errors: Capybara.server_errors)
+      warn "Positional arguments, other than the application, to Server#new are deprecated, please use keyword arguments" unless deprecated_options.empty?
       @app = app
       @server_thread = nil # suppress warnings
-      @host, @port, @server_errors = host, port, server_errors
+      @host = deprecated_options[1] || host
+      @reportable_errors = deprecated_options[2] || reportable_errors
+      @using_ssl = false
+      @port = deprecated_options[0] || port
       @port ||= Capybara::Server.ports[port_key]
       @port ||= find_available_port(host)
     end
@@ -77,10 +81,23 @@ module Capybara
       middleware.error
     end
 
+    def using_ssl?
+      @using_ssl
+    end
+
     def responsive?
       return false if @server_thread && @server_thread.join(0)
 
-      res = Net::HTTP.start(host, port) { |http| http.get('/__identify__') }
+      begin
+        res = if !@using_ssl
+          http_connect
+        else
+          https_connect
+        end
+      rescue EOFError, Net::ReadTimeout
+        res = https_connect
+        @using_ssl = true
+      end
 
       if res.is_a?(Net::HTTPSuccess) or res.is_a?(Net::HTTPRedirection)
         return res.body == app.object_id.to_s
@@ -121,8 +138,16 @@ module Capybara
 
   private
 
+    def http_connect
+      Net::HTTP.start(host, port, read_timeout: 2) { |http| http.get('/__identify__') }
+    end
+
+    def https_connect
+      Net::HTTP.start(host, port, use_ssl: true, verify_mode: OpenSSL::SSL::VERIFY_NONE) { |http| http.get('/__identify__') }
+    end
+
     def middleware
-      @middleware ||= Middleware.new(app, @server_errors)
+      @middleware ||= Middleware.new(app, @reportable_errors)
     end
 
     def port_key

data/lib/capybara/session.rb

@@ -84,7 +84,7 @@ module Capybara
         yield config
       end
       @server = if config.run_server and @app and driver.needs_server?
-        Capybara::Server.new(@app, config.server_port, config.server_host, config.server_errors).boot
+        Capybara::Server.new(@app, port: config.server_port, host: config.server_host, reportable_errors: config.server_errors).boot
       else
         nil
       end
@@ -137,18 +137,17 @@ module Capybara
     # Raise errors encountered in the server
     #
     def raise_server_error!
-      if @server and @server.error
-        # Force an explanation for the error being raised as the exception cause
-        begin
-          if config.raise_server_errors
-            raise CapybaraError, "Your application server raised an error - It has been raised in your test code because Capybara.raise_server_errors == true"
-          end
-        rescue CapybaraError
-          # needed to get the cause set correctly in JRuby -- otherwise we could just do raise @server.error
-          raise @server.error, @server.error.message, @server.error.backtrace
-        ensure
-          @server.reset_error!
+      return if @server.nil? || !@server.error
+      # Force an explanation for the error being raised as the exception cause
+      begin
+        if config.raise_server_errors
+          raise CapybaraError, "Your application server raised an error - It has been raised in your test code because Capybara.raise_server_errors == true"
         end
+      rescue CapybaraError
+        # needed to get the cause set correctly in JRuby -- otherwise we could just do raise @server.error
+        raise @server.error, @server.error.message, @server.error.backtrace
+      ensure
+        @server.reset_error!
       end
     end
 
@@ -250,7 +249,7 @@ module Capybara
       visit_uri = ::Addressable::URI.parse(visit_uri.to_s)
 
       uri_base = if @server
-        ::Addressable::URI.parse(config.app_host || "http://#{@server.host}:#{@server.port}")
+        ::Addressable::URI.parse(config.app_host || "http#{'s' if @server.using_ssl?}://#{@server.host}:#{@server.port}")
       else
         config.app_host && ::Addressable::URI.parse(config.app_host)
       end

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

@@ -96,7 +96,7 @@ Capybara::SpecHelper.spec "#all" do
   context 'with element count filters' do
     context ':count' do
       it 'should succeed when the number of elements founds matches the expectation' do
-        expect { @session.all(:css, 'h1, p', count: 4) }.to_not raise_error
+        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)
@@ -104,7 +104,7 @@ Capybara::SpecHelper.spec "#all" do
     end
     context ':minimum' do
       it 'should succeed when the number of elements founds matches the expectation' do
-        expect { @session.all(:css, 'h1, p', minimum: 0) }.to_not raise_error
+        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)
@@ -112,7 +112,7 @@ Capybara::SpecHelper.spec "#all" do
     end
     context ':maximum' do
       it 'should succeed when the number of elements founds matches the expectation' do
-        expect { @session.all(:css, 'h1, p', maximum: 4) }.to_not raise_error
+        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)
@@ -120,7 +120,7 @@ Capybara::SpecHelper.spec "#all" do
     end
     context ':between' do
       it 'should succeed when the number of elements founds matches the expectation' do
-        expect { @session.all(:css, 'h1, p', between: 2..7) }.to_not raise_error
+        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)
@@ -133,7 +133,7 @@ Capybara::SpecHelper.spec "#all" do
               minimum: 5,
               maximum: 0,
               between: 0..3 }
-        expect { @session.all(:css, 'h1, p', o) }.to_not 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
@@ -158,7 +158,7 @@ Capybara::SpecHelper.spec "#all" do
           o = { minimum: 0,
                 maximum: 4,
                 between: 2..7 }
-          expect { @session.all(:css, 'h1, p', o) }.to_not raise_error
+          expect { @session.all(:css, 'h1, p', o) }.not_to raise_error
         end
       end
     end

data/lib/capybara/spec/session/{assert_current_path.rb → assert_current_path_spec.rb}

@@ -37,8 +37,7 @@ Capybara::SpecHelper.spec '#assert_current_path' do
   end
 
   it "should not cause an exception when current_url is nil" do
-    allow_any_instance_of(Capybara::Session).to receive(:current_url) { nil }
-
+    allow_any_instance_of(Capybara::Session).to receive(:current_url).and_return(nil)
     expect { @session.assert_current_path(nil) }.not_to raise_error
   end
 end
@@ -66,7 +65,7 @@ Capybara::SpecHelper.spec '#assert_no_current_path?' do
   end
 
   it "should not cause an exception when current_url is nil" do
-    allow_any_instance_of(Capybara::Session).to receive(:current_url) { nil }
+    allow_any_instance_of(Capybara::Session).to receive(:current_url).and_return(nil)
 
     expect { @session.assert_no_current_path('/with_html') }.not_to raise_error
   end

data/lib/capybara/spec/session/{assert_text.rb → assert_text_spec.rb}

@@ -128,7 +128,7 @@ Capybara::SpecHelper.spec '#assert_text' do
   end
 
   context 'with multiple count filters' do
-    before(:each) do
+    before do
       @session.visit('/with_html')
     end
 

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

@@ -128,21 +128,21 @@ Capybara::SpecHelper.spec "#check" do
       end
 
       it "should check via clicking the label with :for attribute if possible" do
-        expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be
+        expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be_truthy
         @session.check('form_cars_tesla')
         @session.click_button('awesome')
         expect(extract_results(@session)['cars']).to include('tesla')
       end
 
       it "should check via clicking the wrapping label if possible" do
-        expect(@session.find(:checkbox, 'form_cars_mclaren', unchecked: true, visible: :hidden)).to be
+        expect(@session.find(:checkbox, 'form_cars_mclaren', unchecked: true, visible: :hidden)).to be_truthy
         @session.check('form_cars_mclaren')
         @session.click_button('awesome')
         expect(extract_results(@session)['cars']).to include('mclaren')
       end
 
       it "should not click the label if unneeded" do
-        expect(@session.find(:checkbox, 'form_cars_jaguar', checked: true, visible: :hidden)).to be
+        expect(@session.find(:checkbox, 'form_cars_jaguar', checked: true, visible: :hidden)).to be_truthy
         @session.check('form_cars_jaguar')
         @session.click_button('awesome')
         expect(extract_results(@session)['cars']).to include('jaguar')
@@ -170,14 +170,14 @@ Capybara::SpecHelper.spec "#check" do
 
       context "with allow_label_click == true" do
         it "should check via the label if input is hidden" do
-          expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be
+          expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be_truthy
           @session.check('form_cars_tesla', allow_label_click: true)
           @session.click_button('awesome')
           expect(extract_results(@session)['cars']).to include('tesla')
         end
 
         it "should not wait the full time if label can be clicked" do
-          expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be
+          expect(@session.find(:checkbox, 'form_cars_tesla', unchecked: true, visible: :hidden)).to be_truthy
           start_time = Time.now
           @session.check('form_cars_tesla', allow_label_click: true, wait: 10)
           end_time = Time.now
@@ -185,7 +185,7 @@ Capybara::SpecHelper.spec "#check" do
         end
 
         it "should check via the label if input is moved off the left edge of the page" do
-          expect(@session.find(:checkbox, 'form_cars_pagani', unchecked: true, visible: :all)).to be
+          expect(@session.find(:checkbox, 'form_cars_pagani', unchecked: true, visible: :all)).to be_truthy
           @session.check('form_cars_pagani', allow_label_click: true)
           @session.click_button('awesome')
           expect(extract_results(@session)['cars']).to include('pagani')

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

@@ -102,13 +102,6 @@ Capybara::SpecHelper.spec '#click_link_or_button' do
       @session.click_link_or_button('Disabled link')
       expect(@session).to have_content("Bar")
     end
-
-    it "does nothing when button is disabled" do
-      @session.visit('/form')
-      expect do
-        @session.click_link_or_button('Disabled button', disabled: false)
-      end.to raise_error(Capybara::ElementNotFound)
-    end
   end
 
   it "should return the element clicked" do

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

@@ -3,11 +3,11 @@
 require "capybara/spec/test_app"
 
 Capybara::SpecHelper.spec '#current_url, #current_path, #current_host' do
-  before :all do
+  before :all do # rubocop:disable RSpec/BeforeAfterAll
     @servers = Array.new(2) { Capybara::Server.new(TestApp.new).boot }
     # sanity check
-    expect(@servers[0].port).not_to eq(@servers[1].port)
-    expect(@servers.map(&:port)).not_to include 80
+    expect(@servers[0].port).not_to eq(@servers[1].port) # rubocop:disable RSpec/ExpectInHook
+    expect(@servers.map(&:port)).not_to include 80 # rubocop:disable RSpec/ExpectInHook
   end
 
   def bases
@@ -23,10 +23,8 @@ Capybara::SpecHelper.spec '#current_url, #current_path, #current_host' do
     expect(@session.current_url.chomp('?')).to eq("#{scheme}://#{s.host}:#{s.port}#{path}")
     expect(@session.current_host).to eq("#{scheme}://#{s.host}") # no port
     expect(@session.current_path).to eq(path)
-    if path == '/host'
-      # Server should agree with us
-      expect(@session).to have_content("Current host is #{scheme}://#{s.host}:#{s.port}")
-    end
+    # Server should agree with us
+    expect(@session).to have_content("Current host is #{scheme}://#{s.host}:#{s.port}") if path == '/host'
   end
 
   def visit_host_links
@@ -100,7 +98,7 @@ Capybara::SpecHelper.spec '#current_url, #current_path, #current_host' do
 
   it "doesn't raise exception on a nil current_url" do
     skip "Only makes sense when there is a real driver" unless @session.respond_to?(:driver)
-    allow(@session.driver).to receive(:current_url) { nil }
+    allow(@session.driver).to receive(:current_url).and_return(nil)
     @session.visit("/")
     expect { @session.current_url }.not_to raise_exception
     expect { @session.current_path }.not_to raise_exception

data/lib/capybara/spec/session/element/{assert_match_selector.rb → assert_match_selector_spec.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#assert_matches_selector' do
   before do
     @session.visit('/with_html')

data/lib/capybara/spec/session/element/match_css_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#match_css?' do
   before do
     @session.visit('/with_html')

data/lib/capybara/spec/session/element/match_xpath_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#match_xpath?' do
   before do
     @session.visit('/with_html')

data/lib/capybara/spec/session/element/matches_selector_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#match_selector?' do
   before do
     @session.visit('/with_html')

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

@@ -24,7 +24,7 @@ Capybara::SpecHelper.spec '#find_by_id' do
       expect(@session.find_by_id("hidden_via_ancestor", visible: false).text(:all)).to match(/with hidden ancestor/)
     end
 
-    it "finds invisible elements when `false`" do
+    it "doesn't find invisible elements when `true`" do
       expect do
         @session.find_by_id("hidden_via_ancestor", visible: true)
       end.to raise_error(Capybara::ElementNotFound)

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

@@ -9,7 +9,7 @@ Capybara::SpecHelper.spec '#find_field' do
     expect(@session.find_field('Dog').value).to eq('dog')
     expect(@session.find_field('form_description').value).to eq('Descriptive text goes here')
     expect(@session.find_field('Region')[:name]).to eq('form[region]')
-    expect(@session.find_field('With Asterisk*')).to be
+    expect(@session.find_field('With Asterisk*')).to be_truthy
   end
 
   context "aria_label attribute with Capybara.enable_aria_label" do

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

@@ -65,20 +65,20 @@ Capybara::SpecHelper.spec '#first' do
     end
 
     it "should find nodes regardless of whether they are invisible when false" do
-      expect(@session.first(:css, "a#invisible", visible: false)).to be
-      expect(@session.first(:css, "a#invisible", visible: false, text: 'hidden link')).to be
-      expect(@session.first(:css, "a#visible", visible: false)).to be
+      expect(@session.first(:css, "a#invisible", visible: false)).to be_truthy
+      expect(@session.first(:css, "a#invisible", visible: false, text: 'hidden link')).to be_truthy
+      expect(@session.first(:css, "a#visible", visible: false)).to be_truthy
     end
 
     it "should find nodes regardless of whether they are invisible when :all" do
-      expect(@session.first(:css, "a#invisible", visible: :all)).to be
-      expect(@session.first(:css, "a#invisible", visible: :all, text: 'hidden link')).to be
-      expect(@session.first(:css, "a#visible", visible: :all)).to be
+      expect(@session.first(:css, "a#invisible", visible: :all)).to be_truthy
+      expect(@session.first(:css, "a#invisible", visible: :all, text: 'hidden link')).to be_truthy
+      expect(@session.first(:css, "a#visible", visible: :all)).to be_truthy
     end
 
     it "should find only hidden nodes when :hidden" do
-      expect(@session.first(:css, "a#invisible", visible: :hidden)).to be
-      expect(@session.first(:css, "a#invisible", visible: :hidden, text: 'hidden link')).to be
+      expect(@session.first(:css, "a#invisible", visible: :hidden)).to be_truthy
+      expect(@session.first(:css, "a#invisible", visible: :hidden, text: 'hidden link')).to be_truthy
       expect do
         @session.first(:css, "a#invisible", visible: :hidden, text: 'not hidden link')
       end.to raise_error Capybara::ElementNotFound
@@ -94,7 +94,7 @@ Capybara::SpecHelper.spec '#first' do
       expect do
         @session.first(:css, "a#invisible", visible: :visible, text: 'hidden link')
       end.to raise_error Capybara::ElementNotFound
-      expect(@session.first(:css, "a#visible", visible: :visible)).to be
+      expect(@session.first(:css, "a#visible", visible: :visible)).to be_truthy
     end
 
     it "should default to Capybara.ignore_hidden_elements" do
@@ -103,8 +103,8 @@ Capybara::SpecHelper.spec '#first' do
         @session.first(:css, "a#invisible")
       end.to raise_error Capybara::ElementNotFound
       Capybara.ignore_hidden_elements = false
-      expect(@session.first(:css, "a#invisible")).to be
-      expect(@session.first(:css, "a")).to be
+      expect(@session.first(:css, "a#invisible")).to be_truthy
+      expect(@session.first(:css, "a")).to be_truthy
     end
   end
 
@@ -115,7 +115,7 @@ Capybara::SpecHelper.spec '#first' do
 
     it "should find the first element using the given locator" do
       @session.within(:xpath, "//div[@id='for_bar']") do
-        expect(@session.first('.//form')).to be
+        expect(@session.first('.//form')).to be_truthy
       end
     end
   end

data/lib/capybara/spec/session/frame/frame_title_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Capybara::SpecHelper.spec '#frame_title', requires: [:frames] do
-  before(:each) do
+  before do
     @session.visit('/within_frames')
   end
 

data/lib/capybara/spec/session/frame/frame_url_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Capybara::SpecHelper.spec '#frame_url', requires: [:frames] do
-  before(:each) do
+  before do
     @session.visit('/within_frames')
   end
 

data/lib/capybara/spec/session/frame/switch_to_frame_spec.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 Capybara::SpecHelper.spec '#switch_to_frame', requires: [:frames] do
-  before(:each) do
+  before do
     @session.visit('/within_frames')
   end
 
-  after(:each) do
+  after do
     # Ensure we clean up after the frame changes
     @session.switch_to_frame(:top)
   end

data/lib/capybara/spec/session/frame/within_frame_spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Capybara::SpecHelper.spec '#within_frame', requires: [:frames] do
-  before(:each) do
+  before do
     @session.visit('/within_frames')
   end
 

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

@@ -34,6 +34,11 @@ Capybara::SpecHelper.spec '#has_button?' do
   it "should be true for enabled buttons if disabled: :all" do
     expect(@session).to have_button('med', disabled: :all)
   end
+
+  it "can verify button type" do
+    expect(@session).to have_button('awe123', type: 'submit')
+    expect(@session).not_to have_button('awe123', type: 'reset')
+  end
 end
 
 Capybara::SpecHelper.spec '#has_no_button?' do