minitest-rails 0.0.7 → 0.1

data/lib/minitest/rails/action_mailer.rb

@@ -0,0 +1,17 @@
+require "minitest/rails/active_support"
+require "action_mailer/test_case"
+
+module MiniTest
+  module Rails
+    module ActionMailer
+      class TestCase < MiniTest::Rails::ActiveSupport::TestCase
+        # Use AM::TestCase for the base class when describing a mailer
+        register_spec_type(self) do |desc|
+          desc < ::ActionMailer::Base
+        end
+
+        include ::ActionMailer::TestCase::Behavior
+      end
+    end
+  end
+end

data/lib/minitest/rails/action_view.rb

@@ -0,0 +1,18 @@
+require "minitest/rails/active_support"
+require "action_view/test_case"
+
+module MiniTest
+  module Rails
+    module ActionView
+      class TestCase < MiniTest::Rails::ActiveSupport::TestCase
+        TestController = ::ActionView::TestCase::TestController
+        include ::ActionView::TestCase::Behavior
+      end
+    end
+  end
+end
+
+# Register by name, because Helpers are just modules
+MiniTest::Spec.register_spec_type(/Helper$/,      MiniTest::Rails::ActionView::TestCase)
+MiniTest::Spec.register_spec_type(/HelperTest$/,  MiniTest::Rails::ActionView::TestCase)
+MiniTest::Spec.register_spec_type(/Helper Test$/, MiniTest::Rails::ActionView::TestCase)

data/lib/minitest/rails/active_support.rb

@@ -0,0 +1,68 @@
+require 'minitest/spec'
+require 'active_support/testing/setup_and_teardown'
+require 'active_support/testing/assertions'
+require 'active_support/testing/deprecation'
+require 'active_support/testing/declarative'
+require 'active_support/testing/pending'
+require 'active_support/testing/isolation'
+require 'active_support/testing/mochaing'
+require 'active_support/core_ext/kernel/reporting'
+
+module MiniTest
+  module Rails
+    module ActiveSupport
+      class TestCase < ::MiniTest::Spec
+
+        # This is deprecated, but I don't want to change the Rails calls to it.
+        # Keep it here for now, until a better way presents itself...
+        def assert_block msg = nil
+          msg = message(msg) { "Expected block to return true value" }
+          assert yield, msg
+        end
+
+        if defined?(ActiveRecord::Base)
+          # Use AS::TestCase for the base class when describing a model
+          register_spec_type(self) do |desc|
+            desc < ActiveRecord::Base
+          end
+        end
+
+        # For backward compatibility with Test::Unit
+        def build_message(message, template = nil, *args)
+          template = template.gsub('<?>', '<%s>')
+          message || sprintf(template, *args)
+        end
+
+        Assertion = ::MiniTest::Assertion
+        alias_method :method_name, :name if method_defined? :name
+        alias_method :method_name, :__name__ if method_defined? :__name__
+
+        $tags = {}
+        def self.for_tag(tag)
+          yield if $tags[tag]
+        end
+
+        def describe(*args, &block)
+          Kernel.describe(args, block)
+        end
+
+        include ::ActiveSupport::Testing::SetupAndTeardown
+        include ::ActiveSupport::Testing::Assertions
+        include ::ActiveSupport::Testing::Deprecation
+        include ::ActiveSupport::Testing::Pending
+        extend  ::ActiveSupport::Testing::Declarative
+
+        # test/unit backwards compatibility methods
+        alias :assert_raise :assert_raises
+        alias :assert_not_nil :refute_nil
+        alias :assert_not_equal :refute_equal
+        alias :assert_no_match :refute_match
+        alias :assert_not_same :refute_same
+
+        def assert_nothing_raised(*args)
+          yield
+        end
+      end
+    end
+  end
+end

data/lib/minitest/rails/tasks/minitest.rake

@@ -1,29 +1,46 @@
 require 'rake/testtask'
+require 'rails/test_unit/sub_test_task'
 
