minitest-rails 0.2 → 0.5

data/lib/minitest/rails/testing.rb

@@ -0,0 +1,39 @@
+require "rake/testtask"
+
+module MiniTest
+  module Rails
+    module Testing
+      mattr_accessor :default_tasks
+      mattr_accessor :task_opts
+
+      self.default_tasks = %w(models helpers controllers mailers integration)
+      self.task_opts = { "performance" => "-- --benchmark" }
+
+      def self.all_tasks
+        Dir["test/*/"].map {|dir| /test\/(.+?)\//.match(dir)[1] }.select do |dir|
+          !Dir.glob("test/#{dir}/**/*_test.rb").empty?
+        end
+      end
+
+      def self.run_tests directories
+        errors = directories.collect do |dir|
+          task = "minitest:#{dir}"
+          begin
+            if Rake::Task.task_defined? task
+              Rake::Task[task].invoke
+            end
+            nil
+          rescue => e
+            { :task => task, :exception => e }
+          end
+        end.compact
+
+        if errors.any?
+          puts errors.map { |e| "Errors running #{e[:task]}! #{e[:exception].inspect}" }.join("\n")
+          abort
+        end
+      end
+
+    end
+  end
+end

data/lib/minitest/rails/version.rb

@@ -0,0 +1,5 @@
+module MiniTest
+  module Rails
+    VERSION = "0.5"
+  end
+end

data/lib/minitest/rails.rb

@@ -2,53 +2,142 @@
 # so fixtures aren't loaded into that environment
 abort("Abort testing: Your Rails environment is running in production mode!") if Rails.env.production?
 
-require "minitest/rails/active_support"
-require "minitest/rails/action_controller"
-require "minitest/rails/action_view"
-require "minitest/rails/action_mailer" if defined? ActionMailer
-require "minitest/rails/action_dispatch"
+require "minitest/rails/test_case"
 
 # Enable turn if it is available
 begin
-  require 'turn/autorun'
+  require "turn/autorun"
 rescue LoadError
 end
 
-module MiniTest
-  module Rails
-    def self.override_testunit!
-      Kernel.silence_warnings do
-        ::ActiveSupport.const_set    :TestCase,        MiniTest::Rails::ActiveSupport::TestCase
-        ::ActionController.const_set :TestCase,        MiniTest::Rails::ActionController::TestCase
-        ::ActionView.const_set       :TestCase,        MiniTest::Rails::ActionView::TestCase
-        ::ActionMailer.const_set     :TestCase,        MiniTest::Rails::ActionMailer::TestCase if defined? ActionMailer
-        ::ActionDispatch.const_set   :IntegrationTest, MiniTest::Rails::ActionDispatch::IntegrationTest
+# Override the default ActiveSupport::TestCase to set the minitest dependency
+
+require "active_support/test_case"
+Kernel.silence_warnings do
+  ActiveSupport.const_set :TestCase, MiniTest::Rails::TestCase
+end
+
+# Add spec DSL integration
+
+if defined?(ActiveRecord::Base)
+  class ActiveSupport::TestCase
+    # Use AS::TestCase for the base class when describing a model
+    register_spec_type(self) do |desc|
+      desc < ActiveRecord::Base if desc.is_a?(Class)
+    end
+  end
+end
+
+require "action_controller/test_case"
+class ActionController::TestCase
+  # Use AC::TestCase for the base class when describing a controller
+  register_spec_type(self) do |desc|
+    Class === desc && desc < ActionController::Metal
+  end
+  register_spec_type(/Controller( ?Test)?\z/i, self)
+
+  # Resolve the controller from the test name when using the spec DSL
+  def self.determine_default_controller_class(name)
+    controller = determine_constant_from_test_name(name) do |constant|
+      Class === constant && constant < ActionController::Metal
+    end
+    raise NameError.new("Unable to resolve controller for #{name}") if controller.nil?
+    controller
+  end
+end
+
+require "action_view/test_case"
+class ActionView::TestCase
+  # Use AV::TestCase for the base class for helpers and views
+  register_spec_type(/(Helper( ?Test)?| View Test)\z/i, self)
+
+  # Resolve the helper or view from the test name when using the spec DSL
+  def self.determine_default_helper_class(name)
+    determine_constant_from_test_name(name) do |constant|
+      Module === constant
+    end
+  end
+end
+
+if defined? ActionMailer
+  require "action_mailer/test_helper"
+  require "action_mailer/test_case"
+  class ActionMailer::TestCase
+    # Use AM::TestCase for the base class when describing a mailer
+    register_spec_type(self) do |desc|
+      desc < ActionMailer::Base if desc.is_a?(Class)
+    end
+    register_spec_type(/Mailer( ?Test)?\z/i, self)
+
+    # Resolve the mailer from the test name when using the spec DSL
+    def self.determine_default_mailer(name)
+      mailer = determine_constant_from_test_name(name) do |constant|
+        Class === constant && constant < ::ActionMailer::Base
       end
+      raise ActionMailer::NonInferrableMailerError.new(name) if mailer.nil?
+      mailer
     end
   end
 end
 
+require "action_dispatch/testing/integration"
+class ActionDispatch::IntegrationTest
+  # Register by name, consider Acceptance to be deprecated
+  register_spec_type(/(Integration|Acceptance)( ?Test)?\z/i, self)
+end
+
+# Default wiring for the tests. This was originaly done in the helper.
+
+# Enable fixtures if appropriate
+
 if defined?(ActiveRecord::Base)
-  class MiniTest::Rails::ActiveSupport::TestCase
+  class ActiveSupport::TestCase
     include ActiveRecord::TestFixtures
     self.fixture_path = "#{Rails.root}/test/fixtures/"
   end
 
-  MiniTest::Rails::ActionDispatch::IntegrationTest.fixture_path = MiniTest::Rails::ActiveSupport::TestCase.fixture_path
+  ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
 
   def create_fixtures(*table_names, &block)
-    ActiveRecord::Fixtures.create_fixtures(MiniTest::Rails::ActiveSupport::TestCase.fixture_path, table_names, {}, &block)
+    ActiveRecord::Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, table_names, {}, &block)
   end
 end
 
