capybara 2.18.0 → 3.0.0.rc1

data/lib/capybara/spec/session/window/within_window_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
   before(:each) do
     @window = @session.current_window
@@ -38,8 +39,8 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
     it "returns value from the block" do
       window = (@session.windows - [@window]).first
       value = @session.within_window window do
-                43252003274489856000
-              end
+        43252003274489856000
+      end
       expect(value).to eq(43252003274489856000)
     end
 
@@ -57,7 +58,7 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
       expect(@session.send(:scopes)).to eq([nil])
     end
 
-    it "should leave correct scopes after execution in case of error", requires: [:windows, :frames] do
+    it "should leave correct scopes after execution in case of error", requires: %i[windows frames] do
       window = (@session.windows - [@window]).first
       expect do
         @session.within_frame 'frameOne' do
@@ -87,25 +88,25 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
 
   context "with lambda" do
     it "should find the div in another window" do
-      @session.within_window(->{ @session.title == 'Title of the first popup'}) do
+      @session.within_window(-> { @session.title == 'Title of the first popup' }) do
         expect(@session).to have_css('#divInPopupOne')
       end
     end
 
     it "should find divs in both windows" do
-      @session.within_window(->{ @session.title == 'Title of popup two'}) do
+      @session.within_window(-> { @session.title == 'Title of popup two' }) do
         expect(@session).to have_css('#divInPopupTwo')
       end
-      @session.within_window(->{ @session.title == 'Title of the first popup'}) do
+      @session.within_window(-> { @session.title == 'Title of the first popup' }) do
         expect(@session).to have_css('#divInPopupOne')
       end
       expect(@session.title).to eq('With Windows')
     end
 
     it "should be able to nest within_window" do
-      @session.within_window(->{ @session.title == 'Title of popup two'}) do
+      @session.within_window(-> { @session.title == 'Title of popup two' }) do
         expect(@session).to have_css('#divInPopupTwo')
-        @session.within_window(->{ @session.title == 'Title of the first popup'}) do
+        @session.within_window(-> { @session.title == 'Title of the first popup' }) do
           expect(@session).to have_css('#divInPopupOne')
         end
         expect(@session).to have_css('#divInPopupTwo')
@@ -119,7 +120,7 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
     it "should work inside a normal scope" do
       expect(@session).to have_css('#openWindow')
       @session.within(:css, '#scope') do
-        @session.within_window(->{ @session.title == 'Title of the first popup'}) do
+        @session.within_window(-> { @session.title == 'Title of the first popup' }) do
           expect(@session).to have_css('#divInPopupOne')
         end
         expect(@session).to have_content('My scoped content')
@@ -129,7 +130,7 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
 
     it "should raise error if window wasn't found" do
       expect do
-        @session.within_window(->{ @session.title == 'Invalid title'}) do
+        @session.within_window(-> { @session.title == 'Invalid title' }) do
           expect(@session).to have_css('#divInPopupOne')
         end
       end.to raise_error(Capybara::WindowError, "Could not find a window matching block/lambda")
@@ -139,15 +140,13 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
     end
 
     it "returns value from the block" do
-      value = @session.within_window(->{ @session.title == 'Title of popup two'}) do
-                42
-              end
+      value = @session.within_window(-> { @session.title == 'Title of popup two' }) { 42 }
       expect(value).to eq(42)
     end
 
     it "should switch back if exception was raised inside block" do
       expect do
-        @session.within_window(->{ @session.title == 'Title of popup two'}) do
+        @session.within_window(-> { @session.title == 'Title of popup two' }) do
           raise 'some error'
         end
       end.to raise_error(StandardError, 'some error')
@@ -155,58 +154,4 @@ Capybara::SpecHelper.spec '#within_window', requires: [:windows] do
       expect(@session.send(:scopes)).to eq([nil])
     end
   end
