minitest-rails 0.1.0.alpha → 0.1.0.alpha2

data/README.rdoc

@@ -37,8 +37,9 @@ This will add the <tt>minitest_helper.rb</tt> file to the <tt>test</tt> director
 == 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.
-You can generate test files with the standard model, controller, scaffold, and other generators:
+Your test classes will inherit from MiniTest::Rails::ActiveSupport::TestCase a opposed to ActiveSupport::TestCase.
+You can use the MiniTest::Spec DSL.
+You can generate test files with the standard model, controller, resource, and other generators:
 
     rails generate model User
 
@@ -46,12 +47,18 @@ And you can specify generating the tests using the MiniTest::Spec DSL on any of
 
     rails generate model User --spec
 
-And you can specify generating the fixture for a model by providing the <tt>--fixture</tt> option:
+And you can specify not generating the fixture for a model by providing the <tt>--skip-fixture</tt> option:
 
-    rails generate model User --fixture
+    rails generate model User --skip-fixture
 
 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 :mini_test, :spec => true, :fixture => false
     end
+
+== Get Involved
+
+Join the mailing list to get help or offer suggestions.
+
+https://groups.google.com/forum/#!forum/minitest-rails

data/lib/generators/mini_test/controller/controller_generator.rb

@@ -10,9 +10,9 @@ module MiniTest
 
       def create_test_files
         if options[:spec]
-          template "controller_spec.rb", "test/controllers/#{file_name}_controller_test.rb"
+          template "controller_spec.rb", File.join("test/controllers", class_path, "#{file_name}_controller_test.rb")
         else
-          template "controller_test.rb", "test/controllers/#{file_name}_controller_test.rb"
+          template "controller_test.rb", File.join("test/controllers", class_path, "#{file_name}_controller_test.rb")
         end
       end
     end

data/lib/generators/mini_test/helper/helper_generator.rb

@@ -9,9 +9,9 @@ module MiniTest
 
       def create_test_files
         if options[:spec]
-          template "helper_spec.rb", "test/helpers/#{file_name}_helper_test.rb"
+          template "helper_spec.rb", File.join("test/helpers", class_path, "#{file_name}_helper_test.rb")
         else
-          template "helper_test.rb", "test/helpers/#{file_name}_helper_test.rb"
+          template "helper_test.rb", File.join("test/helpers", class_path, "#{file_name}_helper_test.rb")
         end
       end
     end

data/lib/generators/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::Unit::TestCase
 
   def test_sanity
     flunk "Need real tests"

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

@@ -7,6 +7,13 @@ require "minitest/rails"
 # Uncomment if you want awesome colorful output
 # require "minitest/pride"
 
+class MiniTest::Rails::ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end
+
 # 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"`

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

@@ -9,9 +9,9 @@ module MiniTest
 
       def create_test_files
         if options[:spec]
-          template 'integration_spec.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")
+          template 'integration_spec.rb', File.join('test/acceptance', class_path, "#{file_name}_test.rb")
         else
-          template 'integration_test.rb', File.join('test/integration', class_path, "#{file_name}_test.rb")
+          template 'integration_test.rb', File.join('test/acceptance', class_path, "#{file_name}_test.rb")
         end
       end
     end

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

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

data/lib/generators/mini_test/model/model_generator.rb

@@ -3,8 +3,8 @@ require "generators/mini_test"
 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"
+      argument     :attributes, :type => :array,   :default => [],    :banner => "field:type field:type"
+      class_option :fixture,    :type => :boolean, :default => true,  :desc => "Create fixture file"
       class_option :spec,       :type => :boolean, :default => false, :desc => "Use MiniTest::Spec DSL"
 
       check_class_collision :suffix => "Test"

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

@@ -12,9 +12,9 @@ module MiniTest
 
       def create_test_files
         if options[:spec]
-          template "controller_spec.rb", "test/controllers/#{file_name}_controller_test.rb"
+          template "controller_spec.rb", File.join("test/controllers", class_path, "#{file_name}_controller_test.rb")
         else
-          template "controller_test.rb", "test/controllers/#{file_name}_controller_test.rb"
+          template "controller_test.rb", File.join("test/controllers", class_path, "#{file_name}_controller_test.rb")
         end
       end
     end

data/lib/minitest-rails.rb

@@ -3,7 +3,7 @@ require "minitest/unit"
 
 module MiniTest
   module Rails
-    VERSION = "0.1.0.alpha"
+    VERSION = "0.1.0.alpha2"
     class Railtie < ::Rails::Railtie
       config.app_generators.integration_tool :mini_test
       config.app_generators.test_framework :mini_test

data/lib/minitest/rails.rb

