Merge pull request #208 from assaf/feature/minitest3

Use minitest consistently

.travis.yml

@@ -13,36 +13,36 @@ env:
 - DB=redis
 - DB=active_record
 gemfile:
-  - Gemfile
+  - gemfiles/rails2.gemfile
   - gemfiles/rails3.gemfile
   - gemfiles/rails31.gemfile
   - gemfiles/rails32.gemfile
   - gemfiles/rails4.gemfile
 before_script:
 - 'echo ''gem: --no-ri --no-rdoc'' > ~/.gemrc' # skip installing docs for gems
-- if [[ "`basename $BUNDLE_GEMFILE`" == "Gemfile" ]]; then rvm rubygems 1.8.25; fi # Rubygems 2.0.x fails with Rails 2.3
+- if [[ "`basename $BUNDLE_GEMFILE`" == "gemfiles/rails2.gemfile" ]]; then rvm rubygems 1.8.25; fi # Rubygems 2.0.x fails with Rails 2.3
 matrix:
   exclude:
     # Rails 2 is not officially supported on Ruby 1.9.3
     - rvm: 1.9.3
       env: DB=mongodb
-      gemfile: Gemfile
+      gemfile: gemfiles/rails2.gemfile
     - rvm: 1.9.3
       env: DB=redis
-      gemfile: Gemfile
+      gemfile: gemfiles/rails2.gemfile
     - rvm: 1.9.3
       env: DB=active_record
-      gemfile: Gemfile
+      gemfile: gemfiles/rails2.gemfile
     # Rails <= 3.2 is not officially supported on Ruby 2.0.0
     - rvm: 2.0.0
       env: DB=mongodb
-      gemfile: Gemfile
+      gemfile: gemfiles/rails2.gemfile
     - rvm: 2.0.0
       env: DB=redis
-      gemfile: Gemfile
+      gemfile: gemfiles/rails2.gemfile
     - rvm: 2.0.0
       env: DB=active_record
-      gemfile: Gemfile
+      gemfile: gemfiles/rails2.gemfile
     - rvm: 2.0.0
       env: DB=mongodb
       gemfile: gemfiles/rails3.gemfile

Appraisals

@@ -1,22 +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

@@ -3,10 +3,6 @@ gemspec
 
 # Frameworks
 gem "rack"
-gem "rails", "~>2.3.8"
-
-# Servers
-gem "passenger", "~>2.0"
 
 # Persistence
 gem "redis", ">= 2.1"
@@ -27,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

@@ -8,15 +8,6 @@ GEM
   specs:
     RedCloth (4.2.9)
     SystemTimer (1.2.3)
-    actionmailer (2.3.14)
-      actionpack (= 2.3.14)
-    actionpack (2.3.14)
-      activesupport (= 2.3.14)
-      rack (~> 1.1.0)
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activeresource (2.3.14)
-      activesupport (= 2.3.14)
     activesupport (2.3.14)
     addressable (2.2.7)
     albino (1.3.3)
@@ -34,7 +25,6 @@ GEM
     crack (0.3.1)
     directory_watcher (1.4.1)
     fast-stemmer (1.0.0)
-    fastthread (1.0.7)
     garb (0.9.1)
       activesupport (>= 2.2.0)
       crack (>= 0.1.6)
@@ -50,34 +40,16 @@ 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)
-    passenger (2.2.15)
-      fastthread (>= 1.0.1)
-      rack
-      rake (>= 0.8.1)
     posix-spawn (0.3.6)
     rack (1.1.3)
-    rails (2.3.14)
-      actionmailer (= 2.3.14)
-      actionpack (= 2.3.14)
-      activerecord (= 2.3.14)
-      activeresource (= 2.3.14)
-      activesupport (= 2.3.14)
-      rake (>= 0.8.3)
     rake (10.1.0)
     redis (3.0.6)
     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)
@@ -100,16 +72,13 @@ DEPENDENCIES
   garb
   integration
   jekyll
-  mocha
+  minitest (>= 4.2)
   mongo
-  passenger (~> 2.0)
   rack
-  rails (~> 2.3.8)
   rake
   redis (>= 2.1)
   redis-namespace (>= 1.1.0)
   rubystats
-  shoulda
   sqlite3
   timecop
   vanity!

Rakefile

@@ -64,21 +64,15 @@ task "test:adapters", :adapter do |t, args|
 end
 
 # Run the test suit.
+Rake::TestTask.new(:test) do |task|
+  task.libs << "lib"
+  task.libs << "test"
+  task.pattern = "test/**/*_test.rb"
+  task.verbose = false
+end
 
 task :default=>:test
 desc "Run all tests"
