minitest-rails 0.3 → 0.5

data/.travis.yml

@@ -1,7 +1,8 @@
 ---
-before_script:
+before_install:
 - gem install hoe-travis --no-rdoc --no-ri
-- ruby gemfiles/minitest_tu_shim.rb
+- gem install bundler --pre --no-rdoc --no-ri
+before_script:
 - rake travis:before -t
 language: ruby
 notifications:
@@ -14,4 +15,5 @@ gemfile:
 - gemfiles/3.0.gemfile
 - gemfiles/3.1.gemfile
 - gemfiles/3.2.gemfile
+- gemfiles/4.0.gemfile
 script: rake travis

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Mike Moore
+Copyright (c) 2013 Mike Moore
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Manifest.txt

@@ -12,7 +12,8 @@ gemfiles/3.1.gemfile
 gemfiles/3.1.gemfile.lock
 gemfiles/3.2.gemfile
 gemfiles/3.2.gemfile.lock
-gemfiles/minitest_tu_shim.rb
+gemfiles/4.0.gemfile
+gemfiles/4.0.gemfile.lock
 lib/autotest/discover.rb
 lib/autotest/fixtures.rb
 lib/autotest/migrate.rb
@@ -41,16 +42,11 @@ lib/generators/mini_test/scaffold/templates/controller_spec.rb
 lib/generators/mini_test/scaffold/templates/controller_test.rb
 lib/minitest-rails.rb
 lib/minitest/rails.rb
-lib/minitest/rails/action_controller.rb
-lib/minitest/rails/action_dispatch.rb
-lib/minitest/rails/action_mailer.rb
-lib/minitest/rails/action_view.rb
-lib/minitest/rails/active_support.rb
 lib/minitest/rails/constant_lookup.rb
-lib/minitest/rails/declarative.rb
-lib/minitest/rails/mochaing.rb
 lib/minitest/rails/tasks/minitest.rake
 lib/minitest/rails/tasks/sub_test_task.rb
+lib/minitest/rails/test_case.rb
+lib/minitest/rails/testing.rb
 lib/minitest/rails/version.rb
 minitest-rails.gemspec
 tasks/gemfiles.rake
@@ -61,6 +57,7 @@ test/generators/test_install_generator.rb
 test/generators/test_mailer_generator.rb
 test/generators/test_model_generator.rb
 test/generators/test_scaffold_generator.rb
+test/helper.rb
 test/rails/action_controller/test_controllers.rb
 test/rails/action_controller/test_spec_type.rb
 test/rails/action_dispatch/test_spec_type.rb

data/README.rdoc

@@ -1,8 +1,9 @@
 = minitest-rails
 
-MiniTest integration for Rails 3.x
+MiniTest integration for Rails 3 and 4
 