-
-  context "with string" do
-    it "should warn" do
-      expect(@session).to receive(:warn).with(/DEPRECATION WARNING/).and_call_original
-      @session.within_window('firstPopup') {}
-    end
-
-    it "should find window by handle" do
-      window = (@session.windows - [@window]).first
-      @session.within_window window.handle do
-        expect(@session).to have_title(/Title of the first popup|Title of popup two/)
-      end
-    end
-
-    it "should find the div in firstPopup" do
-      @session.within_window("firstPopup") do
-        expect(@session.find("//*[@id='divInPopupOne']").text).to eq 'This is the text of divInPopupOne'
-      end
-    end
-    it "should find the div in secondPopup" do
-      @session.within_window("secondPopup") do
-        expect(@session.find("//*[@id='divInPopupTwo']").text).to eq 'This is the text of divInPopupTwo'
-      end
-    end
-    it "should find the divs in both popups" do
-      @session.within_window("secondPopup") do
-        expect(@session.find("//*[@id='divInPopupTwo']").text).to eq 'This is the text of divInPopupTwo'
-      end
-      @session.within_window("firstPopup") do
-        expect(@session.find("//*[@id='divInPopupOne']").text).to eq 'This is the text of divInPopupOne'
-      end
-    end
-    it "should find the div in the main window after finding a div in a popup" do
-      @session.within_window("secondPopup") do
-        expect(@session.find("//*[@id='divInPopupTwo']").text).to eq 'This is the text of divInPopupTwo'
-      end
-      expect(@session.find("//*[@id='doesNotOpenWindows']").text).to eq 'Does not open windows'
-    end
-    it "should reset scope when switching windows" do
-      @session.within(:css, '#doesNotOpenWindows') do
-        @session.within_window("secondPopup") do
-          expect(@session.find("//*[@id='divInPopupTwo']").text).to eq 'This is the text of divInPopupTwo'
-        end
-      end
-    end
-    it "should switch back if exception was raised inside block" do
-      expect do
-        @session.within_window('secondPopup') do
-          raise 'some error'
-        end
-      end.to raise_error(StandardError, 'some error')
-      expect(@session.current_window).to eq(@window)
-    end
-  end
 end

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 Capybara::SpecHelper.spec '#within' do
   before do
     @session.visit('/with_scope')

data/lib/capybara/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rspec"
 require "rspec/expectations"
 require "capybara"
@@ -6,15 +7,6 @@ require "capybara/rspec" # Required here instead of in rspec_spec to avoid RSpec
 require "capybara/spec/test_app"
 require "nokogiri"
 
-# Alias be_truthy/be_falsey if not already defined to be able to use in RSpec 2 and 3
-unless RSpec::Matchers.method_defined?(:be_truthy)
-  RSpec::Matchers.module_eval do
-    alias be_truthy be_true
-    alias be_falsey be_false
-    alias be_falsy be_false
-  end
-end
-
 module Capybara
   module SpecHelper
     class << self
@@ -33,13 +25,9 @@ module Capybara
         Capybara.default_max_wait_time = 1
         Capybara.ignore_hidden_elements = true
         Capybara.exact = false
-        # `exact_options` is deprecated - set instancce var directly so we
-        # don't generate message every reset
-        Capybara.send(:config).session_options.instance_variable_set('@exact_options', false)
         Capybara.raise_server_errors = true
         Capybara.visible_text_only = false
         Capybara.match = :smart
-        Capybara.wait_on_first_by_default = false
         Capybara.enable_aria_label = false
         reset_threadsafe
       end
@@ -59,7 +47,7 @@ module Capybara
         @specs << [name, options, block]
       end
 
-      def run_specs(session, name, options={})
+      def run_specs(session, name, **options)
         specs = @specs
         RSpec.describe Capybara::Session, name, options do
           include Capybara::SpecHelper
@@ -80,6 +68,10 @@ module Capybara
             SpecHelper.reset_threadsafe(false, @session)
           end
 
+          before :each, :exact_false do
+            Capybara.exact = false
+          end
+
           specs.each do |spec_name, spec_options, block|
             describe spec_name, *spec_options do
               class_eval(&block)
@@ -94,7 +86,7 @@ module Capybara
         session = session.current_session if session.respond_to?(:current_session)
         session.instance_variable_set(:@config, nil) if session
       end
-    end # class << self
+    end
 
     def silence_stream(stream)
       old_stream = stream.dup
@@ -119,11 +111,27 @@ module Capybara
     end
 
     def marionette?(session)
-      session.driver.respond_to?(:marionette?, true) && session.driver.send(:marionette?)
+      session.respond_to?(:driver) && session.driver.respond_to?(:marionette?, true) && session.driver.send(:marionette?)
+    end
+
+    def marionette_lt?(version, session)
+      marionette?(session) && (session.driver.browser.capabilities[:browser_version].to_f < version)
+    end
+
+    def marionette_gte?(version, session)
+      marionette?(session) && (session.driver.browser.capabilities[:browser_version].to_f >= version)
+    end
+
+    def chrome?(session)
+      session.respond_to?(:driver) && session.driver.respond_to?(:chrome?, true) && session.driver.send(:chrome?)
+    end
+
+    def chrome_lt?(version, session)
+      chrome?(session) && (session.driver.browser.capabilities[:version].to_f < version)
     end
 
