Add minitest/unit via shims for test/unit.

* Specify minitest ~>4.2.0 for rails < 4 to avoid breaking changes.
* Peg mocha/minitest to old versions for cross-compatibility with ActiveSupport.
* Conditionally require mocha integration for different versions of ruby: http://jamesmead.org/blog/2009-02-02-test-unit-and-minitest-with-different-ruby-versions

Appraisals

@@ -1,27 +1,36 @@
 appraise "rails2" do
   gem "rails", "~>2.3.8"
   gem "passenger", "~>2.0"
+  gem "mocha",  "~> 0.10.5", :require=>false
+  gem "minitest", "~>4.2.0"
 end
 
 appraise "rails3" do
+  gem "mocha",  "~> 0.12.8", :require=>false
+  gem "minitest", "~>4.2.0"
   gem "rails", "3.0.11"
   gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
   gem "passenger", "~>3.0"
 end
 
 appraise "rails31" do
+  gem "mocha",  "~>0.12.8", :require=>false
+  gem "minitest", "~>4.2.0"
   gem "rails", "3.1.3"
   gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
   gem "passenger", "~>3.0"
 end
 
 appraise "rails32" do
+  gem "mocha",  "~> 0.12.8", :require=>false
+  gem "minitest", "~>4.2.0"
   gem "rails", "3.2.1"
   gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
   gem "passenger", "~>3.0"
 end
 
 appraise "rails4" do
+  gem "mocha",  "~> 1.0", :require=>false
   gem "rails", "4.0.0"
   gem "fastthread", :git => "git://github.com/zoltankiss/fastthread.git", :platforms => :mri_20
   gem "passenger", "~>3.0"

Gemfile

@@ -23,8 +23,6 @@ gem "garb"
 gem "SystemTimer", "1.2.3", :platforms => :mri_18
 
 # Testing
-gem "mocha", :require=>false
-gem "shoulda", :require=>false # Requires test/unit
 gem "timecop", :require=>false
 gem "webmock", :require=>false
 

Gemfile.lock

@@ -40,9 +40,7 @@ GEM
     liquid (2.3.0)
     maruku (0.6.0)
       syntax (>= 1.0.0)
-    metaclass (0.0.1)
-    mocha (0.10.5)
-      metaclass (~> 0.0.1)
+    minitest (4.7.5)
     mongo (1.6.0)
       bson (= 1.6.0)
     posix-spawn (0.3.6)
@@ -52,11 +50,6 @@ GEM
     redis-namespace (1.3.2)
       redis (~> 3.0.4)
     rubystats (0.2.3)
-    shoulda (3.0.1)
-      shoulda-context (~> 1.0.0)
-      shoulda-matchers (~> 1.0.0)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.0.0)
     sqlite3 (1.3.8)
     syntax (1.0.0)
     thor (0.18.1)
@@ -79,14 +72,13 @@ DEPENDENCIES
   garb
   integration
   jekyll
-  mocha
+  minitest (>= 4.2)
   mongo
   rack
   rake
   redis (>= 2.1)
   redis-namespace (>= 1.1.0)
   rubystats
-  shoulda
   sqlite3
   timecop
   vanity!

gemfiles/rails2.gemfile

@@ -13,12 +13,12 @@ gem "integration"
 gem "rubystats"
 gem "garb"
 gem "SystemTimer", "1.2.3", :platforms=>:mri_18
-gem "mocha", :require=>false
-gem "shoulda", :require=>false
 gem "timecop", :require=>false
 gem "webmock", :require=>false
 gem "rails", "~>2.3.8"
 gem "passenger", "~>2.0"
+gem "mocha", "~> 0.10.5", :require=>false
+gem "minitest", "~>4.2.0"
 
 group :development do
   gem "appraisal", ">= 1.0.0.beta2"

gemfiles/rails2.gemfile.lock

@@ -61,7 +61,8 @@ GEM
       rb-kqueue (>= 0.2)
     maruku (0.7.0)
     metaclass (0.0.4)
-    mocha (1.0.0)
+    minitest (4.2.0)
+    mocha (0.10.5)
       metaclass (~> 0.0.1)
     mongo (1.10.0)
       bson (~> 1.10.0)
@@ -96,11 +97,6 @@ GEM
       redis (~> 3.0.4)
     rubystats (0.2.3)
     safe_yaml (1.0.3)
