bump rspec version in development dependencies to avoid deprecation m…

…essages
thoughtbot · Apr 3, 2012 · d77c34b · d77c34b
1 parent a6b2da9
commit d77c34b
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 66 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -91,8 +91,8 @@ GEM
       json (>= 1.4.6)
     hike (1.2.1)
     i18n (0.6.0)
-    journey (1.0.1)
-    json (1.6.5)
+    journey (1.0.3)
+    json (1.6.6)
     launchy (2.0.5)
       addressable (~> 2.2.6)
     mail (2.4.1)
@@ -106,7 +106,7 @@ GEM
     nokogiri (1.5.0)
     polyglot (0.3.3)
     rack (1.4.1)
-    rack-cache (1.1)
+    rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
@@ -131,19 +131,19 @@ GEM
     rdiscount (1.6.8)
     rdoc (3.12)
       json (~> 1.4)
-    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)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    rspec-rails (2.9.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.9.0)
     rubyzip (0.9.5)
     selenium-webdriver (2.18.0)
       childprocess (>= 0.2.5)
@@ -180,7 +180,7 @@ DEPENDENCIES
   database_cleaner
   factory_girl_rails
   launchy
-  rspec-rails (~> 2.6.0)
+  rspec-rails (~> 2.9.0)
   shoulda-matchers!
   sqlite3
   timecop
diff --git a/clearance.gemspec b/clearance.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('bundler',        '~> 1.1.0')
   s.add_development_dependency('appraisal',      '~> 0.3.8')
   s.add_development_dependency('cucumber-rails', '~> 1.1.1')
-  s.add_development_dependency('rspec-rails',    '~> 2.6.0')
+  s.add_development_dependency('rspec-rails',    '~> 2.9.0')
   s.add_development_dependency('sqlite3')
   s.add_development_dependency('bourne')
   s.add_development_dependency('timecop')
@@ -38,4 +38,3 @@ Gem::Specification.new do |s|
     s.specification_version = 3
   end
 end
-
diff --git a/gemfiles/3.0.12.gemfile.lock b/gemfiles/3.0.12.gemfile.lock
@@ -46,14 +46,11 @@ GEM
       bundler
       rake
     arel (2.0.10)
-    aruba (0.4.6)
-      bcat (>= 0.6.1)
-      childprocess (>= 0.2.0)
-      cucumber (>= 1.0.2)
-      rdiscount (>= 1.6.8)
-      rspec (>= 2.6.0)
-    bcat (0.6.2)
-      rack (~> 1.0)
+    aruba (0.4.11)
+      childprocess (>= 0.2.3)
+      cucumber (>= 1.1.1)
+      ffi (>= 1.0.11)
+      rspec (>= 2.7.0)
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (2.1.2)
@@ -126,22 +123,21 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.4)
     rake (0.9.2.2)
-    rdiscount (1.6.8)
     rdoc (3.12)
       json (~> 1.4)
-    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)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    rspec-rails (2.9.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.9.0)
     rubyzip (0.9.6.1)
     selenium-webdriver (2.20.0)
       childprocess (>= 0.2.5)
@@ -174,7 +170,7 @@ DEPENDENCIES
   factory_girl_rails
   launchy
   rails (= 3.0.12)
-  rspec-rails (~> 2.6.0)
+  rspec-rails (~> 2.9.0)
   shoulda-matchers!
   sqlite3
   timecop
diff --git a/gemfiles/3.1.4.gemfile.lock b/gemfiles/3.1.4.gemfile.lock
@@ -47,14 +47,11 @@ GEM
       bundler
       rake
     arel (2.2.3)
-    aruba (0.4.6)
-      bcat (>= 0.6.1)
-      childprocess (>= 0.2.0)
-      cucumber (>= 1.0.2)
-      rdiscount (>= 1.6.8)
-      rspec (>= 2.6.0)
-    bcat (0.6.2)
-      rack (~> 1.0)
+    aruba (0.4.11)
+      childprocess (>= 0.2.3)
+      cucumber (>= 1.1.1)
+      ffi (>= 1.0.11)
+      rspec (>= 2.7.0)
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (3.0.0)
@@ -131,22 +128,21 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2.2)
-    rdiscount (1.6.8)
     rdoc (3.12)
       json (~> 1.4)
-    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)
+    rspec (2.9.0)
+      rspec-core (~> 2.9.0)
+      rspec-expectations (~> 2.9.0)
+      rspec-mocks (~> 2.9.0)
+    rspec-core (2.9.0)
+    rspec-expectations (2.9.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.9.0)
+    rspec-rails (2.9.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.9.0)
     rubyzip (0.9.6.1)
     selenium-webdriver (2.20.0)
       childprocess (>= 0.2.5)
@@ -184,7 +180,7 @@ DEPENDENCIES
   factory_girl_rails
   launchy
   rails (= 3.1.4)
-  rspec-rails (~> 2.6.0)
+  rspec-rails (~> 2.9.0)
   shoulda-matchers!
   sqlite3
   timecop
diff --git a/spec/support/cookies.rb b/spec/support/cookies.rb
@@ -58,7 +58,7 @@ def ensure_path_is_correct
     @path.should == "/"
   end
 
-  failure_message do
+  failure_message_for_should do
     "Expected #{expectation} got #{result}"
   end