Increase Capybara server start timeout to prevent JS features failing…

… on some machines; stop using Capybara 1.0 release.
addisonlee · Jul 17, 2011 · aa5b3d3 · aa5b3d3
1 parent d9b25e3
commit aa5b3d3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -30,6 +30,6 @@ group :test do
   gem 'rspec',            '1.3.2'
   gem 'rspec-rails',      '1.3.4'
   gem 'webrat',           '0.7.1'
-  gem 'capybara',         '1.0.0'
+  gem 'capybara',         '0.4.1.2'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -13,13 +13,16 @@ GEM
       activesupport (= 2.3.11)
     activesupport (2.3.11)
     builder (2.1.2)
-    capybara (1.0.0)
+    capybara (0.4.1.2)
+      celerity (>= 0.7.9)
+      culerity (>= 0.2.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 0.2.0)
-      xpath (~> 0.1.4)
+      selenium-webdriver (>= 0.0.27)
+      xpath (~> 0.1.3)
+    celerity (0.8.9)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
     configuration (1.2.0)
@@ -34,6 +37,7 @@ GEM
       term-ansicolor (~> 1.0.5)
     cucumber-rails (0.3.2)
       cucumber (>= 0.8.0)
+    culerity (0.2.15)
     dictionary (1.0.0)
     diff-lcs (1.1.2)
     escape (0.0.4)
@@ -84,7 +88,7 @@ GEM
       rack (>= 1.0.0)
       rspec (~> 1.3.1)
     rubyzip (0.9.4)
-    selenium-webdriver (0.2.2)
+    selenium-webdriver (2.0.1)
       childprocess (>= 0.1.9)
       ffi (>= 1.0.7)
       json_pure
@@ -108,7 +112,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara (= 1.0.0)
+  capybara (= 0.4.1.2)
   couchrest (= 0.34)
   cucumber (= 0.9.4)
   cucumber-rails (= 0.3.2)

diff --git a/capybara_features/support/env.rb b/capybara_features/support/env.rb
@@ -23,7 +23,7 @@
 Capybara.default_wait_time = 2 #When we testing AJAX, we can set a default wait time
 Capybara.ignore_hidden_elements = false #Ignore hidden elements when testing, make helpful when you hide or show elements using javascript
 Capybara.javascript_driver = :selenium #default driver when you using @javascript tag
-
+Capybara.server_boot_timeout = 50
 # If you set this to false, any error raised from within your app will bubble 
 # up to your step definition and out to cucumber unless you catch it somewhere
 # on the way. You can make Rails rescue errors and render error pages on a