minitest-rails 0.1 → 0.1.1

data/Manifest.txt

@@ -34,7 +34,10 @@ lib/minitest/rails/action_dispatch.rb
 lib/minitest/rails/action_mailer.rb
 lib/minitest/rails/action_view.rb
 lib/minitest/rails/active_support.rb
+lib/minitest/rails/declarative.rb
+lib/minitest/rails/mochaing.rb
 lib/minitest/rails/tasks/minitest.rake
+lib/minitest/rails/tasks/sub_test_task.rb
 minitest-rails.gemspec
 test/test_controller_generator.rb
 test/test_helper_generator.rb

data/README.rdoc

@@ -1,6 +1,6 @@
 = minitest-rails
 
-MiniTest integration for Rails 3.
+MiniTest integration for Rails 3.x
 
 == Install
 
@@ -75,6 +75,10 @@ And add the following to your test helper file:
 
 See the <tt>minitest-rails-capybara</tt> project for more information.
 
+== Incompatibilities
+
+Existing tests that call <tt>describe</tt> will not work, since <tt>describe</tt> is used by MiniTest::Spec blocks.
+
 == Get Involved
 
 Join the mailing list to get help or offer suggestions.

data/Rakefile

@@ -10,8 +10,8 @@ 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.x'
+  self.description = 'Adds MiniTest as the default testing library in Rails 3.x'
   self.urls        = ['http://blowmage.com/minitest-rails']
 
   self.history_file = "CHANGELOG.rdoc"

data/lib/generators/mini_test.rb

@@ -6,6 +6,13 @@ module MiniTest
       def self.source_root
         @_minitest_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'mini_test', generator_name, 'templates'))
       end
+
+      begin
+        # This method doesn't exist in Rails 3.0
+        def module_namespacing(&block)
+          yield if block_given?
+        end
+      end unless respond_to?(:module_namespacing)
     end
   end
 end

data/lib/minitest-rails.rb

@@ -3,7 +3,7 @@ require "minitest/unit"
 
 module MiniTest
   module Rails
-    VERSION = "0.1"
+    VERSION = "0.1.1"
     class Railtie < ::Rails::Railtie
       if ::Rails.version.to_f >= 3.1
         config.app_generators.integration_tool :mini_test

data/lib/minitest/rails/active_support.rb

@@ -2,10 +2,10 @@ require 'minitest/spec'
 require 'active_support/testing/setup_and_teardown'
 require 'active_support/testing/assertions'
 require 'active_support/testing/deprecation'
-require 'active_support/testing/declarative'
+require 'minitest/rails/declarative'
 require 'active_support/testing/pending'
 require 'active_support/testing/isolation'
-require 'active_support/testing/mochaing'
+require 'minitest/rails/mochaing'
 require 'active_support/core_ext/kernel/reporting'
 
 module MiniTest
@@ -42,15 +42,11 @@ module MiniTest
           yield if $tags[tag]
         end
 
-        def describe(*args, &block)
-          Kernel.describe(args, block)
-        end
-
         include ::ActiveSupport::Testing::SetupAndTeardown
         include ::ActiveSupport::Testing::Assertions
         include ::ActiveSupport::Testing::Deprecation
         include ::ActiveSupport::Testing::Pending
-        extend  ::ActiveSupport::Testing::Declarative
+        extend  Testing::Declarative
 
         # test/unit backwards compatibility methods
         alias :assert_raise :assert_raises

data/lib/minitest/rails/declarative.rb

@@ -0,0 +1,27 @@
+module MiniTest
+  module Rails
+    module ActiveSupport
+      module Testing
+        module Declarative
+
+          # test "verify something" do
+          #   ...
+          # end
+          def test(name, &block)
+            test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
+            defined = instance_method(test_name) rescue false
+            raise "#{test_name} is already defined in #{self}" if defined
+            if block_given?
+              define_method(test_name, &block)
+            else
+              define_method(test_name) do
+                flunk "No implementation provided for #{name}"
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/minitest/rails/mochaing.rb