-    shoulda (3.0.1)
-      shoulda-context (~> 1.0.0)
-      shoulda-matchers (~> 1.0.0)
-    shoulda-context (1.0.2)
-    shoulda-matchers (1.0.0)
     sqlite3 (1.3.9)
     thor (0.19.1)
     timecop (0.3.5)
@@ -125,7 +121,8 @@ DEPENDENCIES
   garb
   integration
   jekyll
-  mocha
+  minitest (~> 4.2.0)
+  mocha (~> 0.10.5)
   mongo
   passenger (~> 2.0)
   rack
@@ -134,7 +131,6 @@ DEPENDENCIES
   redis (>= 2.1)
   redis-namespace (>= 1.1.0)
   rubystats
-  shoulda
   sqlite3
   timecop
   vanity!

gemfiles/rails3.gemfile

@@ -13,10 +13,10 @@ gem "integration"
 gem "rubystats"
 gem "garb"
 gem "SystemTimer", "1.2.3", :platforms=>:mri_18
-gem "mocha", :require=>false
-gem "shoulda", :require=>false
 gem "timecop", :require=>false
 gem "webmock", :require=>false
+gem "mocha", "~> 0.12.8", :require=>false
+gem "minitest", "~>4.2.0"
 gem "rails", "3.0.11"
 gem "fastthread", :git=>"git://github.com/zoltankiss/fastthread.git", :platforms=>:mri_20
 gem "passenger", "~>3.0"

gemfiles/rails3.gemfile.lock

@@ -84,9 +84,10 @@ GEM
       treetop (~> 1.4.8)
     maruku (0.6.0)
       syntax (>= 1.0.0)
-    metaclass (0.0.1)
+    metaclass (0.0.4)
     mime-types (1.17.2)
-    mocha (0.10.5)
+    minitest (4.2.0)
+    mocha (0.12.10)
       metaclass (~> 0.0.1)
     mongo (1.6.0)
       bson (= 1.6.0)
@@ -123,11 +124,6 @@ GEM
     redis-namespace (1.3.2)
       redis (~> 3.0.4)
     rubystats (0.2.3)
-    shoulda (3.0.1)
-      shoulda-context (~> 1.0.0)
-      shoulda-matchers (~> 1.0.0)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.0.0)
     sqlite3 (1.3.8)
     syntax (1.0.0)
     thor (0.14.6)
@@ -155,7 +151,8 @@ DEPENDENCIES
   garb
   integration
   jekyll
-  mocha
+  minitest (~> 4.2.0)
+  mocha (~> 0.12.8)
   mongo
   passenger (~> 3.0)
   rack
@@ -164,7 +161,6 @@ DEPENDENCIES
   redis (>= 2.1)
   redis-namespace (>= 1.1.0)
   rubystats
-  shoulda
   sqlite3
   timecop
   vanity!

gemfiles/rails31.gemfile

@@ -13,10 +13,10 @@ gem "integration"
 gem "rubystats"
 gem "garb"
 gem "SystemTimer", "1.2.3", :platforms=>:mri_18
-gem "mocha", :require=>false
-gem "shoulda", :require=>false
 gem "timecop", :require=>false
 gem "webmock", :require=>false
+gem "mocha", "~>0.12.8", :require=>false
+gem "minitest", "~>4.2.0"
 gem "rails", "3.1.3"
 gem "fastthread", :git=>"git://github.com/zoltankiss/fastthread.git", :platforms=>:mri_20
 gem "passenger", "~>3.0"

gemfiles/rails31.gemfile.lock

@@ -83,9 +83,10 @@ GEM
       treetop (~> 1.4.8)
     maruku (0.6.0)
       syntax (>= 1.0.0)
-    metaclass (0.0.1)
+    metaclass (0.0.4)
     mime-types (1.17.2)
-    mocha (0.10.5)
+    minitest (4.2.0)
+    mocha (0.12.10)
       metaclass (~> 0.0.1)
     mongo (1.6.0)
       bson (= 1.6.0)
@@ -128,11 +129,6 @@ GEM
     redis-namespace (1.3.2)
       redis (~> 3.0.4)
     rubystats (0.2.3)
-    shoulda (3.0.1)
-      shoulda-context (~> 1.0.0)
-      shoulda-matchers (~> 1.0.0)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.0.0)
     sprockets (2.0.3)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -164,7 +160,8 @@ DEPENDENCIES
   garb
   integration
   jekyll