@@ -9,8 +9,7 @@ require "minitest/rails/action_dispatch"
 
 # Enable turn if it is available
 begin
-  require 'turn'
-  MiniTest::Unit.use_natural_language_case_names = true
+  require 'turn/autorun'
 rescue LoadError
 end
 
@@ -23,7 +22,7 @@ if defined?(ActiveRecord::Base)
   MiniTest::Rails::ActionDispatch::IntegrationTest.fixture_path = MiniTest::Rails::ActiveSupport::TestCase.fixture_path
 
   def create_fixtures(*table_names, &block)
-    Fixtures.create_fixtures(MiniTest::Rails::ActiveSupport::TestCase.fixture_path, table_names, {}, &block)
+    ActiveRecord::Fixtures.create_fixtures(MiniTest::Rails::ActiveSupport::TestCase.fixture_path, table_names, {}, &block)
   end
 end
 

data/lib/minitest/rails/action_dispatch.rb

@@ -17,5 +17,5 @@ module MiniTest
 end
 
 # Register by name
-MiniTest::Spec.register_spec_type(/IntegrationTest$/,  MiniTest::Rails::ActionDispatch::IntegrationTest)
-MiniTest::Spec.register_spec_type(/Integration Test$/, MiniTest::Rails::ActionDispatch::IntegrationTest)
+MiniTest::Spec.register_spec_type(/AcceptanceTest$/,  MiniTest::Rails::ActionDispatch::IntegrationTest)
+MiniTest::Spec.register_spec_type(/Acceptance Test$/, MiniTest::Rails::ActionDispatch::IntegrationTest)

data/lib/minitest/rails/active_support.rb

@@ -20,9 +20,17 @@ module MiniTest
           assert yield, msg
         end
 
-        # Use AS::TestCase for the base class when describing a model
-        register_spec_type(self) do |desc|
-          desc < ActiveRecord::Base
+        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
@@ -40,6 +48,10 @@ module MiniTest
           :sorted
         end
 
+        def describe(*args, &block)
+          Kernel.describe(args, block)
+        end
+
         include ::ActiveSupport::Testing::SetupAndTeardown
         include ::ActiveSupport::Testing::Assertions
         include ::ActiveSupport::Testing::Deprecation

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

@@ -1,29 +1,42 @@
 require 'rake/testtask'
+require 'rails/test_unit/sub_test_task'
 
-MINITEST_TASKS = %w(models controllers helpers mailers integration) #views
+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
-  task :prepare do
-    # Placeholder task for other Railtie and plugins to enhance. See Active Record for an example.
+namespace 'minitest' do
+
+  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
 
-  MINITEST_TASKS.each do |sub|
-    Rake::TestTask.new(sub => 'test:prepare') do |t|
-      t.libs << 'test'
+  TASKS.each do |sub|
+    Rails::SubTestTask.new(sub => 'test:prepare') do |t|
+      t.libs.push 'test'
       t.pattern = "test/#{sub}/**/*_test.rb"
     end
   end
+
 end

data/minitest-rails.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "minitest-rails"
-  s.version = "0.1.0.alpha.20120525143907"
+  s.version = "0.1.0.alpha2.20120706021507"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Moore"]
-  s.date = "2012-05-25"
+  s.date = "2012-07-06"
   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"]

data/test/test_controller_generator.rb

@@ -25,6 +25,18 @@ class TestControllerGenerator < MiniTest::Unit::TestCase
     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"]
@@ -36,4 +48,17 @@ class TestControllerGenerator < MiniTest::Unit::TestCase
   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

@@ -18,13 +18,25 @@ class TestHelperGenerator < MiniTest::Unit::TestCase
     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"]
@@ -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_model_generator.rb

@@ -23,6 +23,7 @@ class TestModelGenerator < MiniTest::Unit::TestCase
     # 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
@@ -31,8 +32,29 @@ class TestModelGenerator < MiniTest::Unit::TestCase
     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)
+  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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha
+  version: 0.1.0.alpha2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70157709898300 !ruby/object:Gem::Requirement
+  requirement: &70311455892940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70157709898300
+  version_requirements: *70311455892940
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70157709897860 !ruby/object:Gem::Requirement
+  requirement: &70311455892500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70157709897860
+  version_requirements: *70311455892500
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70157709897420 !ruby/object:Gem::Requirement
+  requirement: &70311455892060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70157709897420
+  version_requirements: *70311455892060
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70157709896980 !ruby/object:Gem::Requirement
+  requirement: &70311455891620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70157709896980
+  version_requirements: *70311455891620
 description: Adds MiniTest as the default testing library in Rails 3.
 email:
 - mike@blowmage.com