-    def rspec2?
-      !defined?(::RSpec::Expectations::Version) || (Gem::Version.new(RSpec::Expectations::Version::STRING) < Gem::Version.new('3.0'))
+    def chrome_gte?(version, session)
+      chrome?(session) && (session.driver.browser.capabilities[:version].to_f >= version)
     end
   end
 end

data/lib/capybara/spec/test_app.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'sinatra/base'
 require 'tilt/erb'
 require 'rack'
@@ -21,7 +22,7 @@ class TestApp < Sinatra::Base
   # Also check lib/capybara/spec/views/*.erb for pages not listed here
 
   get '/' do
-    response.set_cookie('capybara', { value: 'root cookie', domain: request.host, path: request.path} )
+    response.set_cookie('capybara', value: 'root cookie', domain: request.host, path: request.path)
     'Hello world! <a href="with_html">Relative</a>'
   end
 
@@ -38,8 +39,8 @@ class TestApp < Sinatra::Base
   end
 
   get '/referer_base' do
-    '<a href="/get_referer">direct link</a>' +
-    '<a href="/redirect_to_get_referer">link via redirect</a>' +
+    '<a href="/get_referer">direct link</a>' \
+    '<a href="/redirect_to_get_referer">link via redirect</a>' \
     '<form action="/get_referer" method="get"><input type="submit"></form>'
   end
 
@@ -69,7 +70,7 @@ class TestApp < Sinatra::Base
   end
 
   get '/with-quotes' do
-    %q{"No," he said, "you can't do that."}
+    %q("No," he said, "you can't do that.")
   end
 
   get '/form/get' do
@@ -149,7 +150,7 @@ class TestApp < Sinatra::Base
 
   post '/form' do
     @@form_post_count += 1
-    '<pre id="results">' + params[:form].merge({"post_count" => @@form_post_count}).to_yaml + '</pre>'
+    '<pre id="results">' + params[:form].merge("post_count" => @@form_post_count).to_yaml + '</pre>'
   end
 
   post '/upload_empty' do
@@ -173,7 +174,7 @@ class TestApp < Sinatra::Base
 
   post '/upload_multiple' do
     begin
-      buffer = ["#{params[:form][:multiple_documents].size}"]
+      buffer = [params[:form][:multiple_documents].size.to_s]
       params[:form][:multiple_documents].each do |doc|
         buffer << "Content-type: #{doc[:type]}"
         buffer << "File content: #{doc[:tempfile].read}"
@@ -185,6 +186,4 @@ class TestApp < Sinatra::Base
   end
 end
 
-if __FILE__ == $0
-  Rack::Handler::WEBrick.run TestApp, Port: 8070
-end
+Rack::Handler::Puma.run TestApp, Port: 8070 if $PROGRAM_NAME == __FILE__

data/lib/capybara/spec/views/form.erb

@@ -186,6 +186,7 @@ New line after and before textarea tag
     <input type="checkbox" value="pagani" name="form[cars][]" id="form_cars_pagani" style="position: absolute; left: -9999px"/>
     <label for="form_cars_pagani">Pagani</label>
     <input type="checkbox" value="ariel" name="form[cars][]" id="form_cars_ariel" style="display: none"/>
+    <input type="checkbox" value="porsche" name="form[cars][]" id="form_cars_porsche" checked="checked" style="display: none"/>
     <label>
       McLaren
       <input type="checkbox" value="mclaren" name="form[cars][]" id="form_cars_mclaren" style="display: none"/>

data/lib/capybara/spec/views/with_html.erb

@@ -150,4 +150,6 @@ banana</textarea>
     <div data-pre=true>Pre Sibling</div>
     <div data-post=true>Post Sibling</div>
   </div>
-</div>
+</div>
+
+<div id='1escape.me' class="2escape">needs escaping</div>

data/lib/capybara/spec/views/within_frames.erb

@@ -4,7 +4,10 @@
         <title>With Frames</title>
     </head>
     <body>
-        <div id="divInMainWindow">This is the text for divInMainWindow</div>
+        <div id="divInMainWindow">
+          This is the text for divInMainWindow
+          <iframe src="/frame_parent" id="innerParentFrame"></iframe>
+        </div>
     <iframe src="/frame_one" id="frameOne" name="my frame one"></iframe>
     <iframe src="/frame_two" id="frameTwo"></iframe>
     <iframe src="/frame_parent" id="parentFrame"></iframe>

data/lib/capybara/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Capybara
-  VERSION = '2.18.0'
+  VERSION = '3.0.0.rc1'.freeze
 end

data/lib/capybara/window.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Capybara
   ##
   # The Window class represents a browser window.
@@ -101,7 +102,7 @@ module Capybara
     end
 
     def eql?(other)