-class MiniTest::Rails::ActionController::TestCase
+# Setup the routes
+
+class ActionController::TestCase
   setup do
     @routes = Rails.application.routes
   end
 end
 
-class MiniTest::Rails::ActionDispatch::IntegrationTest
+class ActionDispatch::IntegrationTest
   setup do
     @routes = Rails.application.routes
   end
 end
+
+# Deprecated, for backwards compatibility with older minitest-rails only
+
+module MiniTest
+  module Rails
+    def self.override_testunit!
+      # noop
+    end
+    module ActiveSupport
+      TestCase = ::ActiveSupport::TestCase
+    end
+    module ActionController
+      TestCase = ::ActionController::TestCase
+    end
+    module ActionView
+      TestCase = ::ActionView::TestCase
+    end
+    module ActionMailer
+      TestCase = ::ActionMailer::TestCase if defined? ::ActionMailer
+    end
+    module ActionDispatch
+      IntegrationTest = ::ActionDispatch::IntegrationTest
+    end
+  end
+end

data/lib/minitest-rails.rb

@@ -1,9 +1,9 @@
+require "minitest/rails/version"
 require "rails"
 require "minitest/unit"
 
 module MiniTest
   module Rails
-    VERSION = "0.2"
     class Railtie < ::Rails::Railtie
       if ::Rails.version.to_f >= 3.1
         config.app_generators.integration_tool :mini_test

data/minitest-rails.gemspec

@@ -2,44 +2,44 @@
 
 Gem::Specification.new do |s|
   s.name = "minitest-rails"
