minitest-rails 0.0.6 → 0.0.7

data/Manifest.txt

@@ -3,28 +3,29 @@ CHANGELOG.rdoc
 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/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/generators/minitest.rb
+lib/generators/minitest/controller/controller_generator.rb
+lib/generators/minitest/controller/templates/controller_spec.rb
+lib/generators/minitest/controller/templates/controller_test.rb
+lib/generators/minitest/helper/helper_generator.rb
+lib/generators/minitest/helper/templates/helper_spec.rb
+lib/generators/minitest/helper/templates/helper_test.rb
+lib/generators/minitest/install/install_generator.rb
+lib/generators/minitest/install/templates/test/minitest_helper.rb
+lib/generators/minitest/mailer/mailer_generator.rb
+lib/generators/minitest/mailer/templates/mailer_spec.rb
+lib/generators/minitest/mailer/templates/mailer_test.rb
+lib/generators/minitest/model/model_generator.rb
+lib/generators/minitest/model/templates/fixtures.yml
+lib/generators/minitest/model/templates/model_spec.rb
+lib/generators/minitest/model/templates/model_test.rb
+lib/generators/minitest/scaffold/scaffold_generator.rb
+lib/generators/minitest/scaffold/templates/controller_spec.rb
+lib/generators/minitest/scaffold/templates/controller_test.rb
 lib/minitest-rails.rb
 lib/minitest/rails.rb
 lib/minitest/rails/controller.rb
+lib/minitest/rails/fixtures.rb
 lib/minitest/rails/helper.rb
 lib/minitest/rails/mailer.rb
 lib/minitest/rails/model.rb

data/README.rdoc

@@ -1,6 +1,6 @@
 = minitest-rails
 
-MiniTest integration for Rails 3.1.
+Minitest integration for Rails 3.1.
 
 == Install
 
@@ -30,19 +30,19 @@ Or, for the truly enlightened, add <tt>minitest-rails</tt> to the <tt>:test</tt>
 
 Next run the installation generator with the following:
 
-    rails generate mini_test:install
+    rails generate minitest:install
 
 This will add the <tt>minitest_helper.rb</tt> file to the <tt>test</tt> directory.
 
 == Usage
 
-We aim to expose MiniTest with minimal changes for testing within Rails.
-Your test classes will inherit from MiniTest::Rails::Spec (or Model, or Controller, etc) and you can use the MiniTest::Spec DSL.
+We aim to expose Minitest with minimal changes for testing within Rails.
+Your test classes will inherit from Minitest::Rails::Spec (or Model, or Controller, etc) and you can use the Minitest::Spec DSL.
 You can generate test files with the standard model, controller, scaffold, 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 Minitest::Spec DSL on any of the generators by providing the <tt>--spec</tt> option:
 
     rails generate model User --spec
 
@@ -53,5 +53,5 @@ And you can specify generating the fixture for a model by providing the <tt>--fi
 You can also set these as defaults by adding the following to the <tt>config/application.rb</tt> file:
 
     config.generators do |g|
-      g.test_framework :mini_test, :spec => true, :fixture => true
+      g.test_framework :minitest, :spec => true, :fixture => true
     end

data/Rakefile

@@ -4,20 +4,21 @@ require 'rubygems'
 require 'hoe'
 
 Hoe.plugin :git
+Hoe.plugin :gemspec
 Hoe.plugins.delete :rubyforge
 
 Hoe.spec 'minitest-rails' do
   developer 'Mike Moore', 'mike@blowmage.com'
 
-  self.summary     = 'MiniTest integration for Rails 3.'
-  self.description = 'Adds MiniTest as the default testing library in Rails 3.'
-  self.url         = 'http://blowmage.com/minitest-rails'
+  self.summary     = 'Minitest integration for Rails 3.'
+  self.description = 'Adds Minitest as the default testing library in Rails 3.'
+  self.urls        = ['http://blowmage.com/minitest-rails']
 
   self.history_file = "CHANGELOG.rdoc"
   self.readme_file  = "README.rdoc"
   self.testlib      = :minitest
 