-{<img src="https://secure.travis-ci.org/blowmage/minitest-rails.png" alt="Build Status" />}[http://travis-ci.org/blowmage/minitest-rails]
+{<img src="https://secure.travis-ci.org/blowmage/minitest-rails.png" alt="Build Status" />}[http://travis-ci.org/blowmage/minitest-rails]<br>
+{<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/blowmage/minitest-rails]
 
 == Install
 
@@ -32,15 +33,13 @@ This will add the <tt>minitest_helper.rb</tt> file to the <tt>test</tt> director
 
 == Usage
 
-We aim to expose MiniTest with minimal changes for testing within Rails.
-Because of this, we allow Test::Unit and MiniTest tests to live side by side.
-Your test classes will inherit from MiniTest::Rails::ActiveSupport::TestCase a opposed to ActiveSupport::TestCase.
-You can use the MiniTest::Spec DSL.
+This project aims to enable MiniTest within the Rails TestCase classes.
+Your test will continue to inherit from <tt>ActiveSupport::TestCase</tt>, which will now support the spec DSL.
 You can generate test files with the standard model, controller, resource, and other generators:
 
     rails generate model User
 
-And you can specify generating the tests using the MiniTest::Spec DSL on any of the generators by providing the <tt>--spec</tt> option:
+And you can specify generating the tests using the <tt>MiniTest::Spec</tt> DSL on any of the generators by providing the <tt>--spec</tt> option:
 
     rails generate model User --spec
 
@@ -54,32 +53,15 @@ You can also set these as defaults by adding the following to the <tt>config/app
       g.test_framework :mini_test, :spec => true, :fixture => false
     end
 
-== Overriding Test::Unit
-
-Of course, you may not want to maintain separate Test::Unit and MiniTest tests.
-If this is the behavior you are wanting, simply add the following to your <tt>test_helper.rb</tt> file:
-
-    require "minitest/rails"
-    MiniTest::Rails.override_testunit!
-
 == Capybara
 
-You can use Capybara in your acceptance/integration tests by adding <tt>minitest-rails-capybara</tt> as a dependency.
-
-    group :test, :development do
-      gem 'minitest-rails'
-      gem 'minitest-rails-capybara'
-    end
-
-And add the following to your test helper file:
-
-    require "minitest/rails/capybara"
-
-See the <tt>minitest-rails-capybara</tt> project for more information.
+You can use Capybara for feature tests by adding <tt>minitest-rails-capybara</tt> as a dependency. See the README for more information: https://github.com/blowmage/minitest-rails-capybara
 
 == Incompatibilities
 
-Existing tests that call <tt>describe</tt> will not work, since <tt>describe</tt> is used by MiniTest::Spec blocks.
+Efforts have been made to be compatible with Ruby 1.8.7, but some rough edges may remain. You have been warned.
+
+Existing tests that call <tt>describe</tt> will not work, since <tt>describe</tt> is used by <tt>MiniTest::Spec</tt> blocks.
 
 == Get Involved
 
@@ -89,7 +71,7 @@ https://groups.google.com/group/minitest-rails
 
 == License
 
-Copyright (c) 2012 Mike Moore
+Copyright (c) 2013 Mike Moore
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -11,8 +11,8 @@ Hoe.plugins.delete :rubyforge
 Hoe.spec 'minitest-rails' do
   developer 'Mike Moore', 'mike@blowmage.com'
 
-  self.summary     = 'MiniTest integration for Rails 3.x'
-  self.description = 'Adds MiniTest as the default testing library in Rails 3.x'
+  self.summary     = 'MiniTest integration for Rails 3 and 4'
+  self.description = 'Adds MiniTest as the default testing library in Rails 3 and 4'
   self.urls        = ['http://blowmage.com/minitest-rails']
 
   self.history_file = "CHANGELOG.rdoc"
@@ -20,7 +20,7 @@ Hoe.spec 'minitest-rails' do
   self.testlib      = :minitest
 
   dependency 'minitest',  '~> 4.0'
-  dependency 'rails',     '~> 3.0'
+  dependency 'rails',     '>= 3.0'
   dependency 'fakefs',    '~> 0.4', :dev
 end
 

data/gemfiles/3.0.gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "rails", "~> 3.0.15"
+gem "rails", "~> 3.0.19"
 gem "rdoc", "~> 3.10"
 gem "hoe", "~> 3.0"
 gem "fakefs", "~> 0.4"

data/gemfiles/3.0.gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: /Users/blowmage/codez/minitest-rails
   specs:
-    minitest-rails (0.3.20121102170159)
+    minitest-rails (0.5.20130110235401)
       minitest (~> 4.0)
-      rails (~> 3.0)
+      rails (>= 3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.17)
-      actionpack (= 3.0.17)
+    actionmailer (3.0.19)
+      actionpack (= 3.0.19)
       mail (~> 2.2.19)
-    actionpack (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
+    actionpack (3.0.19)
+      activemodel (= 3.0.19)
+      activesupport (= 3.0.19)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -22,63 +22,63 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.17)
-      activesupport (= 3.0.17)
+    activemodel (3.0.19)
+      activesupport (= 3.0.19)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
+    activerecord (3.0.19)
+      activemodel (= 3.0.19)
+      activesupport (= 3.0.19)
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.17)
-      activemodel (= 3.0.17)
-      activesupport (= 3.0.17)
-    activesupport (3.0.17)
+    activeresource (3.0.19)
+      activemodel (= 3.0.19)
+      activesupport (= 3.0.19)
+    activesupport (3.0.19)
     arel (2.0.10)
     builder (2.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    fakefs (0.4.0)
-    hoe (3.1.0)
-      rake (~> 0.8)
+    fakefs (0.4.2)
+    hoe (3.4.0)
+      rake (>= 0.8, < 11.0)
     i18n (0.5.0)
-    json (1.7.5)
+    json (1.7.6)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    minitest (4.1.0)
+    minitest (4.4.0)
     polyglot (0.3.3)
-    rack (1.2.5)
+    rack (1.2.6)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.17)
-      actionmailer (= 3.0.17)
-      actionpack (= 3.0.17)
-      activerecord (= 3.0.17)
-      activeresource (= 3.0.17)
-      activesupport (= 3.0.17)
+    rails (3.0.19)
+      actionmailer (= 3.0.19)
+      actionpack (= 3.0.19)
+      activerecord (= 3.0.19)
+      activeresource (= 3.0.19)
+      activesupport (= 3.0.19)
       bundler (~> 1.0)
-      railties (= 3.0.17)
-    railties (3.0.17)
-      actionpack (= 3.0.17)
-      activesupport (= 3.0.17)
+      railties (= 3.0.19)
+    railties (3.0.19)
+      actionpack (= 3.0.19)
+      activesupport (= 3.0.19)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
     thor (0.14.6)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.34)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
@@ -87,5 +87,5 @@ DEPENDENCIES
   fakefs (~> 0.4)
   hoe (~> 3.0)
   minitest-rails!
-  rails (~> 3.0.15)
+  rails (~> 3.0.19)
   rdoc (~> 3.10)

data/gemfiles/3.1.gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "rails", "~> 3.1.6"
+gem "rails", "~> 3.1.10"
 gem "rdoc", "~> 3.10"
 gem "hoe", "~> 3.0"
 gem "fakefs", "~> 0.4"

data/gemfiles/3.1.gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: /Users/blowmage/codez/minitest-rails
   specs:
-    minitest-rails (0.3.20121102170159)
+    minitest-rails (0.5.20130110235401)
       minitest (~> 4.0)