-      other.kind_of?(self.class) && @session == other.session && @handle == other.handle
+      other.is_a?(self.class) && @session == other.session && @handle == other.handle
     end
     alias_method :==, :eql?
 
@@ -113,9 +114,9 @@ module Capybara
       "#<Window @handle=#{@handle.inspect}>"
     end
 
-    private
+  private
 
-    def wait_for_stable_size(seconds=session.config.default_max_wait_time)
+    def wait_for_stable_size(seconds = session.config.default_max_wait_time)
       res = yield if block_given?
       prev_size = size
       start_time = Capybara::Helpers.monotonic_time
@@ -125,16 +126,11 @@ module Capybara
         return res if cur_size == prev_size
         prev_size = cur_size
       end while (Capybara::Helpers.monotonic_time - start_time) < seconds
-      #TODO raise error in 3.0
-      #raise Capybara::WindowError, "Window size not stable."
-      warn "Window size not stable in #{seconds} seconds.  This will raise an exception in a future version of Capybara"
-      return res
+      raise Capybara::WindowError, "Window size not stable within #{seconds} seconds."
     end
 
     def raise_unless_current(what)
-      unless current?
-        raise Capybara::WindowError, "#{what} not current window is not possible."
-      end
+      raise Capybara::WindowError, "#{what} not current window is not possible." unless current?
     end
   end
 end

data/spec/basic_node_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Capybara do

data/spec/capybara_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe Capybara do
@@ -12,15 +13,6 @@ RSpec.describe Capybara do
       Capybara.default_max_wait_time = 5
       expect(Capybara.default_max_wait_time).to eq(5)
     end
-
-    it "should be accesible as the deprecated default_wait_time" do
-      expect(Capybara.send(:config)).to receive(:warn).ordered.with('DEPRECATED: #default_wait_time= is deprecated, please use #default_max_wait_time= instead')
-      expect(Capybara.send(:config)).to receive(:warn).ordered.with('DEPRECATED: #default_wait_time is deprecated, please use #default_max_wait_time instead')
-      @previous_default_time = Capybara.default_max_wait_time
-      Capybara.default_wait_time = 5
-      expect(Capybara.default_wait_time).to eq(5)
-      expect(Capybara.default_max_wait_time).to eq(5)
-    end
   end
 
   describe '.register_driver' do
@@ -37,7 +29,7 @@ RSpec.describe Capybara do
   describe '.register_server' do
     it "should add a new server" do
       handler = double("handler")
-      Capybara.register_server :blob do |app, port, host|
+      Capybara.register_server :blob do |_app, _port, _host|
         handler.run
       end
 
@@ -46,12 +38,8 @@ RSpec.describe Capybara do
   end
 
   describe ".server" do
-    before do
-      @old_server = Capybara.server
-    end
-
     after do
-      Capybara.server(&@old_server)
+      Capybara.server = :default
     end
 
     it "should default to a proc that calls run_default_server" do
@@ -61,8 +49,9 @@ RSpec.describe Capybara do
     end
 
     it "should return a custom server proc" do
-      server = lambda {|app, port|}
-      Capybara.server(&server)
+      server = ->(_app, _port) {}
+      Capybara.register_server :custom, &server
+      Capybara.server = :custom
       expect(Capybara.server).to eq(server)
     end
 
@@ -116,7 +105,7 @@ RSpec.describe Capybara do
       Capybara.default_host = old_default
     end
 
-    it "should warn if not a valid URL" do
+    it "should raise if not a valid URL" do
       expect { Capybara.default_host = "www.example.com" }.to raise_error(ArgumentError, /Capybara\.default_host should be set to a url/)
     end
 
@@ -124,26 +113,14 @@ RSpec.describe Capybara do
       expect { Capybara.default_host = "http://www.example.com" }.not_to raise_error
     end
   end
-
-  describe "configure" do
-    it 'deprecates calling non configuration option methods in configure' do
-      expect_any_instance_of(Kernel).to receive(:warn).
-        with('Calling register_driver from Capybara.configure is deprecated - please call it on Capybara directly ( Capybara.register_driver(...) )')
-      Capybara.configure do |config|
-        config.register_driver(:random_name) do
-          #just a random block
-        end
-      end
-    end
-  end
 end
 
 RSpec.describe Capybara::Session do
   context 'with nonexistent driver' do
     it "should raise an error" do
-      expect {
+      expect do
         Capybara::Session.new(:quox, TestApp).driver
-      }.to raise_error(Capybara::DriverNotFoundError)
+      end.to raise_error(Capybara::DriverNotFoundError)
     end
   end
 end