@@ -0,0 +1,11 @@
+begin
+  require 'active_support/testing/mochaing'
+rescue LoadError
+  begin
+    silence_warnings { require 'mocha' }
+  rescue LoadError
+    # Fake Mocha::ExpectationError so we can rescue it in #run. Bleh.
+    Object.const_set :Mocha, Module.new
+    Mocha.const_set :ExpectationError, Class.new(StandardError)
+  end
+end

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

@@ -1,32 +1,61 @@
 require 'rake/testtask'
-require 'rails/test_unit/sub_test_task'
+require 'minitest/rails/tasks/sub_test_task'
 
-TASKS = %w(models controllers helpers mailers acceptance) #views
-MINITEST_TASKS = TASKS.map { |sub| "minitest:#{sub}" }
+# The default tests to run, update this list to change behavior
+MINITEST_TASKS = %w(models helpers controllers mailers acceptance) #views
+
+def all_directories_under_test
+  Dir['test/*/'].map {|dir| /test\/(.+?)\//.match(dir)[1] }
+end
+
+def all_minitest_directories
+  (MINITEST_TASKS + all_directories_under_test).uniq
+end
 
 desc "Runs minitest"
 task :test do
+  # Add to existing task if exists, or create new task otherwise
   Rake::Task['minitest'].invoke
 end
 
+namespace 'test' do
+  task :prepare do
+    # Define here in case test_unit isn't loaded
+  end
+end
+
 desc "Runs #{MINITEST_TASKS.join(", ")} together"
 task :minitest do
-  Rake::Task['minitest:run'].invoke
+  Rake::Task['minitest:default'].invoke
 end
 
 namespace 'minitest' do
 
-  task :prepare do
-    # Placeholder task for other Railtie and plugins to enhance. See Active Record for an example.
+  # Only run the default tasks defined in MINITEST_TASKS
+  task :default do
+    errors = MINITEST_TASKS.collect do |task|
+      begin
+        Rake::Task["minitest:#{task}"].invoke
+        nil
+      rescue => e
+        { :task => "minitest:#{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
 
-  task :run do
-    errors = MINITEST_TASKS.collect do |task|
+  # Run all tests in all the test directories
+  task :all do
+    errors = all_minitest_directories.collect do |task|
       begin
-        Rake::Task[task].invoke
+        Rake::Task["minitest:#{task}"].invoke
         nil
       rescue => e
-        { :task => task, :exception => e }
+        { :task => "minitest:#{task}", :exception => e }
       end
     end.compact
 
@@ -36,10 +65,10 @@ namespace 'minitest' do
     end
   end
 
-  TASKS.each do |sub|
-    Rails::SubTestTask.new(sub => 'minitest:prepare') do |t|
+  all_minitest_directories.each do |task|
+    MiniTest::Rails::Tasks::SubTestTask.new(task => 'test:prepare') do |t|
       t.libs.push 'test'
-      t.pattern = "test/#{sub}/**/*_test.rb"
+      t.pattern = "test/#{task}/**/*_test.rb"
     end
   end
 

data/lib/minitest/rails/tasks/sub_test_task.rb

@@ -0,0 +1,14 @@
+require 'rake/testtask'
+
+module MiniTest
+  module Rails
+    module Tasks
+      # Silence the default description to cut down on `rake -T` noise.
+      class SubTestTask < Rake::TestTask
+        def desc(string)
+          # Ignore the description.
+        end
+      end
+    end
+  end
+end

data/minitest-rails.gemspec

@@ -2,21 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = "minitest-rails"
-  s.version = "0.1.20120709115419"
+  s.version = "0.1.1.20120717012609"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Moore"]
-  s.date = "2012-07-09"
-  s.description = "Adds MiniTest as the default testing library in Rails 3."
+  s.date = "2012-07-17"
+  s.description = "Adds MiniTest as the default testing library in Rails 3.x"
   s.email = ["mike@blowmage.com"]
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "Manifest.txt", "README.rdoc"]
-  s.files = [".autotest", ".gemtest", "CHANGELOG.rdoc", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "lib/generators/mini_test.rb", "lib/generators/mini_test/controller/controller_generator.rb", "lib/generators/mini_test/controller/templates/controller_spec.rb", "lib/generators/mini_test/controller/templates/controller_test.rb", "lib/generators/mini_test/helper/helper_generator.rb", "lib/generators/mini_test/helper/templates/helper_spec.rb", "lib/generators/mini_test/helper/templates/helper_test.rb", "lib/generators/mini_test/install/install_generator.rb", "lib/generators/mini_test/install/templates/test/minitest_helper.rb", "lib/generators/mini_test/integration/integration_generator.rb", "lib/generators/mini_test/integration/templates/integration_spec.rb", "lib/generators/mini_test/integration/templates/integration_test.rb", "lib/generators/mini_test/mailer/mailer_generator.rb", "lib/generators/mini_test/mailer/templates/mailer_spec.rb", "lib/generators/mini_test/mailer/templates/mailer_test.rb", "lib/generators/mini_test/model/model_generator.rb", "lib/generators/mini_test/model/templates/fixtures.yml", "lib/generators/mini_test/model/templates/model_spec.rb", "lib/generators/mini_test/model/templates/model_test.rb", "lib/generators/mini_test/scaffold/scaffold_generator.rb", "lib/generators/mini_test/scaffold/templates/controller_spec.rb", "lib/generators/mini_test/scaffold/templates/controller_test.rb", "lib/minitest-rails.rb", "lib/minitest/rails.rb", "lib/minitest/rails/action_controller.rb", "lib/minitest/rails/action_dispatch.rb", "lib/minitest/rails/action_mailer.rb", "lib/minitest/rails/action_view.rb", "lib/minitest/rails/active_support.rb", "lib/minitest/rails/tasks/minitest.rake", "minitest-rails.gemspec", "test/test_controller_generator.rb", "test/test_helper_generator.rb", "test/test_install_generator.rb", "test/test_mailer_generator.rb", "test/test_minitest.rb", "test/test_model_generator.rb", "test/test_scaffold_generator.rb"]
+  s.files = [".autotest", ".gemtest", "CHANGELOG.rdoc", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "lib/generators/mini_test.rb", "lib/generators/mini_test/controller/controller_generator.rb", "lib/generators/mini_test/controller/templates/controller_spec.rb", "lib/generators/mini_test/controller/templates/controller_test.rb", "lib/generators/mini_test/helper/helper_generator.rb", "lib/generators/mini_test/helper/templates/helper_spec.rb", "lib/generators/mini_test/helper/templates/helper_test.rb", "lib/generators/mini_test/install/install_generator.rb", "lib/generators/mini_test/install/templates/test/minitest_helper.rb", "lib/generators/mini_test/integration/integration_generator.rb", "lib/generators/mini_test/integration/templates/integration_spec.rb", "lib/generators/mini_test/integration/templates/integration_test.rb", "lib/generators/mini_test/mailer/mailer_generator.rb", "lib/generators/mini_test/mailer/templates/mailer_spec.rb", "lib/generators/mini_test/mailer/templates/mailer_test.rb", "lib/generators/mini_test/model/model_generator.rb", "lib/generators/mini_test/model/templates/fixtures.yml", "lib/generators/mini_test/model/templates/model_spec.rb", "lib/generators/mini_test/model/templates/model_test.rb", "lib/generators/mini_test/scaffold/scaffold_generator.rb", "lib/generators/mini_test/scaffold/templates/controller_spec.rb", "lib/generators/mini_test/scaffold/templates/controller_test.rb", "lib/minitest-rails.rb", "lib/minitest/rails.rb", "lib/minitest/rails/action_controller.rb", "lib/minitest/rails/action_dispatch.rb", "lib/minitest/rails/action_mailer.rb", "lib/minitest/rails/action_view.rb", "lib/minitest/rails/active_support.rb", "lib/minitest/rails/declarative.rb", "lib/minitest/rails/mochaing.rb", "lib/minitest/rails/tasks/minitest.rake", "lib/minitest/rails/tasks/sub_test_task.rb", "minitest-rails.gemspec", "test/test_controller_generator.rb", "test/test_helper_generator.rb", "test/test_install_generator.rb", "test/test_mailer_generator.rb", "test/test_minitest.rb", "test/test_model_generator.rb", "test/test_scaffold_generator.rb"]
   s.homepage = "http://blowmage.com/minitest-rails"
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "minitest-rails"
   s.rubygems_version = "1.8.24"
-  s.summary = "MiniTest integration for Rails 3."
+  s.summary = "MiniTest integration for Rails 3.x"
   s.test_files = ["test/test_controller_generator.rb", "test/test_helper_generator.rb", "test/test_install_generator.rb", "test/test_mailer_generator.rb", "test/test_minitest.rb", "test/test_model_generator.rb", "test/test_scaffold_generator.rb"]
 
   if s.respond_to? :specification_version then

data/test/test_helper_generator.rb

@@ -18,7 +18,7 @@ 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::Unit::TestCase/m, contents)
+    assert_match(/class UserHelperTest < MiniTest::Rails::ActionView::TestCase/m, contents)
   ensure
     # TODO: Don"t write the files
     # I agree, it would be better to mock the file getting written