-  s.version = "0.2.20120919094008"
+  s.version = "0.5.20130110235401"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Moore"]
-  s.date = "2012-09-19"
-  s.description = "Adds MiniTest as the default testing library in Rails 3.x"
+  s.date = "2013-01-11"
+  s.description = "Adds MiniTest as the default testing library in Rails 3 and 4"
   s.email = ["mike@blowmage.com"]
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "Manifest.txt", "README.rdoc"]
-  s.files = [".autotest", ".gemtest", ".travis.yml", "CHANGELOG.rdoc", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "gemfiles/3.0.gemfile", "gemfiles/3.0.gemfile.lock", "gemfiles/3.1.gemfile", "gemfiles/3.1.gemfile.lock", "gemfiles/3.2.gemfile", "gemfiles/3.2.gemfile.lock", "gemfiles/minitest_tu_shim.rb", "lib/autotest/discover.rb", "lib/autotest/fixtures.rb", "lib/autotest/migrate.rb", "lib/autotest/minitest_rails.rb", "lib/generators/mini_test.rb", "lib/generators/mini_test/controller/controller_generator.rb", "lib/generators/mini_test/controller/templates/controller_spec.rb", "lib/generators/mini_test/controller/templates/controller_test.rb", "lib/generators/mini_test/helper/helper_generator.rb", "lib/generators/mini_test/helper/templates/helper_spec.rb", "lib/generators/mini_test/helper/templates/helper_test.rb", "lib/generators/mini_test/install/install_generator.rb", "lib/generators/mini_test/install/templates/test/minitest_helper.rb", "lib/generators/mini_test/integration/integration_generator.rb", "lib/generators/mini_test/integration/templates/integration_spec.rb", "lib/generators/mini_test/integration/templates/integration_test.rb", "lib/generators/mini_test/mailer/mailer_generator.rb", "lib/generators/mini_test/mailer/templates/mailer_spec.rb", "lib/generators/mini_test/mailer/templates/mailer_test.rb", "lib/generators/mini_test/model/model_generator.rb", "lib/generators/mini_test/model/templates/fixtures.yml", "lib/generators/mini_test/model/templates/model_spec.rb", "lib/generators/mini_test/model/templates/model_test.rb", "lib/generators/mini_test/scaffold/scaffold_generator.rb", "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/declarative.rb", "lib/minitest/rails/mochaing.rb", "lib/minitest/rails/tasks/minitest.rake", "lib/minitest/rails/tasks/sub_test_task.rb", "minitest-rails.gemspec", "test/generators/test_controller_generator.rb", "test/generators/test_helper_generator.rb", "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/rails/action_controller/test_controller_lookup.rb", "test/rails/action_controller/test_controllers.rb", "test/rails/action_controller/test_spec_type.rb", "test/rails/test_action_dispatch_spec_type.rb", "test/rails/test_action_mailer_spec_type.rb", "test/rails/test_action_view_spec_type.rb", "test/rails/test_active_support_spec_type.rb", "test/test_sanity.rb"]
+  s.files = [".autotest", ".gemtest", ".travis.yml", "CHANGELOG.rdoc", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "gemfiles/3.0.gemfile", "gemfiles/3.0.gemfile.lock", "gemfiles/3.1.gemfile", "gemfiles/3.1.gemfile.lock", "gemfiles/3.2.gemfile", "gemfiles/3.2.gemfile.lock", "gemfiles/4.0.gemfile", "gemfiles/4.0.gemfile.lock", "lib/autotest/discover.rb", "lib/autotest/fixtures.rb", "lib/autotest/migrate.rb", "lib/autotest/minitest_rails.rb", "lib/generators/mini_test.rb", "lib/generators/mini_test/controller/controller_generator.rb", "lib/generators/mini_test/controller/templates/controller_spec.rb", "lib/generators/mini_test/controller/templates/controller_test.rb", "lib/generators/mini_test/helper/helper_generator.rb", "lib/generators/mini_test/helper/templates/helper_spec.rb", "lib/generators/mini_test/helper/templates/helper_test.rb", "lib/generators/mini_test/install/install_generator.rb", "lib/generators/mini_test/install/templates/test/minitest_helper.rb", "lib/generators/mini_test/integration/integration_generator.rb", "lib/generators/mini_test/integration/templates/integration_spec.rb", "lib/generators/mini_test/integration/templates/integration_test.rb", "lib/generators/mini_test/mailer/mailer_generator.rb", "lib/generators/mini_test/mailer/templates/mailer_spec.rb", "lib/generators/mini_test/mailer/templates/mailer_test.rb", "lib/generators/mini_test/model/model_generator.rb", "lib/generators/mini_test/model/templates/fixtures.yml", "lib/generators/mini_test/model/templates/model_spec.rb", "lib/generators/mini_test/model/templates/model_test.rb", "lib/generators/mini_test/scaffold/scaffold_generator.rb", "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/constant_lookup.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", "tasks/test.rake", "test/generators/test_controller_generator.rb", "test/generators/test_helper_generator.rb", "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", "test/rails/action_mailer/test_mailers.rb", "test/rails/action_mailer/test_spec_type.rb", "test/rails/action_view/test_helpers.rb", "test/rails/action_view/test_spec_type.rb", "test/rails/active_support/test_spec_type.rb", "test/rails/test_constant_lookup.rb", "test/test_sanity.rb"]
   s.homepage = "http://blowmage.com/minitest-rails"
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "minitest-rails"
-  s.rubygems_version = "1.8.24"
-  s.summary = "MiniTest integration for Rails 3.x"
-  s.test_files = ["test/generators/test_controller_generator.rb", "test/generators/test_helper_generator.rb", "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/rails/action_controller/test_controller_lookup.rb", "test/rails/action_controller/test_controllers.rb", "test/rails/action_controller/test_spec_type.rb", "test/rails/test_action_dispatch_spec_type.rb", "test/rails/test_action_mailer_spec_type.rb", "test/rails/test_action_view_spec_type.rb", "test/rails/test_active_support_spec_type.rb", "test/test_sanity.rb"]
+  s.rubygems_version = "1.8.23"
+  s.summary = "MiniTest integration for Rails 3 and 4"
+  s.test_files = ["test/generators/test_controller_generator.rb", "test/generators/test_helper_generator.rb", "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/rails/action_controller/test_controllers.rb", "test/rails/action_controller/test_spec_type.rb", "test/rails/action_dispatch/test_spec_type.rb", "test/rails/action_mailer/test_mailers.rb", "test/rails/action_mailer/test_spec_type.rb", "test/rails/action_view/test_helpers.rb", "test/rails/action_view/test_spec_type.rb", "test/rails/active_support/test_spec_type.rb", "test/rails/test_constant_lookup.rb", "test/test_sanity.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<minitest>, ["~> 3.4"])
-      s.add_runtime_dependency(%q<rails>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<minitest>, ["~> 4.0"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
       s.add_development_dependency(%q<fakefs>, ["~> 0.4"])
-      s.add_development_dependency(%q<hoe>, ["~> 3.0"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.4"])
     else
-      s.add_dependency(%q<minitest>, ["~> 3.4"])
-      s.add_dependency(%q<rails>, ["~> 3.0"])
+      s.add_dependency(%q<minitest>, ["~> 4.0"])
+      s.add_dependency(%q<rails>, [">= 3.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.10"])
       s.add_dependency(%q<fakefs>, ["~> 0.4"])
-      s.add_dependency(%q<hoe>, ["~> 3.0"])
+      s.add_dependency(%q<hoe>, ["~> 3.4"])
     end
   else
-    s.add_dependency(%q<minitest>, ["~> 3.4"])
-    s.add_dependency(%q<rails>, ["~> 3.0"])
+    s.add_dependency(%q<minitest>, ["~> 4.0"])
+    s.add_dependency(%q<rails>, [">= 3.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.10"])
     s.add_dependency(%q<fakefs>, ["~> 0.4"])
-    s.add_dependency(%q<hoe>, ["~> 3.0"])
+    s.add_dependency(%q<hoe>, ["~> 3.4"])
   end
 end

data/tasks/gemfiles.rake

@@ -0,0 +1,24 @@
+namespace :gemfiles do
+  desc "Updates the gemfiles"
+  task :update do
+    `bundle --gemfile=gemfiles/3.0.gemfile`
+    `bundle --gemfile=gemfiles/3.1.gemfile`
+    `bundle --gemfile=gemfiles/3.2.gemfile`
+    `bundle --gemfile=gemfiles/4.0.gemfile`
+  end
+  desc "Clear the gemfile lock files"
+  task :clear do
+    `rm gemfiles/*.gemfile.lock`
+  end
+end
+
+# Building this in case it doesn't exist
+# /me shakes fist at travis-ci
+namespace :gem do
+  task :spec do
+  end
+end
+
+Rake::Task["gem:spec"].enhance do
+  Rake::Task["gemfiles:update"].invoke
+end

data/tasks/test.rake

@@ -0,0 +1,26 @@
+namespace :test do
+  desc "Run tests against the 3.0 gemfile"
+  task "3.0" do
+    ENV["BUNDLE_GEMFILE"] = "gemfiles/3.0.gemfile"
+    sh "bundle exec rake test"
+  end
+
+  desc "Run tests against the 3.1 gemfile"
+  task "3.1" do
+    ENV["BUNDLE_GEMFILE"] = "gemfiles/3.1.gemfile"
+    sh "bundle exec rake test"
+  end
+
+  desc "Run tests against the 3.2 gemfile"
+  task "3.2" do
+    ENV["BUNDLE_GEMFILE"] = "gemfiles/3.2.gemfile"
+    sh "bundle exec rake test"
+  end
+
+  desc "Run tests against the 4.0 gemfile"
+  task "4.0" do
+    ENV["BUNDLE_GEMFILE"] = "gemfiles/4.0.gemfile"
+    sh "bundle exec rake test"
+  end
+end
+

data/test/generators/test_controller_generator.rb

@@ -1,71 +1,42 @@
-require "minitest/autorun"
-require "minitest-rails"
-
-require "rails"
-require "rails/generators"
-
+require "helper"
 require "generators/mini_test/controller/controller_generator"
 
-require "fakefs/safe"
-
-class FakeFS::File
-  def self.binread file
-    File.open(file, "rb") { |f| f.read }
-  end
-end
-
-class TestControllerGenerator < MiniTest::Unit::TestCase
-  def setup
-    Rails::Generators.no_color!
-    FakeFS.activate!
-    FakeFS::FileSystem.clone "lib/generators"
-  end
-
-  def teardown
-    FakeFS::FileSystem.clear
-    FakeFS.deactivate!
-  end
+class TestControllerGenerator < GeneratorTest
 
   def test_controller_generator
-    out, err = capture_io do
+    assert_output(/create  test\/controllers\/user_controller_test.rb/m) do
       MiniTest::Generators::ControllerGenerator.start ["user"]
     end
-    assert_match(/create  test\/controllers\/user_controller_test.rb/m, out)
     assert File.exists? "test/controllers/user_controller_test.rb"
     contents = File.read "test/controllers/user_controller_test.rb"
     assert_match(/class UserControllerTest/m, contents)
   end
 
   def test_namespaced_controller_generator
-    out, err = capture_io do
+    assert_output(/create  test\/controllers\/admin\/user_controller_test.rb/m) do
       MiniTest::Generators::ControllerGenerator.start ["admin/user"]
     end
-    assert_match(/create  test\/controllers\/admin\/user_controller_test.rb/m, out)
     assert File.exists? "test/controllers/admin/user_controller_test.rb"
     contents = File.read "test/controllers/admin/user_controller_test.rb"
     assert_match(/class Admin::UserControllerTest/m, contents)
   end
 
   def test_controller_generator_spec
-    out, err = capture_io do
+    assert_output(/create  test\/controllers\/user_controller_test.rb/m) do
       MiniTest::Generators::ControllerGenerator.start ["user", "--spec"]
     end
-    assert_match(/create  test\/controllers\/user_controller_test.rb/m, out)
     assert File.exists? "test/controllers/user_controller_test.rb"
     contents = File.read "test/controllers/user_controller_test.rb"
     assert_match(/describe UserController do/m, contents)
   end
 
   def test_namespaced_controller_generator_spec
-    FakeFS do
-      out, err = capture_io do
-        MiniTest::Generators::ControllerGenerator.start ["admin/user", "--spec"]
-      end
-      assert_match(/create  test\/controllers\/admin\/user_controller_test.rb/m, out)
-      assert File.exists? "test/controllers/admin/user_controller_test.rb"
-      contents = File.read "test/controllers/admin/user_controller_test.rb"
-      assert_match(/describe Admin::UserController do/m, contents)
+    assert_output(/create  test\/controllers\/admin\/user_controller_test.rb/m) do
+      MiniTest::Generators::ControllerGenerator.start ["admin/user", "--spec"]
     end
+    assert File.exists? "test/controllers/admin/user_controller_test.rb"
+    contents = File.read "test/controllers/admin/user_controller_test.rb"
+    assert_match(/describe Admin::UserController do/m, contents)
   end
 
 end

data/test/generators/test_helper_generator.rb

@@ -1,66 +1,39 @@
-require "minitest/autorun"
-require "minitest-rails"
-
-require "rails"
-require "rails/generators"
-
+require "helper"
 require "generators/mini_test/helper/helper_generator"
 
-require "fakefs/safe"
-
-class FakeFS::File
-  def self.binread file
-    File.open(file, "rb") { |f| f.read }
-  end
-end
-
-class TestHelperGenerator < MiniTest::Unit::TestCase
-  def setup
-    Rails::Generators.no_color!
-    FakeFS.activate!
-    FakeFS::FileSystem.clone "lib/generators"
-  end
-
-  def teardown
-    FakeFS::FileSystem.clear
-    FakeFS.deactivate!
-  end
+class TestHelperGenerator < GeneratorTest
 
   def test_helper_generator
-    out, err = capture_io do
+    assert_output(/create  test\/helpers\/user_helper_test.rb/m) do
       MiniTest::Generators::HelperGenerator.start ["user"]
     end
-    assert_match(/create  test\/helpers\/user_helper_test.rb/m, out)
     assert File.exists? "test/helpers/user_helper_test.rb"
     contents = File.read "test/helpers/user_helper_test.rb"
-    assert_match(/class UserHelperTest < MiniTest::Rails::ActionView::TestCase/m, contents)
+    assert_match(/class UserHelperTest < ActionView::TestCase/m, contents)
   end
 
   def test_namespaced_helper_generator
-    out, err = capture_io do
+    assert_output(/create  test\/helpers\/admin\/user_helper_test.rb/m) do
       MiniTest::Generators::HelperGenerator.start ["admin/user"]
     end
-    assert_match(/create  test\/helpers\/admin\/user_helper_test.rb/m, out)
     assert File.exists? "test/helpers/admin/user_helper_test.rb"
     contents = File.read "test/helpers/admin/user_helper_test.rb"
-    assert_match(/class Admin::UserHelperTest < MiniTest::Rails::ActionView::TestCase/m, contents)
+    assert_match(/class Admin::UserHelperTest < ActionView::TestCase/m, contents)
   end
 
   def test_helper_generator_spec
-    out, err = capture_io do
+    assert_output(/create  test\/helpers\/user_helper_test.rb/m) do
       MiniTest::Generators::HelperGenerator.start ["user", "--spec"]
     end
-    assert_match(/create  test\/helpers\/user_helper_test.rb/m, out)
     assert File.exists? "test/helpers/user_helper_test.rb"
     contents = File.read "test/helpers/user_helper_test.rb"
     assert_match(/describe UserHelper do/m, contents)
   end
 
   def test_namespaced_helper_generator_spec
-    out, err = capture_io do
+    assert_output(/create  test\/helpers\/admin\/user_helper_test.rb/m) do
       MiniTest::Generators::HelperGenerator.start ["admin/user", "--spec"]
     end
-    assert_match(/create  test\/helpers\/admin\/user_helper_test.rb/m, out)
     assert File.exists? "test/helpers/admin/user_helper_test.rb"
     contents = File.read "test/helpers/admin/user_helper_test.rb"
     assert_match(/describe Admin::UserHelper do/m, contents)

data/test/generators/test_install_generator.rb

@@ -1,39 +1,16 @@
-require "minitest/autorun"
-require "minitest-rails"
-
-require "rails"
-require "rails/generators"
-
+require "helper"
 require "generators/mini_test/install/install_generator"
 
-require "fakefs/safe"
-
-class FakeFS::File
-  def self.binread file
-    File.open(file, "rb") { |f| f.read }
-  end
-end
-
-class TestInstallGenerator < MiniTest::Unit::TestCase
-  def setup
-    Rails::Generators.no_color!
-    FakeFS.activate!
-    FakeFS::FileSystem.clone "lib/generators"
-  end
-
-  def teardown
-    FakeFS::FileSystem.clear
-    FakeFS.deactivate!
-  end
+class TestInstallGenerator < GeneratorTest
 
   def test_install_generator
-    out, err = capture_io do
+    assert_output(/create  test\/minitest_helper.rb/m) do
       MiniTest::Generators::InstallGenerator.start
     end
-    assert_match(/create  test\/minitest_helper.rb/m, out)
     assert File.exists? "test/minitest_helper.rb"
     contents = File.read "test/minitest_helper.rb"
     assert_match(/require "minitest\/autorun"/m, contents)
     assert_match(/require "minitest\/rails"/m, contents)
   end
+
 end

data/test/generators/test_mailer_generator.rb

@@ -1,48 +1,24 @@
-require "minitest/autorun"
-require "minitest-rails"
-
-require "rails"
-require "rails/generators"
-
+require "helper"
 require "generators/mini_test/mailer/mailer_generator"
 
-require "fakefs/safe"
-
-class FakeFS::File
-  def self.binread file
-    File.open(file, "rb") { |f| f.read }
-  end
-end
-
-class TestMailerGenerator < MiniTest::Unit::TestCase
-  def setup
-    Rails::Generators.no_color!
-    FakeFS.activate!
-    FakeFS::FileSystem.clone "lib/generators"
-  end
-
-  def teardown
-    FakeFS::FileSystem.clear
-    FakeFS.deactivate!
-  end
+class TestMailerGenerator < GeneratorTest
 
   def test_mailer_generator
-    out, err = capture_io do
+    assert_output(/create  test\/mailers\/notification_test.rb/m) do
       MiniTest::Generators::MailerGenerator.start ["notification"]
     end
-    assert_match(/create  test\/mailers\/notification_test.rb/m, out)
     assert File.exists? "test/mailers/notification_test.rb"
     contents = File.read "test/mailers/notification_test.rb"
     assert_match(/class NotificationTest/m, contents)
   end
 
   def test_mailer_generator_spec
-    out, err = capture_io do
+    assert_output(/create  test\/mailers\/notification_test.rb/m) do
       MiniTest::Generators::MailerGenerator.start ["notification", "welcome", "--spec"]
     end
-    assert_match(/create  test\/mailers\/notification_test.rb/m, out)
     assert File.exists? "test/mailers/notification_test.rb"
     contents = File.read "test/mailers/notification_test.rb"
     assert_match(/describe Notification do/m, contents)
   end
+
 end