capybara 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0365cf5370925d2493a5f2775405ca28fec3357
-  data.tar.gz: 20c8699f963a8597a8b63c202e5d20d019ef7b4d
+  metadata.gz: 04bb73ad4dc0bb8787750353e8f3977f7c4f36bb
+  data.tar.gz: a030257e516a4db73443415ee779ea31338cbdd1
 SHA512:
-  metadata.gz: c8be660aff9a2e47051ee58174ffa948306e0a1d81bab10580294078d1bd7fa696232a2e8cf2dd2d5c3f174f82ad678e74da81bab000dc4b34e9690ea7225056
-  data.tar.gz: e65771d62d170306d8fe42844d93b0b4520bab7fa40bec3bdd63b3e03b0abc66a53286fd029b499daadbfa4991821ea153bcb0fe0bf3f79a89299a146cc87ff0
+  metadata.gz: 4f640db24f67cb96877b9e08e73d43b725bfac2c4a82da8ce8ab269eb8e98f3b4b5d05ca6a5321a96c87b2e8b2616a4bee1ce91a61d412af35a5410c94258a78
+  data.tar.gz: 3ae37dfdb9e84be5ff42b750441393134c249febbbc254d0217ce233c252b0738dd7954be48c8458d7b112a9629cde31cd7ef89fe0b6a8d37bc2f131db8b3e3e

data/History.md

@@ -1,6 +1,16 @@
+# Version 2.4.2
+Release date: 2014-09-20
+
+### Fixed
+* Prevent concurrency issue when testing Rails app with default test environment [Thomas Walpole]
+* Tags for windows API tests fixed [Dmitry Vorotilin]
+* Documentation Fixes [Andrey Botalov]
+* Always convert visit url to string, fixes issue with visit when always_include_port was enabled [Jake Goulding]
+* Check correct rspec version before including ::RSpec::Matchers::Composable in Capybara RSpec matchers [Thomas Walpole, Justin Ko]
+
 # Version 2.4.1
 
-Release data: 2014-07-03
+Release date: 2014-07-03
 
 ### Added
 
@@ -76,7 +86,7 @@ Release date: 2013-11-21
   instead of `about:blank`, fixing hanging issues in JRuby. [Jonas Nicklas]
 * Fixed cookies not being set when path is blank under RackTest [Thomas Walpole]
 * Clearing fields now correctly causes change events [Jonas Nicklas]
-* Navigating to an absolut URI without trailing slash now works as expected
+* Navigating to an absolute URI without trailing slash now works as expected
   under RackTest [Jonas Nicklas]
 * Checkboxes without assigned value default to `on` under RackTest [Nigel Sheridan-Smith]
 * Clicks on buttons with no form associated with them are ignored in RackTest

data/lib/capybara/rails.rb

@@ -2,6 +2,12 @@ require 'capybara'
 require 'capybara/dsl'
 
 Capybara.app = Rack::Builder.new do
+  # Work around an issue where rails allows concurrency in test mode even though eager_load
+  # is false which can cause an issue with constant loading
+  if Gem::Version.new(Rails.version) >= Gem::Version.new("4.0")
+    use Rack::Lock unless Rails.application.config.eager_load || Rails.application.middleware.include?(Rack::Lock)
+  end
+  
   map "/" do
     if Gem::Version.new(Rails.version) >= Gem::Version.new("3.0")
       run Rails.application

data/lib/capybara/rspec/matchers.rb

@@ -1,7 +1,7 @@
 module Capybara
   module RSpecMatchers
     class Matcher
-      include ::RSpec::Matchers::Composable if defined?(::RSpec::Version) && ::RSpec::Version::STRING.to_f >= 3.0
+      include ::RSpec::Matchers::Composable if defined?(::RSpec::Expectations::Version) && RSpec::Expectations::Version::STRING.to_f >= 3.0
 
       def wrap(actual)
         if actual.respond_to?("has_selector?")

data/lib/capybara/session.rb

@@ -199,22 +199,23 @@ module Capybara
     #
     # Will actually navigate to `http://google.com:4567/test`.
     #
-    # @param [String] url     The URL to navigate to
+    # @param [#to_s] url     The URL to navigate to. The parameter will be cast to a String.
     #
     def visit(url)
       raise_server_error!
 
+      url = url.to_s
       @touched = true
 
-      url_relative = URI.parse(url.to_s).scheme.nil?
+      url_relative = URI.parse(url).scheme.nil?
 
       if url_relative && Capybara.app_host
-        url = Capybara.app_host + url.to_s
+        url = Capybara.app_host + url
         url_relative = false
       end
 
       if @server
-        url = "http://#{@server.host}:#{@server.port}" + url.to_s if url_relative
+        url = "http://#{@server.host}:#{@server.port}" + url if url_relative
 
         if Capybara.always_include_port
           uri = URI.parse(url)

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

