Test against RSpec 3 from now on

* Ruby 2.2 removed Minitest and Test::Unit from the standard library [[1]], [[2]] * rspec-rails requires Test::Unit for Rails versions prior to 4.1 (which switched to Minitest) * This doesn't work now, because we don't have Test::Unit present in the gem bundle * RSpec 3.2.0 fixes this issue [[3]] I don't really see this as a huge concern, since we were testing against RSpec 2.99 for Rails < 4, and that has most of the changes that RSpec 3 has. [1]: ruby/ruby@f8c6a5d [2]: ruby/ruby@96f5526 [3]: rspec/rspec-rails@999ebb7#diff-08d960c572ac094640dd183fa9641393R13
thoughtbot · Feb 5, 2015 · b7fe87a · b7fe87a
1 parent dff472e
commit b7fe87a
Show file tree

Hide file tree

Showing 17 changed files with 179 additions and 171 deletions.
diff --git a/Appraisals b/Appraisals
@@ -7,7 +7,6 @@ end
 
 rails_3 = proc do
   gem 'strong_parameters'
-  gem 'rspec-rails', '2.99.0'
   gem 'minitest', '~> 4.0'
   gem 'minitest-reporters'
 end
@@ -20,7 +19,6 @@ rails_3_1 = proc do
   gem 'sass-rails', '~> 3.1.5'
   gem 'coffee-rails', '~> 3.1.1'
   gem 'uglifier', '>= 1.0.3'
-  gem 'rspec-rails', '2.99.0'
   gem 'minitest', '~> 4.0'
   gem 'minitest-reporters'
 end
@@ -45,7 +43,6 @@ rails_4 = proc do
   gem 'turbolinks'
   gem 'sdoc'
   gem 'activeresource', '4.0.0'
-  gem 'rspec-rails', '~> 3.0.1'
   # Test suite makes heavy use of attr_accessible
   gem 'protected_attributes'
   gem 'minitest-reporters'
@@ -98,7 +95,6 @@ if Gem::Requirement.new('> 1.9.2').satisfied_by?(ruby_version)
     gem 'jbuilder', '~> 1.2'
     gem 'sass-rails', '~> 4.0.0'
     gem 'bcrypt-ruby', '~> 3.1.2'
-    gem 'rspec-rails', '2.99.0'
   end
 
   appraise '4.1' do

diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ gem 'bundler', '~> 1.1'
 gem 'pry-nav'
 gem 'rails', '~> 3.0'
 gem 'rake', '>= 0.9.2'
-gem 'rspec-rails', '>= 2.99.0'
+gem 'rspec-rails', '~> 3.0'
 
 # YARD
 gem 'yard'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -55,9 +55,9 @@ GEM
     gherkin (2.12.2)
       multi_json (~> 1.3)
     hike (1.2.3)
-    i18n (0.6.11)
+    i18n (0.7.0)
     journey (1.0.4)
-    json (1.8.1)
+    json (1.8.2)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -84,7 +84,7 @@ GEM
       rack (>= 0.4)
     rack-ssl (1.3.4)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (3.2.16)
       actionmailer (= 3.2.16)
@@ -101,29 +101,30 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (3.0.0)
-    rspec-core (3.0.3)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.3)
+    rspec-core (3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.3)
-      rspec-support (~> 3.0.0)
-    rspec-rails (3.0.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.3)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-rails (3.2.0)
+      actionpack (>= 3.0, <= 4.2)
+      activesupport (>= 3.0, <= 4.2)
+      railties (>= 3.0, <= 4.2)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.1)
     shoulda-context (1.2.0)
     slop (3.6.0)
-    sprockets (2.2.2)
+    sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -156,7 +157,7 @@ DEPENDENCIES
   rails (~> 3.0)
   rake (>= 0.9.2)
   redcarpet
-  rspec-rails (>= 2.99.0)
+  rspec-rails (~> 3.0)
   shoulda-context (~> 1.2.0)
   sqlite3
   therubyrhino

diff --git a/gemfiles/3.0.gemfile b/gemfiles/3.0.gemfile
@@ -9,7 +9,7 @@ gem "bundler", "~> 1.1"
 gem "pry-nav"
 gem "rails", "~> 3.0.17"
 gem "rake", ">= 0.9.2"
-gem "rspec-rails", "2.99.0"
+gem "rspec-rails", "~> 3.0"
 gem "yard"
 gem "redcarpet"
 gem "pygments.rb"

diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock
@@ -58,7 +58,7 @@ GEM
       multi_json (~> 1.3)
     hashie (3.3.1)
     i18n (0.5.4)
-    json (1.8.1)
+    json (1.8.2)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -110,25 +110,27 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (10.3.2)
+    rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (3.1.2)
-    rspec-collection_matchers (1.0.0)
-      rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (2.99.1)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.2)
-    rspec-rails (2.99.0)
-      actionpack (>= 3.0)
-      activemodel (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-collection_matchers
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
+    rspec-core (3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-rails (3.2.0)
+      actionpack (>= 3.0, <= 4.2)
+      activesupport (>= 3.0, <= 4.2)
+      railties (>= 3.0, <= 4.2)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.1)
     shoulda-context (1.2.0)
     slop (3.6.0)
     sqlite3 (1.3.7)
@@ -140,7 +142,7 @@ GEM
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.41)
+    tzinfo (0.3.43)
     watchr (0.7)
     yajl-ruby (1.1.0)
     yard (0.8.7.3)