-MINITEST_TASKS = %w(models controllers helpers mailers) #views integration
+TASKS = %w(models controllers helpers mailers acceptance) #views
+MINITEST_TASKS = TASKS.map { |sub| "minitest:#{sub}" }
 
-desc 'Runs all tests'
+desc "Runs minitest"
 task :test do
-  errors = MINITEST_TASKS.collect do |task|
-    begin
-      Rake::Task["test:#{task}"].invoke
-      nil
-    rescue => e
-      task
-    end
-  end.compact
-  abort "Errors running #{errors * ', '}!" if errors.any?
+  Rake::Task['minitest'].invoke
+end
+
+desc "Runs #{MINITEST_TASKS.join(", ")} together"
+task :minitest do
+  Rake::Task['minitest:run'].invoke
 end
 
-namespace :test do
+namespace 'minitest' do
+
   task :prepare do
     # Placeholder task for other Railtie and plugins to enhance. See Active Record for an example.
   end
 
-  MINITEST_TASKS.each do |sub|
-    Rake::TestTask.new(sub => 'test:prepare') do |t|
-      t.libs << 'test'
+  task :run do
+    errors = MINITEST_TASKS.collect do |task|
+      begin
+        Rake::Task[task].invoke
+        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
+
+  TASKS.each do |sub|
+    Rails::SubTestTask.new(sub => 'minitest:prepare') do |t|
+      t.libs.push 'test'
       t.pattern = "test/#{sub}/**/*_test.rb"
     end
   end
+
 end

data/lib/minitest/rails.rb

@@ -1,5 +1,54 @@
-require "minitest/rails/model"
-require "minitest/rails/controller"
-require "minitest/rails/helper"
-require "minitest/rails/mailer"
-require "minitest/rails/fixtures" if defined?(ActiveRecord::Base)
+# Make double-sure the RAILS_ENV is not set to production,
+# 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"
+require "minitest/rails/action_dispatch"
+
+# Enable turn if it is available
+begin
+  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
+        ::ActionDispatch.const_set   :IntegrationTest, MiniTest::Rails::ActionDispatch::IntegrationTest
+      end
+    end
+  end
+end
+
+if defined?(ActiveRecord::Base)
+  class MiniTest::Rails::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
+
+  def create_fixtures(*table_names, &block)
+    ActiveRecord::Fixtures.create_fixtures(MiniTest::Rails::ActiveSupport::TestCase.fixture_path, table_names, {}, &block)
+  end
+end
+
+class MiniTest::Rails::ActionController::TestCase
+  setup do
+    @routes = Rails.application.routes
+  end
+end
+
+class MiniTest::Rails::ActionDispatch::IntegrationTest
+  setup do
+    @routes = Rails.application.routes
+  end
+end

data/lib/minitest-rails.rb

@@ -1,13 +1,19 @@
 require "rails"
 require "minitest/unit"
 
-module Minitest
+module MiniTest
   module Rails
-    VERSION = "0.0.7"
+    VERSION = "0.1"
     class Railtie < ::Rails::Railtie
-      # config.app_generators.integration_tool :minitest
-      config.app_generators.test_framework :minitest
-      config.app_generators.fallbacks[:minitest] = :test_unit
+      if ::Rails.version.to_f >= 3.1
+        config.app_generators.integration_tool :mini_test
+        config.app_generators.test_framework   :mini_test
+        config.app_generators.fallbacks[:mini_test] = :test_unit
+      else
+        config.generators.integration_tool :mini_test
+        config.generators.test_framework   :mini_test
+        config.generators.fallbacks[:mini_test] = :test_unit
+      end
 
       rake_tasks do
         load "minitest/rails/tasks/minitest.rake"

data/minitest-rails.gemspec