-Rake::TestTask.new do |task|
-  task.test_files = FileList['test/**/*_test.rb']
-  if Rake.application.options.trace
-    #task.warning = true
-    task.verbose = true
-  elsif Rake.application.options.silent
-    task.ruby_opts << "-W0"
-  else
-    task.verbose = true
-  end
-    task.ruby_opts << "-I."
-end
 
 task(:clobber) { rm_rf "tmp" }
 

gemfiles/rails2.gemfile

@@ -0,0 +1,31 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rack"
+gem "redis", ">= 2.1"
+gem "redis-namespace", ">= 1.1.0"
+gem "bson_ext"
+gem "mongo"
+gem "sqlite3"
+gem "backports", :platforms=>:mri_18
+gem "integration"
+gem "rubystats"
+gem "garb"
+gem "SystemTimer", "1.2.3", :platforms=>:mri_18
+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"
+  gem "jekyll"
+  gem "rake"
+  gem "RedCloth"
+  gem "yard"
+end
+
+gemspec :path=>".././"

gemfiles/rails2.gemfile.lock

@@ -0,0 +1,138 @@
+PATH
+  remote: .././
+  specs:
+    vanity (1.9.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    RedCloth (4.2.9)
+    SystemTimer (1.2.3)
+    actionmailer (2.3.18)
+      actionpack (= 2.3.18)
+    actionpack (2.3.18)
+      activesupport (= 2.3.18)
+      rack (~> 1.1.0)
+    activerecord (2.3.18)
+      activesupport (= 2.3.18)
+    activeresource (2.3.18)
+      activesupport (= 2.3.18)
+    activesupport (2.3.18)
+    addressable (2.3.6)
+    appraisal (1.0.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    backports (3.6.0)
+    blankslate (2.1.2.4)
+    bson (1.10.0)
+    bson_ext (1.10.0)
+      bson (~> 1.10.0)
+    classifier (1.3.4)
+      fast-stemmer (>= 1.0.0)
+    colorator (0.1)
+    commander (4.1.6)
+      highline (~> 1.6.11)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    fast-stemmer (1.0.2)
+    fastthread (1.0.7)
+    ffi (1.9.3)
+    garb (0.9.1)
+      activesupport (>= 2.2)
+      multi_json (>= 1.3)
+    highline (1.6.21)
+    integration (0.1.0)
+    jekyll (1.5.1)
+      classifier (~> 1.3)
+      colorator (~> 0.1)
+      commander (~> 4.1.3)
+      liquid (~> 2.5.5)
+      listen (~> 1.3)
+      maruku (= 0.7.0)
+      pygments.rb (~> 0.5.0)
+      redcarpet (~> 2.3.0)
+      safe_yaml (~> 1.0)
+      toml (~> 0.1.0)
+    liquid (2.5.5)
+    listen (1.3.1)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    maruku (0.7.0)
+    metaclass (0.0.4)
+    minitest (4.2.0)
+    mocha (0.10.5)
+      metaclass (~> 0.0.1)
+    mongo (1.10.0)
+      bson (~> 1.10.0)
+    multi_json (1.9.3)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
+    passenger (2.2.15)
+      fastthread (>= 1.0.1)
+      rack
+      rake (>= 0.8.1)
+    posix-spawn (0.3.8)
+    pygments.rb (0.5.4)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.1.0)
+    rack (1.1.6)
+    rails (2.3.18)
+      actionmailer (= 2.3.18)
+      actionpack (= 2.3.18)
+      activerecord (= 2.3.18)
+      activeresource (= 2.3.18)
+      activesupport (= 2.3.18)
+      rake (>= 0.8.3)
+    rake (10.1.0)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.4)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.2)
+      ffi (>= 0.5.0)
+    redcarpet (2.3.0)
+    redis (3.0.7)
+    redis-namespace (1.4.1)
+      redis (~> 3.0.4)
+    rubystats (0.2.3)
+    safe_yaml (1.0.3)
+    sqlite3 (1.3.9)
+    thor (0.19.1)
+    timecop (0.3.5)
+    toml (0.1.1)
+      parslet (~> 1.5.0)
+    webmock (1.17.4)
+      addressable (>= 2.2.7)
+      crack (>= 0.3.2)
+    yajl-ruby (1.1.0)
+    yard (0.8.7.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  RedCloth
+  SystemTimer (= 1.2.3)
+  appraisal (>= 1.0.0.beta2)
+  backports
+  bson_ext
+  bundler (>= 1.0.0)
+  garb
+  integration
+  jekyll
+  minitest (~> 4.2.0)
+  mocha (~> 0.10.5)
+  mongo
+  passenger (~> 2.0)
+  rack
+  rails (~> 2.3.8)
+  rake
+  redis (>= 2.1)
+  redis-namespace (>= 1.1.0)
+  rubystats
+  sqlite3
+  timecop
+  vanity!
+  webmock
+  yard

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"