@@ -32,7 +32,7 @@ class TestHelperGenerator < MiniTest::Unit::TestCase
     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)
+    assert_match(/class Admin::UserHelperTest < MiniTest::Rails::ActionView::TestCase/m, contents)
   ensure
     FileUtils.rm_r "test/helpers"
   end
@@ -49,7 +49,7 @@ class TestHelperGenerator < MiniTest::Unit::TestCase
     FileUtils.rm_r "test/helpers"
   end
 
-  def test_helper_generator_spec
+  def test_namespaced_helper_generator_spec
     text = capture(:stdout) do
       MiniTest::Generators::HelperGenerator.start ["admin/user", "--spec"]
     end

data/test/test_model_generator.rb

@@ -44,16 +44,18 @@ class TestModelGenerator < MiniTest::Unit::TestCase
     text = capture(:stdout) do
       MiniTest::Generators::ModelGenerator.start ["user"]
     end
+    assert_match(/create  test\/fixtures\/users.yml/m,  text)
     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
+  def test_model_generator_skip_fixture
     text = capture(:stdout) do
       MiniTest::Generators::ModelGenerator.start ["user", "--skip-fixture"]
     end
+    refute_match(/create  test\/fixtures\/users.yml/m,  text)
     refute File.exists? "test/fixtures/users.yml"
   ensure
     FileUtils.rm_r "test/models"