-  mocha
+  minitest (~> 4.2.0)
+  mocha (~> 0.12.8)
   mongo
   passenger (~> 3.0)
   rack
@@ -173,7 +170,6 @@ DEPENDENCIES
   redis (>= 2.1)
   redis-namespace (>= 1.1.0)
   rubystats
-  shoulda
   sqlite3
   timecop
   vanity!

gemfiles/rails32.gemfile

@@ -13,10 +13,10 @@ gem "integration"
 gem "rubystats"
 gem "garb"
 gem "SystemTimer", "1.2.3", :platforms=>:mri_18
-gem "mocha", :require=>false
-gem "shoulda", :require=>false
 gem "timecop", :require=>false
 gem "webmock", :require=>false
+gem "mocha", "~> 0.12.8", :require=>false
+gem "minitest", "~>4.2.0"
 gem "rails", "3.2.1"
 gem "fastthread", :git=>"git://github.com/zoltankiss/fastthread.git", :platforms=>:mri_20
 gem "passenger", "~>3.0"

gemfiles/rails32.gemfile.lock

@@ -84,9 +84,10 @@ GEM
       treetop (~> 1.4.8)
     maruku (0.6.0)
       syntax (>= 1.0.0)
-    metaclass (0.0.1)
+    metaclass (0.0.4)
     mime-types (1.17.2)
-    mocha (0.10.5)
+    minitest (4.2.0)
+    mocha (0.12.10)
       metaclass (~> 0.0.1)
     mongo (1.6.0)
       bson (= 1.6.0)
@@ -127,11 +128,6 @@ GEM
     redis-namespace (1.3.2)
       redis (~> 3.0.4)
     rubystats (0.2.3)
-    shoulda (3.0.1)
-      shoulda-context (~> 1.0.0)
-      shoulda-matchers (~> 1.0.0)
-    shoulda-context (1.0.0)
-    shoulda-matchers (1.0.0)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -164,7 +160,8 @@ DEPENDENCIES
   garb
   integration
   jekyll
-  mocha
+  minitest (~> 4.2.0)
+  mocha (~> 0.12.8)
   mongo
   passenger (~> 3.0)
   rack
@@ -173,7 +170,6 @@ DEPENDENCIES
   redis (>= 2.1)
   redis-namespace (>= 1.1.0)
   rubystats
-  shoulda
   sqlite3
   timecop
   vanity!

gemfiles/rails4.gemfile

@@ -13,10 +13,9 @@ gem "integration"
 gem "rubystats"
 gem "garb"
 gem "SystemTimer", "1.2.3", :platforms=>:mri_18
-gem "mocha", :require=>false
-gem "shoulda", :require=>false
 gem "timecop", :require=>false
 gem "webmock", :require=>false
+gem "mocha", "~> 1.0", :require=>false
 gem "rails", "4.0.0"
 gem "fastthread", :git=>"git://github.com/zoltankiss/fastthread.git", :platforms=>:mri_20
 gem "passenger", "~>3.0"

gemfiles/rails4.gemfile.lock

@@ -80,10 +80,10 @@ GEM
       treetop (~> 1.4.8)
     maruku (0.6.0)
       syntax (>= 1.0.0)
-    metaclass (0.0.1)
+    metaclass (0.0.4)
     mime-types (1.25)
     minitest (4.7.5)
-    mocha (0.14.0)
+    mocha (1.0.0)
       metaclass (~> 0.0.1)
     mongo (1.9.2)
       bson (~> 1.9.2)
@@ -117,12 +117,6 @@ GEM
       redis (~> 3.0.4)
     rubystats (0.2.3)
     safe_yaml (0.9.7)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.6)
-    shoulda-matchers (2.4.0)
-      activesupport (>= 3.0.0)
     sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -162,7 +156,8 @@ DEPENDENCIES
   garb
   integration
   jekyll
-  mocha
+  minitest (>= 4.2)
+  mocha (~> 1.0)
   mongo
   passenger (~> 3.0)
   rack
@@ -171,7 +166,6 @@ DEPENDENCIES
   redis (>= 2.1)
   redis-namespace (>= 1.1.0)
   rubystats
-  shoulda
   sqlite3
   timecop
   vanity!