-  extra_deps << ['minitest',  '~> 2.11']
+  extra_deps << ['minitest',  '~> 2.12']
   extra_deps << ['rails',     '~> 3.1']
 end
 

data/lib/generators/{mini_test.rb → minitest.rb}

@@ -1,10 +1,10 @@
 require 'rails/generators/named_base'
 
-module MiniTest
+module Minitest
   module Generators
     class Base < ::Rails::Generators::NamedBase #:nodoc:
       def self.source_root
-        @_minitest_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'mini_test', generator_name, 'templates'))
+        @_minitest_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'minitest', generator_name, 'templates'))
       end
     end
   end

data/lib/generators/{mini_test → minitest}/controller/controller_generator.rb

@@ -1,10 +1,10 @@
-require "generators/mini_test"
+require "generators/minitest"
 
-module MiniTest
+module Minitest
   module Generators
     class ControllerGenerator < Base
       argument     :actions, :type => :array,   :default => [],    :banner => "action action"
-      class_option :spec,    :type => :boolean, :default => false, :desc   => "Use MiniTest::Spec DSL"
+      class_option :spec,    :type => :boolean, :default => false, :desc   => "Use Minitest::Spec DSL"
 
       check_class_collision :suffix => "ControllerTest"
 

data/lib/generators/{mini_test → minitest}/controller/templates/controller_test.rb

@@ -1,7 +1,7 @@
 require "minitest_helper"
 
 <% module_namespacing do -%>
-class <%= class_name %>ControllerTest < MiniTest::Rails::Controller
+class <%= class_name %>ControllerTest < Minitest::Rails::Controller
 
 <% if actions.empty? -%>
   def test_sanity

data/lib/generators/{mini_test → minitest}/helper/helper_generator.rb

@@ -1,9 +1,9 @@
-require "generators/mini_test"
+require "generators/minitest"
 
-module MiniTest
+module Minitest
   module Generators
     class HelperGenerator < Base
-      class_option :spec,    :type => :boolean, :default => false, :desc   => "Use MiniTest::Spec DSL"
+      class_option :spec,    :type => :boolean, :default => false, :desc   => "Use Minitest::Spec DSL"
 
       check_class_collision :suffix => "HelperTest"
 

data/lib/generators/{mini_test → minitest}/helper/templates/helper_test.rb

@@ -1,7 +1,7 @@
 require "minitest_helper"
 
 <% module_namespacing do -%>
-class <%= class_name %>HelperTest < MiniTest::Rails::Helper
+class <%= class_name %>HelperTest < Minitest::Rails::Helper
 
   def test_sanity
     flunk "Need real tests"

data/lib/generators/{mini_test → minitest}/install/install_generator.rb

@@ -1,6 +1,6 @@
 require 'rails/generators'
 
-module MiniTest
+module Minitest
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
 

data/lib/generators/minitest/install/templates/test/minitest_helper.rb

@@ -0,0 +1,61 @@
+require "minitest/autorun"
+require "minitest/rails"
+
+# Uncomment if you want awesome colorful output
+# require "minitest/pride"
+
+ENV["RAILS_ENV"] = "test"
+require File.expand_path('../../config/environment', __FILE__)
+
+class Minitest::Rails::Spec
+  # Uncomment if you want to support fixtures for all specs
+  # or
+  # place within spec class you want to support fixtures for
+  # include Minitest::Rails::Fixtures
+
+  # For backward compatibility with Test::Unit
+  def build_message(message, template = nil, *args)
+    template = template.gsub('<?>', '<%s>')
+    message || sprintf(template, *args)
+  end
+
+  # Add methods to be used by all specs here...
+
+end
+
+class Minitest::Rails::Model
+
+  # Add methods to be used by model specs here...
+
+end
+
+Minitest::Spec.register_spec_type(Minitest::Rails::Model) do |desc|
+  desc.respond_to?(:superclass) && desc.superclass == ActiveRecord::Base
+end
+
+class Minitest::Rails::Controller
+
+  # Add methods to be used by controller specs here...
+
+end
+
+Minitest::Spec.register_spec_type(/Controller$/, Minitest::Rails::Controller)
+
+class Minitest::Rails::Helper
+
+  # Add methods to be used by helper specs here...
+
+end
+
+Minitest::Spec.register_spec_type(/Helper$/, Minitest::Rails::Helper)
+
+class Minitest::Rails::Mailer
+
+  # Add methods to be used by mailer specs here...
+
+end
+
+Minitest::Spec.register_spec_type(Minitest::Rails::Mailer) do |desc|
+  desc.respond_to?(:superclass) && desc.superclass == ActionMailer::Base
+end
+