@@ -0,0 +1,42 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "minitest-rails"
+  s.version = "0.1.20120709115419"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Mike Moore"]
+  s.date = "2012-07-09"
+  s.description = "Adds MiniTest as the default testing library in Rails 3."
+  s.email = ["mike@blowmage.com"]
+  s.extra_rdoc_files = ["CHANGELOG.rdoc", "Manifest.txt", "README.rdoc"]
+  s.files = [".autotest", ".gemtest", "CHANGELOG.rdoc", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "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/tasks/minitest.rake", "minitest-rails.gemspec", "test/test_controller_generator.rb", "test/test_helper_generator.rb", "test/test_install_generator.rb", "test/test_mailer_generator.rb", "test/test_minitest.rb", "test/test_model_generator.rb", "test/test_scaffold_generator.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."
+  s.test_files = ["test/test_controller_generator.rb", "test/test_helper_generator.rb", "test/test_install_generator.rb", "test/test_mailer_generator.rb", "test/test_minitest.rb", "test/test_model_generator.rb", "test/test_scaffold_generator.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.0"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_development_dependency(%q<hoe>, ["~> 3.0"])
+    else
+      s.add_dependency(%q<minitest>, ["~> 3.0"])
+      s.add_dependency(%q<rails>, ["~> 3.0"])
+      s.add_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_dependency(%q<hoe>, ["~> 3.0"])
+    end
+  else
+    s.add_dependency(%q<minitest>, ["~> 3.0"])
+    s.add_dependency(%q<rails>, ["~> 3.0"])
+    s.add_dependency(%q<rdoc>, ["~> 3.10"])
+    s.add_dependency(%q<hoe>, ["~> 3.0"])
+  end
+end

data/test/test_controller_generator.rb

@@ -4,41 +4,61 @@ require "minitest-rails"
 require "rails"
 require "rails/generators"
 
-require "generators/minitest/controller/controller_generator"
+require "generators/mini_test/controller/controller_generator"
 
 require "fileutils"
 
-class TestControllerGenerator < Minitest::Unit::TestCase
+class TestControllerGenerator < MiniTest::Unit::TestCase
   Rails::Generators.no_color!
 
   def test_controller_generator
     text = capture(:stdout) do
-      Minitest::Generators::ControllerGenerator.start ["user"]
+      MiniTest::Generators::ControllerGenerator.start ["user"]
     end
     assert_match(/create  test\/controllers\/user_controller_test.rb/m, text)
     assert File.exists? "test/controllers/user_controller_test.rb"
     contents = open("test/controllers/user_controller_test.rb").read
-    assert_match(/class UserControllerTest < Minitest::Rails::Controller/m, contents)
-    assert_match(/def test_sanity/m, contents)
+    assert_match(/class UserControllerTest/m, contents)
   ensure
     # TODO: Don"t write the files
     # I agree, it would be better to mock the file getting written
     FileUtils.rm_r "test/controllers"
   end
 
+  def test_namespaced_controller_generator
+    text = capture(:stdout) do
+      MiniTest::Generators::ControllerGenerator.start ["admin/user"]
+    end
+    assert_match(/create  test\/controllers\/admin\/user_controller_test.rb/m, text)
+    assert File.exists? "test/controllers/admin/user_controller_test.rb"
+    contents = open("test/controllers/admin/user_controller_test.rb").read
+    assert_match(/class Admin::UserControllerTest/m, contents)
+  ensure
+    FileUtils.rm_r "test/controllers"
+  end
+
   def test_controller_generator_spec
     text = capture(:stdout) do
-      Minitest::Generators::ControllerGenerator.start ["user", "--spec"]
+      MiniTest::Generators::ControllerGenerator.start ["user", "--spec"]
     end
     assert_match(/create  test\/controllers\/user_controller_test.rb/m, text)
     assert File.exists? "test/controllers/user_controller_test.rb"
     contents = open("test/controllers/user_controller_test.rb").read
     assert_match(/describe UserController do/m, contents)
-    assert_match(/subject \{ UserController \}/m, contents)
-    assert_match(/# fixtures :all/m, contents)
-    assert_match(/@controller = UserController.new/m, contents)
-    assert_match(/it "must be a real test"/m, contents)
   ensure
     FileUtils.rm_r "test/controllers"
   end
+
+  def test_namespaced_controller_generator_spec
+    text = capture(:stdout) do
+      MiniTest::Generators::ControllerGenerator.start ["admin/user", "--spec"]
+    end
+    assert_match(/create  test\/controllers\/admin\/user_controller_test.rb/m, text)
+    assert File.exists? "test/controllers/admin/user_controller_test.rb"
+    contents = open("test/controllers/admin/user_controller_test.rb").read
+    assert_match(/describe Admin::UserController do/m, contents)
+  ensure
+    FileUtils.rm_r "test/controllers"
+  end
+
 end

data/test/test_helper_generator.rb

@@ -4,30 +4,42 @@ require "minitest-rails"
 require "rails"
 require "rails/generators"
 
-require "generators/minitest/helper/helper_generator"
+require "generators/mini_test/helper/helper_generator"
 
 require "fileutils"
 
-class TestHelperGenerator < Minitest::Unit::TestCase
+class TestHelperGenerator < MiniTest::Unit::TestCase
   Rails::Generators.no_color!
 
   def test_helper_generator
     text = capture(:stdout) do
-      Minitest::Generators::HelperGenerator.start ["user"]
+      MiniTest::Generators::HelperGenerator.start ["user"]
     end
     assert_match(/create  test\/helpers\/user_helper_test.rb/m, text)
     assert File.exists? "test/helpers/user_helper_test.rb"
     contents = open("test/helpers/user_helper_test.rb").read
-    assert_match(/class UserHelperTest < Minitest::Rails::Helper/m, contents)
+    assert_match(/class UserHelperTest < MiniTest::Unit::TestCase/m, contents)
   ensure
     # TODO: Don"t write the files
     # I agree, it would be better to mock the file getting written
     FileUtils.rm_r "test/helpers"
   end
 
+  def test_namespaced_helper_generator
+    text = capture(:stdout) do
+      MiniTest::Generators::HelperGenerator.start ["admin/user"]
+    end
+    assert_match(/create  test\/helpers\/admin\/user_helper_test.rb/m, text)
+    assert File.exists? "test/helpers/admin/user_helper_test.rb"
+    contents = open("test/helpers/admin/user_helper_test.rb").read
+    assert_match(/class Admin::UserHelperTest < MiniTest::Unit::TestCase/m, contents)
+  ensure
+    FileUtils.rm_r "test/helpers"
+  end
+
   def test_helper_generator_spec
     text = capture(:stdout) do
-      Minitest::Generators::HelperGenerator.start ["user", "--spec"]
+      MiniTest::Generators::HelperGenerator.start ["user", "--spec"]
     end
     assert_match(/create  test\/helpers\/user_helper_test.rb/m, text)
     assert File.exists? "test/helpers/user_helper_test.rb"
@@ -36,4 +48,17 @@ class TestHelperGenerator < Minitest::Unit::TestCase
   ensure
     FileUtils.rm_r "test/helpers"
   end
+
+  def test_helper_generator_spec
+    text = capture(:stdout) do
+      MiniTest::Generators::HelperGenerator.start ["admin/user", "--spec"]
+    end
+    assert_match(/create  test\/helpers\/admin\/user_helper_test.rb/m, text)
+    assert File.exists? "test/helpers/admin/user_helper_test.rb"
+    contents = open("test/helpers/admin/user_helper_test.rb").read
+    assert_match(/describe Admin::UserHelper do/m, contents)
+  ensure
+    FileUtils.rm_r "test/helpers"
+  end
+
 end

data/test/test_install_generator.rb

@@ -4,30 +4,22 @@ require "minitest-rails"
 require "rails"
 require "rails/generators"
 
-require "generators/minitest/install/install_generator"
+require "generators/mini_test/install/install_generator"
 
 require "fileutils"
 
-class TestInstallGenerator < Minitest::Unit::TestCase
+class TestInstallGenerator < MiniTest::Unit::TestCase
   Rails::Generators.no_color!
 
   def test_install_generator
     text = capture(:stdout) do
-      Minitest::Generators::InstallGenerator.start
+      MiniTest::Generators::InstallGenerator.start
     end
     assert_match(/create  test\/minitest_helper.rb/m, text)
     assert File.exists? "test/minitest_helper.rb"
     contents = open("test/minitest_helper.rb").read
-    assert_match(/class Minitest::Rails::Spec/m, contents)
-    assert_match(/# include Minitest::Rails::Fixtures/m, contents)
-    assert_match(/class Minitest::Rails::Model/m, contents)
-    assert_match(/Minitest::Spec.register_spec_type\(Minitest::Rails::Model\) do/m, contents)
-    assert_match(/class Minitest::Rails::Controller/m, contents)
-    assert_match(/Minitest::Spec.register_spec_type\(\/Controller\$\/, Minitest::Rails::Controller\)/m, contents)
-    assert_match(/class Minitest::Rails::Helper/m, contents)
-    assert_match(/Minitest::Spec.register_spec_type\(\/Helper\$\/, Minitest::Rails::Helper\)/m, contents)
-    assert_match(/class Minitest::Rails::Mailer/m, contents)
-    assert_match(/Minitest::Spec.register_spec_type\(Minitest::Rails::Mailer\) do/m, contents)
+    assert_match(/require "minitest\/autorun"/m, contents)
+    assert_match(/require "minitest\/rails"/m, contents)
   ensure
     # TODO: Don"t write the files
     # I agree, it would be better to mock the file getting written

data/test/test_mailer_generator.rb

@@ -4,21 +4,21 @@ require "minitest-rails"
 require "rails"
 require "rails/generators"
 
-require "generators/minitest/mailer/mailer_generator"
+require "generators/mini_test/mailer/mailer_generator"
 
 require "fileutils"
 
-class TestMailerGenerator < Minitest::Unit::TestCase
+class TestMailerGenerator < MiniTest::Unit::TestCase
   Rails::Generators.no_color!
 
   def test_mailer_generator
     text = capture(:stdout) do
-      Minitest::Generators::MailerGenerator.start ["notification"]
+      MiniTest::Generators::MailerGenerator.start ["notification"]
     end
     assert_match(/create  test\/mailers\/notification_test.rb/m, text)
     assert File.exists? "test/mailers/notification_test.rb"
     contents = open("test/mailers/notification_test.rb").read
-    assert_match(/class NotificationTest < Minitest::Rails::Mailer/m, contents)
+    assert_match(/class NotificationTest/m, contents)
   ensure
     # TODO: Don"t write the files
     # I agree, it would be better to mock the file getting written
@@ -27,13 +27,12 @@ class TestMailerGenerator < Minitest::Unit::TestCase
 
   def test_mailer_generator_spec
     text = capture(:stdout) do
-      Minitest::Generators::MailerGenerator.start ["notification", "welcome", "--spec"]
+      MiniTest::Generators::MailerGenerator.start ["notification", "welcome", "--spec"]
     end
     assert_match(/create  test\/mailers\/notification_test.rb/m, text)
     assert File.exists? "test/mailers/notification_test.rb"
     contents = open("test/mailers/notification_test.rb").read
     assert_match(/describe Notification do/m, contents)
-    assert_match(/it "welcome" do/m, contents)
   ensure
     FileUtils.rm_r "test/mailers"
   end

data/test/test_minitest.rb

@@ -1,8 +1,8 @@
 require "minitest/autorun"
 require "minitest-rails"
 
-class TestMinitest < Minitest::Unit::TestCase
+class TestMiniTest < MiniTest::Unit::TestCase
   def test_sanity
-    assert Minitest::Rails::VERSION
+    assert MiniTest::Rails::VERSION
   end
 end

data/test/test_model_generator.rb

@@ -4,37 +4,57 @@ require "minitest-rails"
 require "rails"
 require "rails/generators"
 
-require "generators/minitest/model/model_generator"
+require "generators/mini_test/model/model_generator"
 
 require "fileutils"
 
-class TestModelGenerator < Minitest::Unit::TestCase
+class TestModelGenerator < MiniTest::Unit::TestCase
   Rails::Generators.no_color!
 
   def test_model_generator
     text = capture(:stdout) do
-      Minitest::Generators::ModelGenerator.start ["user"]
+      MiniTest::Generators::ModelGenerator.start ["user"]
     end
     assert_match(/create  test\/models\/user_test.rb/m, text)
     assert File.exists? "test/models/user_test.rb"
     contents = open("test/models/user_test.rb").read
-    assert_match(/class UserTest < Minitest::Rails::Model/m, contents)
+    assert_match(/class UserTest/m, contents)
   ensure
     # TODO: Don"t write the files
     # I agree, it would be better to mock the file getting written
     FileUtils.rm_r "test/models"
+    FileUtils.rm_r "test/fixtures"
   end
 
   def test_model_generator_spec
     text = capture(:stdout) do
-      Minitest::Generators::ModelGenerator.start ["user", "--spec"]
+      MiniTest::Generators::ModelGenerator.start ["user", "--spec"]
     end
     assert_match(/create  test\/models\/user_test.rb/m, text)
     assert File.exists? "test/models/user_test.rb"
+    assert File.exists? "test/fixtures/users.yml"
     contents = open("test/models/user_test.rb").read
     assert_match(/describe User do/m, contents)
-    assert_match(/subject \{ User.new \}/, contents)
-    assert_match(/# fixtures :all/, contents)
+  ensure
+    FileUtils.rm_r "test/models"
+    FileUtils.rm_r "test/fixtures"
+  end
+
+  def test_model_generator_fixture
+    text = capture(:stdout) do
+      MiniTest::Generators::ModelGenerator.start ["user"]
+    end
+    assert File.exists? "test/fixtures/users.yml"
+  ensure
+    FileUtils.rm_r "test/models"
+    FileUtils.rm_r "test/fixtures"
+  end
+
+  def test_model_generator_no_fixture
+    text = capture(:stdout) do
+      MiniTest::Generators::ModelGenerator.start ["user", "--skip-fixture"]
+    end
+    refute File.exists? "test/fixtures/users.yml"
   ensure
     FileUtils.rm_r "test/models"
   end

data/test/test_scaffold_generator.rb

@@ -4,22 +4,21 @@ require "minitest-rails"
 require "rails"
 require "rails/generators"
 
-require "generators/minitest/scaffold/scaffold_generator"
+require "generators/mini_test/scaffold/scaffold_generator"
 
 require "fileutils"
 
-class TestScaffoldGenerator < Minitest::Unit::TestCase
+class TestScaffoldGenerator < MiniTest::Unit::TestCase
   Rails::Generators.no_color!
 
   def test_scaffold_generator
     text = capture(:stdout) do
-      Minitest::Generators::ScaffoldGenerator.start ["user"]
+      MiniTest::Generators::ScaffoldGenerator.start ["user"]
     end
     assert_match(/create  test\/controllers\/user_controller_test.rb/m, text)
     assert File.exists? "test/controllers/user_controller_test.rb"
     contents = open("test/controllers/user_controller_test.rb").read
-    assert_match(/class UserControllerTest < Minitest::Rails::Controller/m, contents)
-    assert_match(/def test_index/m, contents)
+    assert_match(/class UserControllerTest/m, contents)
   ensure
     # TODO: Don"t write the files
     # I agree, it would be better to mock the file getting written
@@ -28,14 +27,12 @@ class TestScaffoldGenerator < Minitest::Unit::TestCase
 
   def test_scaffold_generator_spec
     text = capture(:stdout) do
-      Minitest::Generators::ScaffoldGenerator.start ["user", "--spec"]
+      MiniTest::Generators::ScaffoldGenerator.start ["user", "--spec"]
     end
     assert_match(/create  test\/controllers\/user_controller_test.rb/m, text)
     assert File.exists? "test/controllers/user_controller_test.rb"
     contents = open("test/controllers/user_controller_test.rb").read
     assert_match(/describe UserController do/m, contents)
-    assert_match(/subject \{ UserController \}/m, contents)
-    assert_match(/it "must get index"/m, contents)
   ensure
     FileUtils.rm_r "test/controllers"
   end