restored current rspec

dominic · dominic · commit a7a63381c9a8 · 2011-09-03T14:15:32.000-04:00
diff --git a/Gemfile b/Gemfile
@@ -36,5 +36,9 @@ group :development, :test do
   gem 'fabrication'
   gem 'rspec-rails'
   gem 'cucumber-rails'
+  gem "faker"
+end
+
+group :test do
+  gem "mocha"
 end
-gem "mocha", :group => :test
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -77,6 +77,8 @@ GEM
     execjs (1.2.4)
       multi_json (~> 1.0)
     fabrication (1.1.0)
+    faker (0.9.5)
+      i18n (~> 0.4)
     ffi (1.0.9)
     gherkin (2.4.16)
       json (>= 1.4.6)
@@ -149,17 +151,19 @@ GEM
     rake (0.9.2)
     rdoc (3.9.4)
     responders (0.6.4)
-    rspec (2.0.0.beta.19)
-      rspec-core (= 2.0.0.beta.19)
-      rspec-expectations (= 2.0.0.beta.19)
-      rspec-mocks (= 2.0.0.beta.19)
-    rspec-core (2.0.0.beta.19)
-    rspec-expectations (2.0.0.beta.19)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.19)
-    rspec-rails (2.0.0.beta.19)
-      rspec (= 2.0.0.beta.19)
-      webrat (>= 0.7.2.beta.1)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.1)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.6.0)
     rubyzip (0.9.4)
     sass (3.1.7)
     sass-rails (3.1.0.rc.6)
@@ -195,10 +199,6 @@ GEM
       raindrops (~> 0.6)
     warden (1.0.5)
       rack (>= 1.0)
-    webrat (0.7.3)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5.3)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -212,6 +212,7 @@ DEPENDENCIES
   cucumber-rails
   devise (>= 1.2)
   fabrication
+  faker
   haml-rails
   inherited_resources
   jnunemaker-validatable (>= 1.8.4)