@@ -8,7 +8,7 @@ Capybara::SpecHelper.spec '#become_closed', requires: [:windows, :js] do
   end
 
   after(:each) do
-    @session.document.synchronize(3, errors: [Capybara::CapybaraError]) do
+    @session.document.synchronize(5, errors: [Capybara::CapybaraError]) do
       raise Capybara::CapybaraError if @session.windows.size != 1
     end
     @session.switch_to_window(@window)
@@ -20,7 +20,7 @@ Capybara::SpecHelper.spec '#become_closed', requires: [:windows, :js] do
         @session.execute_script('setTimeout(function(){ window.close(); }, 500);')
       end
       Capybara.using_wait_time 0.1 do
-        expect(@other_window).to become_closed(wait: 0.7)
+        expect(@other_window).to become_closed(wait: 2)
       end
     end
 
@@ -41,7 +41,7 @@ Capybara::SpecHelper.spec '#become_closed', requires: [:windows, :js] do
       @session.within_window @other_window do
         @session.execute_script('setTimeout(function(){ window.close(); }, 500);')
       end
-      Capybara.using_wait_time 0.7 do
+      Capybara.using_wait_time 1.5 do
         expect(@other_window).to become_closed
       end
     end

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

@@ -16,10 +16,11 @@ Capybara::SpecHelper.spec '#window_opened_by', requires: [:windows] do
 
   context 'with :wait option' do
     it 'should raise error if value of :wait is less than timeout' do
-      Capybara.using_wait_time 1 do
+      # So large value is used as `driver.window_handles` takes up to 800 ms on Travis
+      Capybara.using_wait_time 2 do
         expect do
-          @session.window_opened_by(wait: 0.4) do
-            @session.find(:css, '#openWindowWithTimeout').click
+          @session.window_opened_by(wait: 0.8) do
+            @session.find(:css, '#openWindowWithLongerTimeout').click
           end
         end.to raise_error(Capybara::WindowError, zero_windows_message)
       end

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

@@ -85,7 +85,7 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   end
 
   describe '#size' do
-    it 'should return size of whole window', requires: [:js] do
+    it 'should return size of whole window', requires: [:windows, :js] do
       expect(@session.current_window.size).to eq @session.evaluate_script("[window.outerWidth, window.outerHeight];")
     end
 
@@ -103,7 +103,7 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   end
 
   describe '#resize_to' do
-    it 'should be able to resize window', requires: [:js] do
+    it 'should be able to resize window', requires: [:windows, :js] do
       width, height = @session.evaluate_script("[window.outerWidth, window.outerHeight];")
       @session.current_window.resize_to(width-10, height-10)
       expect(@session.evaluate_script("[window.outerWidth, window.outerHeight];")).to eq([width-10, height-10])
@@ -120,16 +120,17 @@ Capybara::SpecHelper.spec Capybara::Window, requires: [:windows] do
   end
 
   describe '#maximize' do
-    it 'should be able to maximize window', requires: [:js] do
+    it 'should be able to maximize window', requires: [:windows, :js] do
       screen_width, screen_height = @session.evaluate_script("[window.screen.availWidth, window.screen.availHeight];")
       window = @session.current_window
       window.resize_to(screen_width-100, screen_height-100)
       expect(@session.evaluate_script("[window.outerWidth, window.outerHeight];")).to eq([screen_width-100, screen_height-100])
       window.maximize
+      sleep 0.5  # The timing on maximize is finicky on Travis -- wait a bit for maximize to occur
       expect(@session.evaluate_script("[window.outerWidth, window.outerHeight];")).to eq([screen_width, screen_height])
     end
 
-    it 'should switch to original window if invoked not for current window' do
+    it 'should switch to original window if invoked not for current window', requires: [:windows, :js] do
       @other_window = @session.window_opened_by do
         @session.find(:css, '#openWindow').click
       end

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

@@ -16,6 +16,13 @@
         return false;
       });
 
+      $('#openWindowWithLongerTimeout').click(function(){
+        setTimeout(function(){
+          window.open('/popup_one', 'firstPopup');
+        }, 1400);
+        return false;
+      });
+
       $('#openTwoWindows').click(function() {
         window.open('/popup_one', 'firstPopup');
         window.open('/popup_two', 'secondPopup');
@@ -29,6 +36,8 @@
 
     <button id="openWindowWithTimeout">Open new window with timeout</button>
 
+    <button id="openWindowWithLongerTimeout">Open new window with longer timeout</button>
+
     <button id="openTwoWindows">Open two windows</button>
 
     <button id="doesNotOpenWindows">Does not open windows</button>

data/lib/capybara/version.rb

@@ -1,3 +1,3 @@
 module Capybara
-  VERSION = '2.4.1'
+  VERSION = '2.4.2'
 end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'rspec/expectations'
 require "capybara/spec/spec_helper"
 require "pry"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri