minitest-rails 0.0.2 → 0.0.4

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 0.0.4 / 2011-06-08
+
+Add scaffold, bump to Rails 3.1.0.rc2
+
 === 0.0.2 / 2011-06-02
 
 Incomplete, but no longer in (known) a broken state.

data/Manifest.txt

@@ -3,28 +3,37 @@ CHANGELOG.rdoc
 Manifest.txt
 README.rdoc
 Rakefile
-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/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/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/minitest-rails.rb
 lib/minitest/rails.rb
-lib/minitest/rails/base.rb
 lib/minitest/rails/controller.rb
 lib/minitest/rails/helper.rb
+lib/minitest/rails/mailer.rb
 lib/minitest/rails/model.rb
+lib/minitest/rails/spec.rb
 lib/minitest/rails/tasks/minitest.rake
 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

data/README.rdoc

@@ -16,13 +16,13 @@ Create a new rails app without Test::Unit:
 
     rails new MyApp --skip-test-unit
 
-Add `minitest-rails` to the `:test` and `:development` groups in Isolate:
+Add <tt>minitest-rails</tt> to the <tt>:test</tt> and <tt>:development</tt> groups in Isolate:
 
     env :development, :test do
       gem 'minitest-rails'
     end
 
-Or, for the unenlightened, add `minitest-rails` to the `:test` and `:development` groups in Gemfile:
+Or, for the unenlightened, add <tt>minitest-rails</tt> to the <tt>:test</tt> and <tt>:development</tt> groups in Gemfile:
 
     group :test, :development do
       gem 'minitest-rails'