data/lib/generators/{mini_test → minitest}/mailer/mailer_generator.rb

@@ -1,10 +1,10 @@
-require "generators/mini_test"
+require "generators/minitest"
 
-module MiniTest
+module Minitest
   module Generators
     class MailerGenerator < Base
       argument     :actions, :type => :array,   :default => [],    :banner => "method method"
-      class_option :spec,    :type => :boolean, :default => false, :desc => "Use MiniTest::Spec DSL"
+      class_option :spec,    :type => :boolean, :default => false, :desc => "Use Minitest::Spec DSL"
 
       check_class_collision :suffix => "MailerTest"
 

data/lib/generators/{mini_test → minitest}/mailer/templates/mailer_test.rb

@@ -1,7 +1,7 @@
 require "minitest_helper"
 
 <% module_namespacing do -%>
-class <%= class_name %>Test < MiniTest::Rails::Mailer
+class <%= class_name %>Test < Minitest::Rails::Mailer
 <% actions.each do |action| -%>
   def test_<%= action %>
     mail = <%= class_name %>.<%= action %>

data/lib/generators/{mini_test → minitest}/model/model_generator.rb

@@ -1,11 +1,11 @@
-require "generators/mini_test"
+require "generators/minitest"
 
-module MiniTest
+module Minitest
   module Generators
     class ModelGenerator < Base
       argument     :attributes, :type => :array,   :default => [], :banner => "field:type field:type"
       class_option :fixture,    :type => :boolean, :default => false, :desc => "Create fixture file"
-      class_option :spec,       :type => :boolean, :default => false, :desc => "Use MiniTest::Spec DSL"
+      class_option :spec,       :type => :boolean, :default => false, :desc => "Use Minitest::Spec DSL"
 
       check_class_collision :suffix => "Test"
 

data/lib/generators/{mini_test → minitest}/model/templates/model_test.rb

@@ -1,7 +1,7 @@
 require "minitest_helper"
 
 <% module_namespacing do -%>
-class <%= class_name %>Test < MiniTest::Rails::Model
+class <%= class_name %>Test < Minitest::Rails::Model
 
   def test_sanity
     flunk "Need real tests"

data/lib/generators/{mini_test → minitest}/scaffold/scaffold_generator.rb

@@ -1,12 +1,12 @@
-require "generators/mini_test"
+require "generators/minitest"
 require "rails/generators/resource_helpers"
 
-module MiniTest
+module Minitest
   module Generators
     class ScaffoldGenerator < Base
       include ::Rails::Generators::ResourceHelpers
       argument     :actions, :type => :array,   :default => [],    :banner => "action action"
-      class_option :spec,    :type => :boolean, :default => false, :desc   => "Use MiniTest::Spec DSL"
+      class_option :spec,    :type => :boolean, :default => false, :desc   => "Use Minitest::Spec DSL"
 
       check_class_collision :suffix => "ControllerTest"
 

data/lib/generators/{mini_test → minitest}/scaffold/templates/controller_test.rb

@@ -1,7 +1,7 @@
 require "minitest_helper"
 
 <% module_namespacing do -%>
-class <%= class_name %>ControllerTest < MiniTest::Rails::Controller
+class <%= class_name %>ControllerTest < Minitest::Rails::Controller
   before do
     @<%= singular_table_name %> = <%= table_name %>(:one)
   end

data/lib/minitest-rails.rb

@@ -1,13 +1,13 @@
 require "rails"
 require "minitest/unit"
 
-module MiniTest
+module Minitest
   module Rails
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
     class Railtie < ::Rails::Railtie