-      rails (~> 3.0)
+      rails (>= 3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.8)
-      actionpack (= 3.1.8)
+    actionmailer (3.1.10)
+      actionpack (= 3.1.10)
       mail (~> 2.3.3)
-    actionpack (3.1.8)
-      activemodel (= 3.1.8)
-      activesupport (= 3.1.8)
+    actionpack (3.1.10)
+      activemodel (= 3.1.10)
+      activesupport (= 3.1.10)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
@@ -22,38 +22,38 @@ GEM
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.0.4)
-    activemodel (3.1.8)
-      activesupport (= 3.1.8)
+    activemodel (3.1.10)
+      activesupport (= 3.1.10)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.8)
-      activemodel (= 3.1.8)
-      activesupport (= 3.1.8)
+    activerecord (3.1.10)
+      activemodel (= 3.1.10)
+      activesupport (= 3.1.10)
       arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.8)
-      activemodel (= 3.1.8)
-      activesupport (= 3.1.8)
-    activesupport (3.1.8)
+    activeresource (3.1.10)
+      activemodel (= 3.1.10)
+      activesupport (= 3.1.10)
+    activesupport (3.1.10)
       multi_json (>= 1.0, < 1.3)
     arel (2.2.3)
     builder (3.0.4)
     erubis (2.7.0)
-    fakefs (0.4.0)
+    fakefs (0.4.2)
     hike (1.2.1)
-    hoe (3.1.0)
-      rake (~> 0.8)
+    hoe (3.4.0)
+      rake (>= 0.8, < 11.0)
     i18n (0.6.1)
-    json (1.7.5)
+    json (1.7.6)
     mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    minitest (4.1.0)
+    minitest (4.4.0)
     multi_json (1.2.0)
     polyglot (0.3.3)
-    rack (1.3.6)
+    rack (1.3.8)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -62,22 +62,22 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.1.8)
-      actionmailer (= 3.1.8)
-      actionpack (= 3.1.8)
-      activerecord (= 3.1.8)
-      activeresource (= 3.1.8)
-      activesupport (= 3.1.8)
+    rails (3.1.10)
+      actionmailer (= 3.1.10)
+      actionpack (= 3.1.10)
+      activerecord (= 3.1.10)
+      activeresource (= 3.1.10)
+      activesupport (= 3.1.10)
       bundler (~> 1.0)
-      railties (= 3.1.8)
-    railties (3.1.8)
-      actionpack (= 3.1.8)
-      activesupport (= 3.1.8)
+      railties (= 3.1.10)
+    railties (3.1.10)
+      actionpack (= 3.1.10)
+      activesupport (= 3.1.10)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
     sprockets (2.0.4)
@@ -89,7 +89,7 @@ GEM
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.34)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
@@ -98,5 +98,5 @@ DEPENDENCIES
   fakefs (~> 0.4)
   hoe (~> 3.0)
   minitest-rails!
-  rails (~> 3.1.6)
+  rails (~> 3.1.10)
   rdoc (~> 3.10)

data/gemfiles/3.2.gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gem "rails", "~> 3.2.6"
+gem "rails", "~> 3.2.11"
 gem "rdoc", "~> 3.10"
 gem "hoe", "~> 3.0"
 gem "fakefs", "~> 0.4"

data/gemfiles/3.2.gemfile.lock

@@ -1,85 +1,86 @@
 PATH
   remote: /Users/blowmage/codez/minitest-rails
   specs:
-    minitest-rails (0.3.20121102170159)
+    minitest-rails (0.5.20130110235401)
       minitest (~> 4.0)
-      rails (~> 3.0)
+      rails (>= 3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
+    actionmailer (3.2.11)
+      actionpack (= 3.2.11)
       mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
+    activeresource (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
     builder (3.0.4)
     erubis (2.7.0)
-    fakefs (0.4.0)
+    fakefs (0.4.2)
     hike (1.2.1)
-    hoe (3.1.0)
-      rake (~> 0.8)
+    hoe (3.4.0)
+      rake (>= 0.8, < 11.0)
     i18n (0.6.1)
     journey (1.0.4)
-    json (1.7.5)
+    json (1.7.6)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    minitest (4.1.0)
-    multi_json (1.3.7)
+    minitest (4.4.0)
+    multi_json (1.5.0)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.3)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    rails (3.2.11)
+      actionmailer (= 3.2.11)
+      actionpack (= 3.2.11)
+      activerecord (= 3.2.11)
+      activeresource (= 3.2.11)
+      activesupport (= 3.2.11)
       bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+      railties (= 3.2.11)
+    railties (3.2.11)
+      actionpack (= 3.2.11)
+      activesupport (= 3.2.11)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rdoc (3.12)
       json (~> 1.4)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     thor (0.16.0)
@@ -87,7 +88,7 @@ GEM
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.34)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby
@@ -96,5 +97,5 @@ DEPENDENCIES
   fakefs (~> 0.4)
   hoe (~> 3.0)
   minitest-rails!
-  rails (~> 3.2.6)
+  rails (~> 3.2.11)
   rdoc (~> 3.10)