@@ -30,9 +30,9 @@ Or, for the unenlightened, add `minitest-rails` to the `:test` and `:development
 
 Next run the installation generator with the following:
 
-    rails generate minitest:install
+    rails generate mini_test:install
 
-This will add the `minitest_helper.rb` file to the `test` directory.
+This will add the <tt>minitest_helper.rb</tt> file to the <tt>test</tt> directory.
 
 == Usage
 
@@ -44,8 +44,8 @@ You can generate tests when you use the standard model, controller, scaffold, an
 
 Or, you can use the MiniTest generators directly:
 
-    rails generate minitest::model User
+    rails generate mini_test::model User
 
-And you can specify generating the tests using the MiniTest::Spec DSL on any of the generators by providing the `--spec` 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

data/Rakefile

@@ -18,9 +18,9 @@ Hoe.spec 'minitest-rails' do
   self.testlib      = :minitest
 
   extra_deps << ['minitest',      '~> 2.2']
-  extra_deps << ['railties',      '= 3.1.0.rc1']
-  extra_deps << ['activesupport', '= 3.1.0.rc1']
-  extra_deps << ['actionpack',    '= 3.1.0.rc1']
+  extra_deps << ['railties',      '= 3.1.0.rc2']
+  extra_deps << ['activesupport', '= 3.1.0.rc2']
+  extra_deps << ['actionpack',    '= 3.1.0.rc2']
 end
 
 # vim: syntax=ruby

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

@@ -1,12 +1,10 @@
 require 'rails/generators/named_base'
 
-# Ugh, Rails pukes on minitest -> MiniTest
-# So name this "Minitest" to appease the Rails for now
-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__), 'minitest', generator_name, 'templates'))
+        @_minitest_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'mini_test', generator_name, 'templates'))
       end
     end
   end

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

@@ -1,6 +1,6 @@
-require "generators/minitest"
+require "generators/mini_test"
 
-module Minitest
+module MiniTest
   module Generators
     class ControllerGenerator < Base
       argument     :actions, :type => :array,   :default => [],    :banner => "action action"

data/lib/generators/mini_test/controller/templates/controller_spec.rb

@@ -0,0 +1,11 @@
+require "minitest_helper"
+
+class <%= class_name %>ControllerTest < MiniTest::Rails::Controller
+  before do
+    @controller = <%= class_name %>Controller.new
+  end
+
+  it "must be a real test" do
+    flunk "Need real tests"
+  end
+end

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

@@ -1,11 +1,11 @@
 require "minitest_helper"
 
 <% module_namespacing do -%>
-class <%= class_name %>ControllerTest < MiniTest::Rails::ControllerTestCase
+class <%= class_name %>ControllerTest < MiniTest::Rails::Controller
 
 <% if actions.empty? -%>
-  def test_truth
-    assert true
+  def test_sanity
+    flunk "Need real tests"
   end
 <% else -%>
 <% actions.each do |action| -%>

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

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

data/lib/generators/mini_test/helper/templates/helper_spec.rb

@@ -0,0 +1,11 @@
+require "minitest_helper"
+
+class <%= class_name %>HelperTest < MiniTest::Rails::Helper
+  before do
+    @helper= <%= class_name %>Helper.new
+  end
+
+  it "must be a real test" do
+    flunk "Need real tests"
+  end
+end

data/lib/generators/mini_test/helper/templates/helper_test.rb

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

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

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

data/lib/generators/{minitest → mini_test}/install/templates/test/minitest_helper.rb

@@ -4,14 +4,15 @@ require "minitest/rails"
 ENV["RAILS_ENV"] = "test"
 require File.expand_path('../../config/environment', __FILE__)
 
-class MiniTest::Rails::TestCase
-
-  # Add methods to be used by all tests here...
-
-end
-
 class MiniTest::Rails::Spec
 
   # Add methods to be used by all specs here...
 
-end
+end
+
+# Uncomment to support fixtures in Model tests...
+# require "active_record/fixtures"
+class MiniTest::Rails::Model
+  # include ActiveRecord::TestFixtures
+  # self.fixture_path = File.join(Rails.root, "test", "fixtures")
+end

data/lib/generators/mini_test/mailer/mailer_generator.rb

@@ -0,0 +1,20 @@
+require "generators/mini_test"
+
+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"
+
+      check_class_collision :suffix => "MailerTest"
+
+      def create_test_files
+        if options[:spec]
+          template "mailer_spec.rb", "test/mailers/#{file_name}_test.rb"
+        else
+          template "mailer_test.rb", "test/mailers/#{file_name}_test.rb"
+        end
+      end
+    end
+  end
+end

data/lib/generators/mini_test/mailer/templates/mailer_spec.rb

@@ -0,0 +1,19 @@
+require "minitest_helper"
+
+class <%= class_name %>Test < MiniTest::Rails::Mailer
+<% actions.each do |action| -%>
+  it "<%= action %>" do
+    mail = <%= class_name %>.<%= action %>
+    mail.subject.must_equal <%= action.to_s.humanize.inspect %>
+    mail.to.must_equal ["to@example.org"]
+    mail.from.must_equal ["from@example.com"]
+    mail.body.encoded.must_match "Hi"
+  end
+
+<% end -%>
+<% if actions.blank? -%>
+  it "must be a real test" do
+    flunk "Need real tests"
+  end
+<% end -%>
+end

data/lib/generators/mini_test/mailer/templates/mailer_test.rb

@@ -0,0 +1,21 @@
+require "minitest_helper"
+
+<% module_namespacing do -%>
+class <%= class_name %>Test < MiniTest::Rails::Mailer
+<% actions.each do |action| -%>
+  def test_<%= action %>
+    mail = <%= class_name %>.<%= action %>
+    assert_equal <%= action.to_s.humanize.inspect %>, mail.subject
+    assert_equal ["to@example.org"], mail.to
+    assert_equal ["from@example.com"], mail.from
+    assert_match "Hi", mail.body.encoded
+  end
+
+<% end -%>
+<% if actions.blank? -%>
+  def test_sanity
+    flunk "Need real tests"
+  end
+<% end -%>
+end
+<% end -%>

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

@@ -1,6 +1,6 @@
-require "generators/minitest"
+require "generators/mini_test"
 
-module Minitest
+module MiniTest
   module Generators
     class ModelGenerator < Base
       argument     :attributes, :type => :array,   :default => [], :banner => "field:type field:type"
@@ -9,13 +9,18 @@ module Minitest
 
       check_class_collision :suffix => "Test"
 
-      def create_test_files
+      def create_test_file
         if options[:spec]
           template "model_spec.rb", "test/models/#{file_name}_test.rb"
         else
           template "model_test.rb", "test/models/#{file_name}_test.rb"
         end
-        if options[:fixture]
+      end
+
+      hook_for :fixture_replacement
+
+      def create_fixture_file
+        if options[:fixture] && options[:fixture_replacement].nil?
           template "fixtures.yml", "test/fixtures/#{plural_file_name}.yml"
         end
       end

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

@@ -1,6 +1,6 @@
 require "minitest_helper"
 
-describe <%= class_name %> do
+class <%= class_name %>Test < MiniTest::Rails::Model
   before do
     @<%= file_name %> = <%= class_name %>.new
   end
@@ -9,6 +9,10 @@ describe <%= class_name %> do
     @<%= file_name %>.valid?.must_equal true
   end
 
+  it "must be a real test" do
+    flunk "Need real tests"
+  end
+
   # describe "when doing its thing" do
   #   it "must be interesting" do
   #     @<%= file_name %>.blow_minds!

data/lib/generators/mini_test/model/templates/model_test.rb

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

data/lib/generators/mini_test/scaffold/scaffold_generator.rb

@@ -0,0 +1,22 @@
+require "generators/mini_test"
+require "rails/generators/resource_helpers"
+
+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"
+
+      check_class_collision :suffix => "ControllerTest"
+
+      def create_test_files
+        if options[:spec]
+          template "controller_spec.rb", "test/controllers/#{file_name}_controller_test.rb"
+        else
+          template "controller_test.rb", "test/controllers/#{file_name}_controller_test.rb"
+        end
+      end
+    end
+  end
+end

data/lib/generators/mini_test/scaffold/templates/controller_spec.rb

@@ -0,0 +1,51 @@
+require "minitest_helper"
+
+<% module_namespacing do -%>
+class <%= class_name %>ControllerTest < MiniTest::Rails::Controller
+  setup do
+    @<%= singular_table_name %> = <%= table_name %>(:one)
+  end
+
+  it "must get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:<%= table_name %>)
+  end
+
+  it "must get new" do
+    get :new
+    assert_response :success
+  end
+
+  it "must create <%= singular_table_name %>" do
+    assert_difference('<%= class_name %>.count') do
+      post :create, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+    end
+
+    assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
+  end
+
+  it "must show <%= singular_table_name %>" do
+    get :show, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    assert_response :success
+  end
+
+  it "must get edit" do
+    get :edit, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    assert_response :success
+  end
+
+  it "must update <%= singular_table_name %>" do
+    put :update, <%= key_value :id, "@#{singular_table_name}.to_param" %>, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+    assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
+  end
+
+  it "must destroy <%= singular_table_name %>" do
+    assert_difference('<%= class_name %>.count', -1) do
+      delete :destroy, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    end
+
+    assert_redirected_to <%= index_helper %>_path
+  end
+end
+<% end -%>

data/lib/generators/mini_test/scaffold/templates/controller_test.rb

@@ -0,0 +1,51 @@
+require "minitest_helper"
+
+<% module_namespacing do -%>
+class <%= class_name %>ControllerTest < MiniTest::Rails::Controller
+  setup do
+    @<%= singular_table_name %> = <%= table_name %>(:one)
+  end
+
+  def test_index
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:<%= table_name %>)
+  end
+
+  def test_new
+    get :new
+    assert_response :success
+  end
+
+  def test_create
+    assert_difference('<%= class_name %>.count') do
+      post :create, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+    end
+
+    assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
+  end
+
+  def test_show
+    get :show, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    assert_response :success
+  end
+
+  def test_edit
+    get :edit, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    assert_response :success
+  end
+
+  def test_update
+    put :update, <%= key_value :id, "@#{singular_table_name}.to_param" %>, <%= key_value singular_table_name, "@#{singular_table_name}.attributes" %>
+    assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
+  end
+
+  def test_destroy
+    assert_difference('<%= class_name %>.count', -1) do
+      delete :destroy, <%= key_value :id, "@#{singular_table_name}.to_param" %>
+    end
+
+    assert_redirected_to <%= index_helper %>_path
+  end
+end
+<% end -%>

data/lib/minitest-rails.rb

@@ -2,11 +2,11 @@ require "rails"
 
 module MiniTest
   module Rails
-    VERSION = "0.0.2"
+    VERSION = "0.0.4"
     class Railtie < ::Rails::Railtie
-      config.app_generators.integration_tool :minitest
-      config.app_generators.test_framework   :minitest, :fixture => true
-      config.app_generators.fallbacks[:minitest] = :test_unit
+      config.app_generators.integration_tool :mini_test
+      config.app_generators.test_framework   :mini_test, :fixture => false
+      config.app_generators.fallbacks[:mini_test] = :test_unit
 
       rake_tasks do
         load "minitest/rails/tasks/minitest.rake"

data/lib/minitest/rails.rb

@@ -1,8 +1,4 @@
 require "minitest/rails/model"
-require "minitest/rails/helper"
 require "minitest/rails/controller"
-
-# The order you register matters
-MiniTest::Spec.register_spec_type(//,             MiniTest::Rails::ModelSpec)
-MiniTest::Spec.register_spec_type(/Controller$/,  MiniTest::Rails::ControllerSpec)
-MiniTest::Spec.register_spec_type(/Helper$/,      MiniTest::Rails::HelperSpec)
+require "minitest/rails/helper"
+require "minitest/rails/mailer"

data/lib/minitest/rails/controller.rb

@@ -1,13 +1,10 @@
-require "minitest/rails/base"
+require "minitest/rails/spec"
 # require "action_controller"
 
 module MiniTest
   module Rails
-    class ControllerTestCase < TestCase
+    class Controller < Spec
       # include ActionController::TestCase::Behavior
     end
-
-    class ControllerSpec < Spec
-    end
   end
-end
+end

data/lib/minitest/rails/helper.rb

@@ -1,11 +1,8 @@
-require "minitest/rails/base"
+require "minitest/rails/spec"
 
 module MiniTest
   module Rails
-    class HelperTestCase < TestCase
-    end
-
-    class HelperSpec < Spec
+    class Helper < Spec
     end
   end
 end

data/lib/minitest/rails/mailer.rb

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

data/lib/minitest/rails/model.rb

@@ -1,17 +1,8 @@
-require "minitest/rails/base"
-# require "active_support/testing/setup_and_teardown"
-# require "active_record/fixtures"
+require "minitest/rails/spec"
 
 module MiniTest
   module Rails
-    class ModelTestCase < TestCase
-      # include ActiveSupport::Testing::SetupAndTeardown
-      # include ActiveRecord::TestFixtures
-      #
-      # self.fixture_path = File.join(Rails.root, "test", "fixtures")
-    end
-
-    class ModelSpec < Spec
+    class Model < Spec
     end
   end
 end

data/lib/minitest/rails/{base.rb → spec.rb}

@@ -4,10 +4,8 @@ require "minitest/mock"
 
 module MiniTest
   module Rails
-    class TestCase < ::MiniTest::Unit::TestCase
-    end
     class Spec < ::MiniTest::Spec
-      # alias :method_name :__name__ if defined? :__name__
+      alias :method_name :__name__ if defined? :__name__
     end
   end
 end

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

@@ -1,6 +1,6 @@
 require 'rake/testtask'
 
-MINITEST_TASKS = %w(models controllers views helpers integration)
+MINITEST_TASKS = %w(models controllers views helpers mailers integration)
 
 desc 'Runs all tests'
 task :test do

data/test/test_controller_generator.rb

@@ -4,7 +4,7 @@ require "minitest-rails"
 require "rails"
 require "rails/generators"
 
-require "generators/minitest/controller/controller_generator"
+require "generators/mini_test/controller/controller_generator"
 
 require "fileutils"
 
@@ -13,12 +13,13 @@ class TestControllerGenerator < MiniTest::Unit::TestCase
 
   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::ControllerTestCase/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
     # I agree, it would be better to mock the file getting written
@@ -27,12 +28,13 @@ 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"
     contents = open("test/controllers/user_controller_test.rb").read
-    assert_match(/describe UserController do/m, contents)
+    assert_match(/class UserControllerTest < MiniTest::Rails::Controller/m, contents)
+    assert_match(/it "must be a real test"/m, contents)
   ensure
     FileUtils.rm_r "test/controllers"
   end

data/test/test_helper_generator.rb

@@ -4,7 +4,7 @@ require "minitest-rails"
 require "rails"
 require "rails/generators"
 
-require "generators/minitest/helper/helper_generator"
+require "generators/mini_test/helper/helper_generator"
 
 require "fileutils"
 
@@ -13,12 +13,12 @@ class TestHelperGenerator < MiniTest::Unit::TestCase
 
   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::HelperTestCase/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,12 +27,12 @@ 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"
     contents = open("test/helpers/user_helper_test.rb").read
-    assert_match(/describe UserHelper do/m, contents)
+    assert_match(/class UserHelperTest < MiniTest::Rails::Helper/m, contents)
   ensure
     FileUtils.rm_r "test/helpers"
   end

data/test/test_install_generator.rb

@@ -4,7 +4,7 @@ require "minitest-rails"
 require "rails"
 require "rails/generators"
 
-require "generators/minitest/install/install_generator"
+require "generators/mini_test/install/install_generator"
 
 require "fileutils"
 
@@ -13,12 +13,12 @@ class TestInstallGenerator < MiniTest::Unit::TestCase
 
   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::TestCase/m, contents)
+    assert_match(/class MiniTest::Rails::Spec/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

@@ -0,0 +1,39 @@
+require "minitest/autorun"
+require "minitest-rails"
+
+require "rails"
+require "rails/generators"
+
+require "generators/mini_test/mailer/mailer_generator"
+
+require "fileutils"
+
+class TestMailerGenerator < MiniTest::Unit::TestCase
+  Rails::Generators.no_color!
+
+  def test_mailer_generator
+    text = capture(:stdout) do
+      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)
+  ensure
+    # TODO: Don"t write the files
+    # I agree, it would be better to mock the file getting written
+    FileUtils.rm_r "test/mailers"
+  end
+
+  def test_mailer_generator_spec
+    text = capture(:stdout) do
+      MiniTest::Generators::MailerGenerator.start ["notification", "--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(/class NotificationTest < MiniTest::Rails::Mailer/m, contents)
+  ensure
+    FileUtils.rm_r "test/mailers"
+  end
+end

data/test/test_model_generator.rb

@@ -4,7 +4,7 @@ require "minitest-rails"
 require "rails"
 require "rails/generators"
 
-require "generators/minitest/model/model_generator"
+require "generators/mini_test/model/model_generator"
 
 require "fileutils"
 
@@ -13,12 +13,12 @@ class TestModelGenerator < MiniTest::Unit::TestCase
 
   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::ModelTestCase/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,12 +27,12 @@ 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"
     contents = open("test/models/user_test.rb").read
-    assert_match(/describe User do/m, contents)
+    assert_match(/class UserTest < MiniTest::Rails::Model/m, contents)
   ensure
     FileUtils.rm_r "test/models"
   end

data/test/test_scaffold_generator.rb

@@ -0,0 +1,41 @@
+require "minitest/autorun"
+require "minitest-rails"
+
+require "rails"
+require "rails/generators"
+
+require "generators/mini_test/scaffold/scaffold_generator"
+
+require "fileutils"
+
+class TestScaffoldGenerator < MiniTest::Unit::TestCase
+  Rails::Generators.no_color!
+
+  def test_scaffold_generator
+    text = capture(:stdout) do
+      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)
+  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_scaffold_generator_spec
+    text = capture(:stdout) do
+      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(/class UserControllerTest < MiniTest::Rails::Controller/m, contents)
+    assert_match(/it "must get index"/m, contents)
+  ensure
+    FileUtils.rm_r "test/controllers"
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: minitest-rails
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors: 
 - Mike Moore
@@ -31,7 +31,7 @@ cert_chain:
   sgxAiQ==
   -----END CERTIFICATE-----
 
-date: 2011-06-03 00:00:00 Z
+date: 2011-06-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -52,7 +52,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.1.0.rc1
+        version: 3.1.0.rc2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -63,7 +63,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.1.0.rc1
+        version: 3.1.0.rc2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -74,7 +74,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.1.0.rc1
+        version: 3.1.0.rc2
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -103,31 +103,40 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- 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/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/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/minitest-rails.rb
 - lib/minitest/rails.rb
-- lib/minitest/rails/base.rb
 - lib/minitest/rails/controller.rb
 - lib/minitest/rails/helper.rb
+- lib/minitest/rails/mailer.rb
 - lib/minitest/rails/model.rb
+- lib/minitest/rails/spec.rb
 - lib/minitest/rails/tasks/minitest.rake
 - 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
 - .gemtest
 homepage: http://blowmage.com/minitest-rails
 licenses: []
@@ -161,5 +170,7 @@ 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

data/lib/generators/minitest/controller/templates/controller_spec.rb

@@ -1,7 +0,0 @@
-require "minitest_helper"
-
-describe <%= class_name %>Controller do
-  before do
-    @controller = <%= class_name %>Controller.new
-  end
-end

data/lib/generators/minitest/helper/templates/helper_spec.rb

@@ -1,7 +0,0 @@
-require "minitest_helper"
-
-describe <%= class_name %>Helper do
-  before do
-    @helper= <%= class_name %>Helper.new
-  end
-end

data/lib/generators/minitest/helper/templates/helper_test.rb

@@ -1,11 +0,0 @@
-require "minitest_helper"
-
-<% module_namespacing do -%>
-class <%= class_name %>HelperTest < MiniTest::Rails::HelperTestCase
-
-  def test_truth
-    assert true
-  end
-
-end
-<% end -%>

data/lib/generators/minitest/model/templates/model_test.rb

@@ -1,11 +0,0 @@
-require "minitest_helper"
-
-<% module_namespacing do -%>
-class <%= class_name %>Test < MiniTest::Rails::ModelTestCase
-
-  def test_truth
-    assert true
-  end
-
-end
-<% end -%>