-      # config.app_generators.integration_tool :mini_test
-      config.app_generators.test_framework :mini_test
-      config.app_generators.fallbacks[:mini_test] = :test_unit
+      # config.app_generators.integration_tool :minitest
+      config.app_generators.test_framework :minitest
+      config.app_generators.fallbacks[:minitest] = :test_unit
 
       rake_tasks do
         load "minitest/rails/tasks/minitest.rake"

data/lib/minitest/rails.rb

@@ -2,4 +2,4 @@ require "minitest/rails/model"
 require "minitest/rails/controller"
 require "minitest/rails/helper"
 require "minitest/rails/mailer"
-require "minitest/rails/fixtures"
+require "minitest/rails/fixtures" if defined?(ActiveRecord::Base)

data/lib/minitest/rails/controller.rb

@@ -1,15 +1,104 @@
 require "minitest/rails/spec"
 require "active_support/test_case"
+require "action_controller"
 require "action_controller/test_case"
 
-module MiniTest
+module Minitest
   module Rails
     class Controller < Spec
       include ActiveSupport::Testing::SetupAndTeardown
       include ActionController::TestCase::Behavior
+
       before do
-        @routes = Rails.application.routes
+        @routes = ::Rails.application.routes
+      end
+
+      class << self
+
+        # Define a concrete anonymous controller class for testing.
+        #
+        # The purpose is to test abstract controllers and in particular
+        # ApplicationController. For the anonymous controller
+        # rendering of templates is disabled. During tests, the routes
+        # are redefined to
+        #
+        #   resources :anonymous
+        #
+        # base_controller - superclass for the anonymous controller.
+        #   If not given, the controller is take from the context.
+        #   If that doesn't work either, ApplicationController is used.
+        #
+        # Examples
+        #
+        #   describe ApplicationController do
+        #     controller
+        #
+        #     it "assigns the current_user" do
+        #       get :index
+        #       assigns(:current_user).wont_be_nil
+        #     end
+        #   end
+        #
+        #
+        def controller(base_controller = nil, &block)
+          anonymous = anonymous_controller_class(base_controller)
+          anonymous.class_eval(&block) if block_given?
+          setup_temporary_anonymous_routes
+          self.controller_class = anonymous
+        end
+
+        private
+
+        def anonymous_controller_class(base_controller = nil)
+          return @anonymous_controller_class if defined?(@anonymous_controller_class)
+
+          base_controller ||= described_controller
+
+          Class.new(base_controller) do
+            def index;    end
+            def show;     end
+            def new;      end
+            def create;   end
+            def edit;     end
+            def update;   end
+            def destroy;  end
+
+            def render
+              # suppress rendering
+            end
+
+            def self.anonymous?
+              false
+            end
+
+            def self.name
+              'anonymous'
+            end
+          end
+        end
+
+        def described_controller
+          if @desc.respond_to?(:<) && @desc <= ActionController::Base
+            @desc
+          else
+            ApplicationController
+          end
+        end
+
+        def setup_temporary_anonymous_routes
+          return if defined?(@orig_routes) # We've been here already.
+
+          before do
+            @orig_routes, @routes = @routes, ActionDispatch::Routing::RouteSet.new
+            @routes.draw { resources :anonymous }
+          end
+
+          after do
+            @routes, @orig_routes = @orig_routes, nil
+          end
+        end
       end
+
     end
   end
 end

data/lib/minitest/rails/fixtures.rb

@@ -0,0 +1,14 @@
+module Minitest
+  module Rails
+    module Fixtures
+      def self.included(klass)
+        klass.class_eval do
+          include ActiveSupport::Testing::SetupAndTeardown
+          include ActiveRecord::TestFixtures
+          self.fixture_path = File.join(::Rails.root, "test", "fixtures")
+        end
+      end
+    end
+  end
+end
+

data/lib/minitest/rails/helper.rb

@@ -1,8 +1,30 @@
 require "minitest/rails/spec"
 
-module MiniTest
+module Minitest
   module Rails
     class Helper < Spec