@@ -164,7 +166,7 @@ DEPENDENCIES
   rails (~> 3.0.17)
   rake (>= 0.9.2)
   redcarpet
-  rspec-rails (= 2.99.0)
+  rspec-rails (~> 3.0)
   shoulda-context (~> 1.2.0)
   sqlite3
   strong_parameters

diff --git a/gemfiles/3.1.gemfile b/gemfiles/3.1.gemfile
@@ -9,7 +9,7 @@ gem "bundler", "~> 1.1"
 gem "pry-nav"
 gem "rails", "~> 3.1.8"
 gem "rake", ">= 0.9.2"
-gem "rspec-rails", "2.99.0"
+gem "rspec-rails", "~> 3.0"
 gem "yard"
 gem "redcarpet"
 gem "pygments.rb"

diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock
@@ -67,11 +67,11 @@ GEM
       multi_json (~> 1.3)
     hashie (3.3.1)
     hike (1.2.3)
-    i18n (0.6.11)
+    i18n (0.7.0)
     jquery-rails (2.2.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
     mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -110,7 +110,7 @@ GEM
       rack (>= 1.0.0)
     rack-ssl (1.3.4)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (3.1.11)
       actionmailer (= 3.1.11)
@@ -127,25 +127,27 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (10.3.2)
+    rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (3.1.2)
-    rspec-collection_matchers (1.0.0)
-      rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (2.99.1)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.2)
-    rspec-rails (2.99.0)
-      actionpack (>= 3.0)
-      activemodel (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-collection_matchers
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
+    rspec-core (3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-rails (3.2.0)
+      actionpack (>= 3.0, <= 4.2)
+      activesupport (>= 3.0, <= 4.2)
+      railties (>= 3.0, <= 4.2)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.1)
     sass (3.2.7)
     sass-rails (3.1.6)
       actionpack (~> 3.1.0)
@@ -154,7 +156,7 @@ GEM
       tilt (~> 1.3.2)
     shoulda-context (1.2.0)
     slop (3.6.0)
-    sprockets (2.0.4)
+    sprockets (2.0.5)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -200,7 +202,7 @@ DEPENDENCIES
   rails (~> 3.1.8)
   rake (>= 0.9.2)
   redcarpet
-  rspec-rails (= 2.99.0)
+  rspec-rails (~> 3.0)
   sass-rails (~> 3.1.5)
   shoulda-context (~> 1.2.0)
   sqlite3

diff --git a/gemfiles/3.2.gemfile b/gemfiles/3.2.gemfile
@@ -9,7 +9,7 @@ gem "bundler", "~> 1.1"
 gem "pry-nav"
 gem "rails", "~> 3.2.13"
 gem "rake", ">= 0.9.2"
-gem "rspec-rails", "2.99.0"
+gem "rspec-rails", "~> 3.0"
 gem "yard"
 gem "redcarpet"
 gem "pygments.rb"

diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock
@@ -71,7 +71,7 @@ GEM
     jquery-rails (2.2.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
     mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -108,7 +108,7 @@ GEM
       rack (>= 0.4)
     rack-ssl (1.3.4)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (3.2.13)
       actionmailer (= 3.2.13)
@@ -125,25 +125,27 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.3.2)
+    rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (3.1.2)
-    rspec-collection_matchers (1.0.0)
-      rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (2.99.1)
-    rspec-expectations (2.99.2)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.2)
-    rspec-rails (2.99.0)
-      actionpack (>= 3.0)
-      activemodel (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-collection_matchers
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
+    rspec-core (3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-rails (3.2.0)
+      actionpack (>= 3.0, <= 4.2)
+      activesupport (>= 3.0, <= 4.2)
+      railties (>= 3.0, <= 4.2)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.1)
     sass (3.2.7)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
@@ -154,7 +156,7 @@ GEM
     spring (1.1.3)
     spring-commands-rspec (1.0.2)
       spring (>= 0.9.1)
-    sprockets (2.2.2)
+    sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -199,7 +201,7 @@ DEPENDENCIES
   rails (~> 3.2.13)
   rake (>= 0.9.2)
   redcarpet
-  rspec-rails (= 2.99.0)
+  rspec-rails (~> 3.0)
   sass-rails (~> 3.2.3)
   shoulda-context (~> 1.2.0)
   spring

diff --git a/gemfiles/4.0.0.gemfile b/gemfiles/4.0.0.gemfile
@@ -9,7 +9,7 @@ gem "bundler", "~> 1.1"
 gem "pry-nav"
 gem "rails", "4.0.0"
 gem "rake", ">= 0.9.2"
-gem "rspec-rails", "~> 3.0.1"
+gem "rspec-rails", "~> 3.0"
 gem "yard"
 gem "redcarpet"
 gem "pygments.rb"