data/test/test_scaffold_generator.rb

@@ -15,10 +15,10 @@ class TestScaffoldGenerator < MiniTest::Unit::TestCase
     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/m, contents)
+    assert_match(/create  test\/controllers\/users_controller_test.rb/m, text)
+    assert File.exists? "test/controllers/users_controller_test.rb"
+    contents = open("test/controllers/users_controller_test.rb").read
+    assert_match(/class UsersControllerTest/m, contents)
   ensure
     # TODO: Don"t write the files
     # I agree, it would be better to mock the file getting written
@@ -29,10 +29,10 @@ class TestScaffoldGenerator < MiniTest::Unit::TestCase
     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(/describe UserController do/m, contents)
+    assert_match(/create  test\/controllers\/users_controller_test.rb/m, text)
+    assert File.exists? "test/controllers/users_controller_test.rb"
+    contents = open("test/controllers/users_controller_test.rb").read
+    assert_match(/describe UsersController do/m, contents)
   ensure
     FileUtils.rm_r "test/controllers"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-rails
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-09 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -75,7 +75,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Adds MiniTest as the default testing library in Rails 3.
+description: Adds MiniTest as the default testing library in Rails 3.x
 email:
 - mike@blowmage.com
 executables: []
@@ -121,7 +121,10 @@ files:
 - lib/minitest/rails/action_mailer.rb
 - lib/minitest/rails/action_view.rb
 - lib/minitest/rails/active_support.rb
+- lib/minitest/rails/declarative.rb
+- lib/minitest/rails/mochaing.rb
 - lib/minitest/rails/tasks/minitest.rake
+- lib/minitest/rails/tasks/sub_test_task.rb
 - minitest-rails.gemspec
 - test/test_controller_generator.rb
 - test/test_helper_generator.rb
@@ -155,7 +158,7 @@ rubyforge_project: minitest-rails
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: MiniTest integration for Rails 3.
+summary: MiniTest integration for Rails 3.x
 test_files:
 - test/test_controller_generator.rb
 - test/test_helper_generator.rb