+      include ActiveSupport::Testing::SetupAndTeardown
+      include ActionView::TestCase::Behavior
+
+        def self.helper_class
+          # As of Rails 3.2.3, the original implementation breaks
+          # for nested contexts as it appends context names.
+          # We need to determine the name of the top-level context.
+
+          context_class = self
+          context_super = context_class.superclass
+
+          while context_super && context_super != Minitest::Rails::Helper
+            context_class = context_super
+            context_super = context_super.superclass
+          end
+
+          if context_class
+            @helper_class ||= determine_default_helper_class(context_class.name)
+          else
+            super
+          end
+        end
     end
   end
 end

data/lib/minitest/rails/mailer.rb

@@ -1,6 +1,6 @@
 require "minitest/rails/spec"
 
-module MiniTest
+module Minitest
   module Rails
     class Mailer < Spec
     end

data/lib/minitest/rails/model.rb

@@ -1,6 +1,6 @@
 require "minitest/rails/spec"
 
-module MiniTest
+module Minitest
   module Rails
     class Model < Spec
     end

data/lib/minitest/rails/spec.rb

@@ -2,9 +2,9 @@ require "minitest/unit"
 require "minitest/spec"
 require "minitest/mock"
 
-module MiniTest
+module Minitest
   module Rails
-    class Spec < ::MiniTest::Spec
+    class Spec < ::Minitest::Spec
       alias :method_name :__name__ if defined? :__name__
       class << self
         alias :context :describe

data/test/test_controller_generator.rb

@@ -4,21 +4,21 @@ require "minitest-rails"
 require "rails"
 require "rails/generators"
 
-require "generators/mini_test/controller/controller_generator"
+require "generators/minitest/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(/class UserControllerTest < Minitest::Rails::Controller/m, contents)
     assert_match(/def test_sanity/m, contents)
   ensure
     # TODO: Don"t write the files
@@ -28,7 +28,7 @@ class TestControllerGenerator < MiniTest::Unit::TestCase
 
   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"

data/test/test_helper_generator.rb

@@ -4,21 +4,21 @@ require "minitest-rails"
 require "rails"
 require "rails/generators"
 
-require "generators/mini_test/helper/helper_generator"
+require "generators/minitest/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::Rails::Helper/m, contents)
   ensure
     # TODO: Don"t write the files
     # I agree, it would be better to mock the file getting written
@@ -27,7 +27,7 @@ class TestHelperGenerator < MiniTest::Unit::TestCase
 
   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"

data/test/test_install_generator.rb

@@ -4,30 +4,30 @@ require "minitest-rails"
 require "rails"
 require "rails/generators"
 
-require "generators/mini_test/install/install_generator"
+require "generators/minitest/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(/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)
   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/mini_test/mailer/mailer_generator"
+require "generators/minitest/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 < Minitest::Rails::Mailer/m, contents)
   ensure
     # TODO: Don"t write the files
     # I agree, it would be better to mock the file getting written
@@ -27,7 +27,7 @@ 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"

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,21 +4,21 @@ require "minitest-rails"
 require "rails"
 require "rails/generators"
 
-require "generators/mini_test/model/model_generator"
+require "generators/minitest/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 < Minitest::Rails::Model/m, contents)
   ensure
     # TODO: Don"t write the files
     # I agree, it would be better to mock the file getting written
@@ -27,7 +27,7 @@ class TestModelGenerator < MiniTest::Unit::TestCase
 
   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"

data/test/test_scaffold_generator.rb

@@ -4,21 +4,21 @@ require "minitest-rails"
 require "rails"
 require "rails/generators"
 
-require "generators/mini_test/scaffold/scaffold_generator"
+require "generators/minitest/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(/class UserControllerTest < Minitest::Rails::Controller/m, contents)
     assert_match(/def test_index/m, contents)
   ensure
     # TODO: Don"t write the files
@@ -28,7 +28,7 @@ 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"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000 Z
+date: 2012-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70095363735960 !ruby/object:Gem::Requirement
+  requirement: &70135710009180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.12'
   type: :runtime
   prerelease: false
