minitest-rails 0.0.7 → 0.1.0.alpha

data/Manifest.txt

@@ -3,34 +3,36 @@ 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/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/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/controller.rb
-lib/minitest/rails/fixtures.rb
-lib/minitest/rails/helper.rb
-lib/minitest/rails/mailer.rb
-lib/minitest/rails/model.rb
-lib/minitest/rails/spec.rb
+lib/minitest/rails/action_controller.rb
+lib/minitest/rails/action_dispatch.rb
+lib/minitest/rails/action_mailer.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

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 minitest:install
+    rails generate mini_test: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 :minitest, :spec => true, :fixture => true
+      g.test_framework :mini_test, :spec => true, :fixture => true
     end

data/Rakefile

@@ -10,15 +10,15 @@ 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.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.12']
+  extra_deps << ['minitest',  '~> 3.0']
   extra_deps << ['rails',     '~> 3.1']
 end
 

data/lib/generators/{minitest.rb → mini_test.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__), '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,10 +1,10 @@
-require "generators/minitest"
+require "generators/mini_test"
 
-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/{minitest/controller/templates/controller_test.rb → mini_test/controller/templates/controller_spec.rb}

@@ -1,15 +1,14 @@
 require "minitest_helper"
 
 <% module_namespacing do -%>
-class <%= class_name %>ControllerTest < Minitest::Rails::Controller
-
+describe <%= class_name %>Controller do
 <% if actions.empty? -%>
-  def test_sanity
-    flunk "Need real tests"
-  end
+  # it "must be a real test" do
+  #   flunk "Need real tests"
+  # end
 <% else -%>
 <% actions.each do |action| -%>
-  def test_<%= action %>
+  it "should get <%= action %>" do
     get :<%= action %>
     assert_response :success
   end
@@ -17,4 +16,4 @@ class <%= class_name %>ControllerTest < Minitest::Rails::Controller
 <% end -%>
 <% end -%>
 end
-<% end -%>
+<% end -%>

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

@@ -0,0 +1,19 @@
+require "minitest_helper"
+
+<% module_namespacing do -%>
+class <%= class_name %>ControllerTest < MiniTest::Rails::ActionController::TestCase
+<% if actions.empty? -%>
+  # test "the truth" do
+  #   assert true
+  # end
+<% else -%>
+<% actions.each do |action| -%>
+  test "should get <%= action %>" do
+    get :<%= action %>
+    assert_response :success
+  end
+
+<% end -%>
+<% end -%>
+end
+<% end -%>

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

@@ -1,9 +1,9 @@
-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"
+      class_option :spec,    :type => :boolean, :default => false, :desc   => "Use MiniTest::Spec DSL"
 
       check_class_collision :suffix => "HelperTest"
 

data/lib/generators/{minitest → mini_test}/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/{minitest → mini_test}/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/mini_test/install/templates/test/minitest_helper.rb

@@ -0,0 +1,15 @@
+ENV["RAILS_ENV"] = "test"
+require File.expand_path('../../config/environment', __FILE__)
+
+require "minitest/autorun"
+require "minitest/rails"
+
+# Uncomment if you want awesome colorful output
+# require "minitest/pride"
+
+# Do you want all existing Rails tests to use MiniTest::Rails?
+# Comment out the following and either:
+# A) Change the require on the existing tests to `require "minitest_helper"`
+# B) Require this file's code in test_helper.rb
+
+# ::ActiveSupport::TestCase = MiniTest::Rails::ActiveSupport::TestCase

data/lib/generators/mini_test/integration/integration_generator.rb

@@ -0,0 +1,19 @@
+require "generators/mini_test"
+
+module MiniTest
+  module Generators
+    class IntegrationGenerator < Base
+      class_option :spec, :type => :boolean, :default => false, :desc => "Use MiniTest::Spec DSL"
+
+      check_class_collision :suffix => "Test"
+
+      def create_test_files
+        if options[:spec]
+          template 'integration_spec.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")
+        else
+          template 'integration_test.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")
+        end
+      end
+    end
+  end
+end

