From 595325292761fda38bd0ffa6a10b9af9606b371d Mon Sep 17 00:00:00 2001
From: SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
Date: Sun, 24 Oct 2010 16:48:49 +0900
Subject: [PATCH] upgrade capybara-0.4.0

---
 Gemfile                              |  4 +--
 Gemfile.lock                         | 44 +++++++++++-----------------
 spec/acceptance/acceptance_helper.rb |  3 +-
 3 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2b469b9ae..ed80db4f2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,8 +1,8 @@
 source :rubygems
 
 group :test do
-	gem 'steak', :git => "git://github.com/cavalle/steak.git"
-	gem 'capybara', :git => "git://github.com/jnicklas/capybara.git"
+	gem 'steak', '>= 1.0.0.rc.1'
+	gem 'capybara'
 	gem 'launchy'
 	gem 'rspec'
 	gem 'rcov'
diff --git a/Gemfile.lock b/Gemfile.lock
index de7c603ca..013b64a5a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,15 +1,7 @@
-GIT
-  remote: git://github.com/cavalle/steak.git
-  revision: 86331782937ee379e14e02a0d313774a0391dab4
-  specs:
-    steak (1.0.0.beta.2)
-      rspec
-
-GIT
-  remote: git://github.com/jnicklas/capybara.git
-  revision: 89d00c4f0801a1d00f57c4bedb81c23b888e18df
+GEM
+  remote: http://rubygems.org/
   specs:
-    capybara (0.3.9)
+    capybara (0.4.0)
       celerity (>= 0.7.9)
       culerity (>= 0.2.4)
       mime-types (>= 1.16)
@@ -18,12 +10,8 @@ GIT
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
       xpath (~> 0.1.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
     celerity (0.8.2)
-    childprocess (0.0.7)
+    childprocess (0.1.3)
       ffi (~> 0.6.3)
     configuration (1.1.0)
     culerity (0.2.12)
@@ -42,22 +30,24 @@ GEM
     rake (0.8.7)
     rcov (0.9.9)
     rr (1.0.0)
-    rspec (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
-      rspec-mocks (= 2.0.0)
-    rspec-core (2.0.0)
-    rspec-expectations (2.0.0)
+    rspec (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
+      rspec-mocks (~> 2.0.1)
+    rspec-core (2.0.1)
+    rspec-expectations (2.0.1)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0)
-      rspec-core (= 2.0.0)
-      rspec-expectations (= 2.0.0)
+    rspec-mocks (2.0.1)
+      rspec-core (~> 2.0.1)
+      rspec-expectations (~> 2.0.1)
     rubyzip (0.9.4)
     selenium-webdriver (0.0.29)
       childprocess (>= 0.0.7)
       ffi (~> 0.6.3)
       json_pure
       rubyzip
+    steak (1.0.0.rc.1)
+      rspec
     xpath (0.1.2)
       nokogiri (~> 1.3)
 
@@ -65,9 +55,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara!
+  capybara
   launchy
   rcov
   rr
   rspec
-  steak!
+  steak (>= 1.0.0.rc.1)
diff --git a/spec/acceptance/acceptance_helper.rb b/spec/acceptance/acceptance_helper.rb
index c4f78e90c..9b573aeea 100644
--- a/spec/acceptance/acceptance_helper.rb
+++ b/spec/acceptance/acceptance_helper.rb
@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + "/../spec_helper"
 
-require "steak"
 require 'capybara/dsl'
 require 'rack'
 
@@ -24,7 +23,7 @@
   config.include Capybara
 end
 
-Capybara.default_selector = :css
+Capybara.save_and_open_page_path = File.dirname(__FILE__) + '../../tmp'
 
 # Put your acceptance spec helpers inside /spec/acceptance/support
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}