-  version_requirements: *70095363735960
+  version_requirements: *70135710009180
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70095363735520 !ruby/object:Gem::Requirement
+  requirement: &70135710008740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70095363735520
+  version_requirements: *70135710008740
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70095363735080 !ruby/object:Gem::Requirement
+  requirement: &70135710008300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,19 +43,19 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70095363735080
+  version_requirements: *70135710008300
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70095363734640 !ruby/object:Gem::Requirement
+  requirement: &70135710007860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.16'
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70095363734640
-description: Adds MiniTest as the default testing library in Rails 3.
+  version_requirements: *70135710007860
+description: Adds Minitest as the default testing library in Rails 3.
 email:
 - mike@blowmage.com
 executables: []
@@ -70,28 +70,29 @@ files:
 - 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/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/generators/minitest.rb
+- lib/generators/minitest/controller/controller_generator.rb
+- lib/generators/minitest/controller/templates/controller_spec.rb
+- lib/generators/minitest/controller/templates/controller_test.rb
+- lib/generators/minitest/helper/helper_generator.rb
+- lib/generators/minitest/helper/templates/helper_spec.rb
+- lib/generators/minitest/helper/templates/helper_test.rb
+- lib/generators/minitest/install/install_generator.rb
+- lib/generators/minitest/install/templates/test/minitest_helper.rb
+- lib/generators/minitest/mailer/mailer_generator.rb
+- lib/generators/minitest/mailer/templates/mailer_spec.rb
+- lib/generators/minitest/mailer/templates/mailer_test.rb
+- lib/generators/minitest/model/model_generator.rb
+- lib/generators/minitest/model/templates/fixtures.yml
+- lib/generators/minitest/model/templates/model_spec.rb
+- lib/generators/minitest/model/templates/model_test.rb
+- lib/generators/minitest/scaffold/scaffold_generator.rb
+- lib/generators/minitest/scaffold/templates/controller_spec.rb
+- lib/generators/minitest/scaffold/templates/controller_test.rb
 - lib/minitest-rails.rb
 - lib/minitest/rails.rb
 - lib/minitest/rails/controller.rb
+- lib/minitest/rails/fixtures.rb
 - lib/minitest/rails/helper.rb
 - lib/minitest/rails/mailer.rb
 - lib/minitest/rails/model.rb
@@ -130,7 +131,7 @@ rubyforge_project: minitest-rails
 rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
-summary: MiniTest integration for Rails 3.
+summary: Minitest integration for Rails 3.
 test_files:
 - test/test_controller_generator.rb
 - test/test_helper_generator.rb

data/lib/generators/mini_test/install/templates/test/minitest_helper.rb

@@ -1,61 +0,0 @@
-require "minitest/autorun"
-require "minitest/rails"
-
-# Uncomment if you want awesome colorful output
-# require "minitest/pride"
-
-ENV["RAILS_ENV"] = "test"
-require File.expand_path('../../config/environment', __FILE__)
-
-class MiniTest::Rails::Spec
-  # Uncomment if you want to support fixtures for all specs
-  # or
-  # place within spec class you want to support fixtures for
-  # include MiniTest::Rails::Fixtures
-
-  # Add methods to be used by all specs here...
-
-end
-
-class MiniTest::Rails::Model
-
-  # Add methods to be used by model specs here...
-
-end
-
-MiniTest::Spec.register_spec_type(MiniTest::Rails::Model) do |desc|
-  desc.superclass == ActiveRecord::Base
-end
-
-class MiniTest::Rails::Controller
-  include ActionController::TestCase::Behavior
-  before do
-    @request  = ActionController::TestRequest.new
-    @response = ActionController::TestResponse.new
-    @routes   = Rails.application.routes
-  end
-
-  # Add methods to be used by controller specs here...
-
-end
-
-MiniTest::Spec.register_spec_type(/Controller$/, MiniTest::Rails::Controller)
-
-class MiniTest::Rails::Helper
-
-  # Add methods to be used by helper specs here...
-
-end
-
-MiniTest::Spec.register_spec_type(/Helper$/, MiniTest::Rails::Helper)
-
-class MiniTest::Rails::Mailer
-
-  # Add methods to be used by mailer specs here...
-
-end
-
-MiniTest::Spec.register_spec_type(MiniTest::Rails::Mailer) do |desc|
-  desc.superclass == ActionMailer::Base
-end
-