Bump rspec-rails.

thoughtbot · Apr 20, 2012 · 5baa056 · 5baa056
1 parent f0003e2
commit 5baa056
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 63 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -74,7 +74,7 @@ GEM
     mime-types (1.18)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
-    multi_json (1.2.0)
+    multi_json (1.3.2)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -102,19 +102,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)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.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-mocks (2.8.0)
+    rspec-rails (2.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.8.0)
     shoulda-context (1.0.0)
     sprockets (2.1.2)
       hike (~> 1.2)
@@ -144,7 +144,7 @@ DEPENDENCIES
   jruby-openssl
   rails (~> 3.0)
   rake (~> 0.9.2)
-  rspec-rails (~> 2.6.1)
+  rspec-rails (~> 2.8.1)
   shoulda-context (~> 1.0.0)
   shoulda-matchers!
   sqlite3

diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock
@@ -38,14 +38,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)
@@ -95,22 +92,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)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.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-mocks (2.8.0)
+    rspec-rails (2.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.8.0)
     shoulda-context (1.0.0)
     sqlite3 (1.3.6)
     term-ansicolor (1.0.7)
@@ -135,7 +131,7 @@ DEPENDENCIES
   jruby-openssl
   rails (= 3.0.12)
   rake (~> 0.9.2)
-  rspec-rails (~> 2.6.1)
+  rspec-rails (~> 2.8.1)
   shoulda-context (~> 1.0.0)
   shoulda-matchers!
   sqlite3

diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock
@@ -39,14 +39,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)
@@ -104,22 +101,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)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.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-mocks (2.8.0)
+    rspec-rails (2.8.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec (~> 2.8.0)
     sass (3.1.15)
     sass-rails (3.1.6)
       actionpack (~> 3.1.0)
@@ -156,7 +152,7 @@ DEPENDENCIES
   jruby-openssl
   rails (= 3.1.4)
   rake (~> 0.9.2)
-  rspec-rails (~> 2.6.1)
+  rspec-rails (~> 2.8.1)
   sass-rails
   shoulda-context (~> 1.0.0)
   shoulda-matchers!

diff --git a/lib/shoulda/matchers/active_record/association_matcher.rb b/lib/shoulda/matchers/active_record/association_matcher.rb
@@ -274,10 +274,13 @@ def expectation
 
         def macro_description
           case @macro.to_s
-          when 'belongs_to' then 'belong to'
-          when 'has_many'   then 'have many'
-          when 'has_one'    then 'have one'
-          when 'has_and_belongs_to_many' then
+          when 'belongs_to'
+            'belong to'
+          when 'has_many'
+            'have many'
+          when 'has_one'
+            'have one'
+          when 'has_and_belongs_to_many'
             'have and belong to many'
           end
         end

diff --git a/shoulda-matchers.gemspec b/shoulda-matchers.gemspec
@@ -26,5 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('cucumber',    '~> 1.1.9')
   s.add_development_dependency('rails',       '~> 3.0')
   s.add_development_dependency('rake',        '~> 0.9.2')
-  s.add_development_dependency('rspec-rails', '~> 2.6.1')
+  s.add_development_dependency('rspec-rails', '~> 2.8.1')
 end