data/lib/generators/mini_test/integration/templates/integration_spec.rb

@@ -0,0 +1,8 @@
+require "minitest_helper"
+
+# To be handled correctly this spec must end with "Integration Test"
+describe "<%= class_name %> Integration Test" do
+  # it "must be a real test" do
+  #   flunk "Need real tests"
+  # end
+end

data/lib/generators/mini_test/integration/templates/integration_test.rb

@@ -0,0 +1,7 @@
+require "minitest_helper"
+
+class <%= class_name %>Test < MiniTest::Rails::ActionDispatch::IntegrationTest
+  # test "the truth" do
+  #   assert true
+  # end
+end

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

@@ -1,10 +1,10 @@
-require "generators/minitest"
+require "generators/mini_test"
 
-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/{minitest → mini_test}/mailer/templates/mailer_spec.rb

@@ -1,7 +1,7 @@
 require "minitest_helper"
 
+<% module_namespacing do -%>
 describe <%= class_name %> do
-
 <% actions.each do |action| -%>
   it "<%= action %>" do
     mail = <%= class_name %>.<%= action %>
@@ -16,5 +16,5 @@ describe <%= class_name %> do
     flunk "Need real tests"
   end
 <% end -%>
-
 end
+<% end -%>

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

@@ -1,9 +1,9 @@
 require "minitest_helper"
 
 <% module_namespacing do -%>
-class <%= class_name %>Test < Minitest::Rails::Mailer
+class <%= class_name %>Test < MiniTest::Rails::ActionMailer::TestCase
 <% actions.each do |action| -%>
-  def test_<%= action %>
+  test "<%= action %>" do
     mail = <%= class_name %>.<%= action %>
     assert_equal <%= action.to_s.humanize.inspect %>, mail.subject
     assert_equal ["to@example.org"], mail.to
@@ -13,9 +13,9 @@ class <%= class_name %>Test < Minitest::Rails::Mailer
 
 <% end -%>
 <% if actions.blank? -%>
-  def test_sanity
-    flunk "Need real tests"
-  end
+  # test "the truth" do
+  #   assert true
+  # end
 <% end -%>
 end
 <% end -%>

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

@@ -1,11 +1,11 @@
-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"
       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/model/templates/model_spec.rb

@@ -0,0 +1,13 @@
+require "minitest_helper"
+
+<% module_namespacing do -%>
+describe <%= class_name %> do
+  before do
+    @<%= file_name %> = <%= class_name %>.new
+  end
+
+  it "must be valid" do
+    @<%= file_name %>.valid?.must_equal true
+  end
+end
+<% end -%>

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

@@ -0,0 +1,9 @@
+require "minitest_helper"
+
+<% module_namespacing do -%>
+class <%= class_name %>Test < MiniTest::Rails::ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
+<% end -%>

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

@@ -1,12 +1,12 @@
-require "generators/minitest"
+require "generators/mini_test"
 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/{minitest → mini_test}/scaffold/templates/controller_spec.rb

@@ -3,12 +3,8 @@ require "minitest_helper"
 <% module_namespacing do -%>
 describe <%= class_name %>Controller do
 
-  subject { <%= class_name %>Controller }
-
-  # fixtures :all
-
   before do
-    @<%= singular_table_name %> = <%= table_name %>(:one)
+    @<%= singular_table_name %> = <%= class_name %>.new
   end
 
   it "must get index" do

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

@@ -1,9 +1,10 @@
 require "minitest_helper"
 
 <% module_namespacing do -%>
-class <%= class_name %>ControllerTest < Minitest::Rails::Controller
+class <%= class_name %>ControllerTest < MiniTest::Rails::ActionController::TestCase
+
   before do
-    @<%= singular_table_name %> = <%= table_name %>(:one)
+    @<%= singular_table_name %> = <%= class_name %>.new
   end
 
   def test_index

data/lib/minitest-rails.rb

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