minitest-rails 0.1.2 → 0.1.3

data/lib/minitest/rails/action_controller.rb

@@ -14,6 +14,47 @@ module MiniTest
         register_spec_type(/Controller( ?Test)?\z/i, self)
 
         include ::ActionController::TestCase::Behavior
+
+        def self.determine_default_controller_class(name)
+          # Override this method to support nested describes
+          #
+          # describe WidgetsController do
+          #   describe "index" do
+          #     it "is successful" do
+          #       assert_response :success
+          #     end
+          #   end
+          # end
+          #
+          # Original implementation:
+          # name.sub(/Test$/, '').safe_constantize
+          # safe_constantize is not supported in Rails 3.0...
+          ControllerLookup.find name
+        end
+      end
+
+      module ControllerLookup
+        def self.find controller
+          # HACK: I don't love this implementation
+          # Please suggest a better one!
+          names = controller.split "::"
+          controller = while names.size > 0 do
+            # Remove "Test" if present
+            names.last.sub! /Test$/, ''
+            begin
+              constant = names.join("::").constantize
+              break(constant) if constant
+            rescue NameError
+              # do nothing
+            ensure
+              names.pop
+            end
+          end
+          if controller.nil?
+            raise ::NameError.new("Unable to resolve controller for #{name}")
+          end
+          controller
+        end
       end
     end
   end

data/lib/minitest/rails/active_support.rb

@@ -1,4 +1,8 @@
 require 'minitest/spec'
+
+# I hate this! Be sure you have installed minitest_tu_shim
+require "test/unit" if RUBY_VERSION < "1.9"
+
 require 'active_support/testing/setup_and_teardown'
 require 'active_support/testing/assertions'
 require 'active_support/testing/deprecation'

data/minitest-rails.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = "minitest-rails"
-  s.version = "0.1.2.20120726190745"
+  s.version = "0.1.3.20120802091804"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Moore"]
-  s.date = "2012-07-27"
+  s.date = "2012-08-02"
   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", ".travis.yml", "CHANGELOG.rdoc", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "gemfiles/3.0.gemfile", "gemfiles/3.1.gemfile", "gemfiles/3.2.gemfile", "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/generators/test_controller_generator.rb", "test/generators/test_helper_generator.rb", "test/generators/test_install_generator.rb", "test/generators/test_mailer_generator.rb", "test/generators/test_model_generator.rb", "test/generators/test_scaffold_generator.rb", "test/rails/test_action_controller_spec_type.rb", "test/rails/test_action_dispatch_spec_type.rb", "test/rails/test_action_mailer_spec_type.rb", "test/rails/test_action_view_spec_type.rb", "test/test_minitest.rb"]
+  s.files = [".autotest", ".gemtest", ".travis.yml", "CHANGELOG.rdoc", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "gemfiles/3.0.gemfile", "gemfiles/3.0.gemfile.lock", "gemfiles/3.1.gemfile", "gemfiles/3.1.gemfile.lock", "gemfiles/3.2.gemfile", "gemfiles/3.2.gemfile.lock", "gemfiles/minitest_tu_shim.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/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/generators/test_controller_generator.rb", "test/generators/test_helper_generator.rb", "test/generators/test_install_generator.rb", "test/generators/test_mailer_generator.rb", "test/generators/test_model_generator.rb", "test/generators/test_scaffold_generator.rb", "test/rails/action_controller/test_controller_lookup.rb", "test/rails/action_controller/test_controllers.rb", "test/rails/action_controller/test_spec_type.rb", "test/rails/test_action_dispatch_spec_type.rb", "test/rails/test_action_mailer_spec_type.rb", "test/rails/test_action_view_spec_type.rb", "test/test_minitest.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.x"
-  s.test_files = ["test/generators/test_controller_generator.rb", "test/generators/test_helper_generator.rb", "test/generators/test_install_generator.rb", "test/generators/test_mailer_generator.rb", "test/generators/test_model_generator.rb", "test/generators/test_scaffold_generator.rb", "test/rails/test_action_controller_spec_type.rb", "test/rails/test_action_dispatch_spec_type.rb", "test/rails/test_action_mailer_spec_type.rb", "test/rails/test_action_view_spec_type.rb", "test/test_minitest.rb"]
+  s.test_files = ["test/generators/test_controller_generator.rb", "test/generators/test_helper_generator.rb", "test/generators/test_install_generator.rb", "test/generators/test_mailer_generator.rb", "test/generators/test_model_generator.rb", "test/generators/test_scaffold_generator.rb", "test/rails/action_controller/test_controller_lookup.rb", "test/rails/action_controller/test_controllers.rb", "test/rails/action_controller/test_spec_type.rb", "test/rails/test_action_dispatch_spec_type.rb", "test/rails/test_action_mailer_spec_type.rb", "test/rails/test_action_view_spec_type.rb", "test/test_minitest.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -26,17 +26,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<minitest>, ["~> 3.0"])
       s.add_runtime_dependency(%q<rails>, ["~> 3.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_development_dependency(%q<fakefs>, ["~> 0.4"])
       s.add_development_dependency(%q<hoe>, ["~> 3.0"])
     else
       s.add_dependency(%q<minitest>, ["~> 3.0"])
       s.add_dependency(%q<rails>, ["~> 3.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.10"])
+      s.add_dependency(%q<fakefs>, ["~> 0.4"])
       s.add_dependency(%q<hoe>, ["~> 3.0"])
     end
   else
     s.add_dependency(%q<minitest>, ["~> 3.0"])
     s.add_dependency(%q<rails>, ["~> 3.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.10"])
+    s.add_dependency(%q<fakefs>, ["~> 0.4"])
     s.add_dependency(%q<hoe>, ["~> 3.0"])
   end
 end

data/test/generators/test_controller_generator.rb

@@ -6,59 +6,66 @@ require "rails/generators"
 
 require "generators/mini_test/controller/controller_generator"
 
-require "fileutils"
+require "fakefs/safe"
+
+class FakeFS::File
+  def self.binread file
+    File.open(file, "rb") { |f| f.read }
+  end
+end
 
 class TestControllerGenerator < MiniTest::Unit::TestCase
-  Rails::Generators.no_color!
+  def setup
+    Rails::Generators.no_color!
+    FakeFS.activate!
+    FakeFS::FileSystem.clone "lib/generators"
+  end
+
+  def teardown
+    FakeFS::FileSystem.clear
+    FakeFS.deactivate!
+  end
 
   def test_controller_generator
-    text = capture(:stdout) do
+    out, err = capture_io do
       MiniTest::Generators::ControllerGenerator.start ["user"]
     end
-    assert_match(/create  test\/controllers\/user_controller_test.rb/m, text)
+    assert_match(/create  test\/controllers\/user_controller_test.rb/m, out)
     assert File.exists? "test/controllers/user_controller_test.rb"
-    contents = open("test/controllers/user_controller_test.rb").read
+    contents = File.read "test/controllers/user_controller_test.rb"
     assert_match(/class UserControllerTest/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_namespaced_controller_generator
-    text = capture(:stdout) do
+    out, err = capture_io do
       MiniTest::Generators::ControllerGenerator.start ["admin/user"]
     end
-    assert_match(/create  test\/controllers\/admin\/user_controller_test.rb/m, text)
+    assert_match(/create  test\/controllers\/admin\/user_controller_test.rb/m, out)
     assert File.exists? "test/controllers/admin/user_controller_test.rb"
-    contents = open("test/controllers/admin/user_controller_test.rb").read
+    contents = File.read "test/controllers/admin/user_controller_test.rb"
     assert_match(/class Admin::UserControllerTest/m, contents)
-  ensure
-    FileUtils.rm_r "test/controllers"
   end
 
   def test_controller_generator_spec
-    text = capture(:stdout) do
+    out, err = capture_io do
       MiniTest::Generators::ControllerGenerator.start ["user", "--spec"]
     end
-    assert_match(/create  test\/controllers\/user_controller_test.rb/m, text)
+    assert_match(/create  test\/controllers\/user_controller_test.rb/m, out)
     assert File.exists? "test/controllers/user_controller_test.rb"
-    contents = open("test/controllers/user_controller_test.rb").read
+    contents = File.read "test/controllers/user_controller_test.rb"
     assert_match(/describe UserController do/m, contents)
-  ensure
-    FileUtils.rm_r "test/controllers"
   end
 
   def test_namespaced_controller_generator_spec
-    text = capture(:stdout) do
-      MiniTest::Generators::ControllerGenerator.start ["admin/user", "--spec"]
+    FakeFS do
+      out, err = capture_io do
+        MiniTest::Generators::ControllerGenerator.start ["admin/user", "--spec"]
+      end
+      assert_match(/create  test\/controllers\/admin\/user_controller_test.rb/m, out)
+      assert File.exists? "test/controllers/admin/user_controller_test.rb"
+      contents = File.read "test/controllers/admin/user_controller_test.rb"
+      assert_match(/describe Admin::UserController do/m, contents)
     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/generators/test_helper_generator.rb

@@ -6,59 +6,64 @@ require "rails/generators"
 
 require "generators/mini_test/helper/helper_generator"
 
-require "fileutils"
+require "fakefs/safe"
+
+class FakeFS::File
+  def self.binread file
+    File.open(file, "rb") { |f| f.read }
+  end
+end
 
 class TestHelperGenerator < MiniTest::Unit::TestCase
-  Rails::Generators.no_color!
+  def setup
+    Rails::Generators.no_color!
+    FakeFS.activate!
+    FakeFS::FileSystem.clone "lib/generators"
+  end
+
+  def teardown
+    FakeFS::FileSystem.clear
+    FakeFS.deactivate!
+  end
 
   def test_helper_generator
-    text = capture(:stdout) do
+    out, err = capture_io do
       MiniTest::Generators::HelperGenerator.start ["user"]
     end
-    assert_match(/create  test\/helpers\/user_helper_test.rb/m, text)
+    assert_match(/create  test\/helpers\/user_helper_test.rb/m, out)
     assert File.exists? "test/helpers/user_helper_test.rb"
-    contents = open("test/helpers/user_helper_test.rb").read
+    contents = File.read "test/helpers/user_helper_test.rb"
     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
-    FileUtils.rm_r "test/helpers"
   end
 
   def test_namespaced_helper_generator
-    text = capture(:stdout) do
+    out, err = capture_io do
       MiniTest::Generators::HelperGenerator.start ["admin/user"]
     end
-    assert_match(/create  test\/helpers\/admin\/user_helper_test.rb/m, text)
+    assert_match(/create  test\/helpers\/admin\/user_helper_test.rb/m, out)
     assert File.exists? "test/helpers/admin/user_helper_test.rb"
-    contents = open("test/helpers/admin/user_helper_test.rb").read
+    contents = File.read "test/helpers/admin/user_helper_test.rb"
     assert_match(/class Admin::UserHelperTest < MiniTest::Rails::ActionView::TestCase/m, contents)
-  ensure
-    FileUtils.rm_r "test/helpers"
   end
 
   def test_helper_generator_spec
-    text = capture(:stdout) do
+    out, err = capture_io do
       MiniTest::Generators::HelperGenerator.start ["user", "--spec"]
     end
-    assert_match(/create  test\/helpers\/user_helper_test.rb/m, text)
+    assert_match(/create  test\/helpers\/user_helper_test.rb/m, out)
     assert File.exists? "test/helpers/user_helper_test.rb"
-    contents = open("test/helpers/user_helper_test.rb").read
+    contents = File.read "test/helpers/user_helper_test.rb"
     assert_match(/describe UserHelper do/m, contents)
-  ensure
-    FileUtils.rm_r "test/helpers"
   end
 
   def test_namespaced_helper_generator_spec
-    text = capture(:stdout) do
+    out, err = capture_io do
       MiniTest::Generators::HelperGenerator.start ["admin/user", "--spec"]
     end
-    assert_match(/create  test\/helpers\/admin\/user_helper_test.rb/m, text)
+    assert_match(/create  test\/helpers\/admin\/user_helper_test.rb/m, out)
     assert File.exists? "test/helpers/admin/user_helper_test.rb"
-    contents = open("test/helpers/admin/user_helper_test.rb").read
+    contents = File.read "test/helpers/admin/user_helper_test.rb"
     assert_match(/describe Admin::UserHelper do/m, contents)
-  ensure
-    FileUtils.rm_r "test/helpers"
   end
 
 end

data/test/generators/test_install_generator.rb

@@ -6,23 +6,34 @@ require "rails/generators"
 
 require "generators/mini_test/install/install_generator"
 
-require "fileutils"
+require "fakefs/safe"
+
+class FakeFS::File
+  def self.binread file
+    File.open(file, "rb") { |f| f.read }
+  end
+end
 
 class TestInstallGenerator < MiniTest::Unit::TestCase
-  Rails::Generators.no_color!
+  def setup
+    Rails::Generators.no_color!
+    FakeFS.activate!
+    FakeFS::FileSystem.clone "lib/generators"
+  end
+
+  def teardown
+    FakeFS::FileSystem.clear
+    FakeFS.deactivate!
+  end
 
   def test_install_generator
-    text = capture(:stdout) do
+    out, err = capture_io do
       MiniTest::Generators::InstallGenerator.start
     end
-    assert_match(/create  test\/minitest_helper.rb/m, text)
+    assert_match(/create  test\/minitest_helper.rb/m, out)
     assert File.exists? "test/minitest_helper.rb"
-    contents = open("test/minitest_helper.rb").read
+    contents = File.read "test/minitest_helper.rb"
     assert_match(/require "minitest\/autorun"/m, contents)
     assert_match(/require "minitest\/rails"/m, contents)
-  ensure
-    # TODO: Don"t write the files
-    # I agree, it would be better to mock the file getting written
-    FileUtils.rm "test/minitest_helper.rb"
   end
 end

data/test/generators/test_mailer_generator.rb

@@ -6,34 +6,43 @@ require "rails/generators"
 
 require "generators/mini_test/mailer/mailer_generator"
 
-require "fileutils"
+require "fakefs/safe"
+
+class FakeFS::File
+  def self.binread file
+    File.open(file, "rb") { |f| f.read }
+  end
+end
 
 class TestMailerGenerator < MiniTest::Unit::TestCase
-  Rails::Generators.no_color!
+  def setup
+    Rails::Generators.no_color!
+    FakeFS.activate!
+    FakeFS::FileSystem.clone "lib/generators"
+  end
+
+  def teardown
+    FakeFS::FileSystem.clear
+    FakeFS.deactivate!
+  end
 
   def test_mailer_generator
-    text = capture(:stdout) do
+    out, err = capture_io do
       MiniTest::Generators::MailerGenerator.start ["notification"]
     end
-    assert_match(/create  test\/mailers\/notification_test.rb/m, text)
+    assert_match(/create  test\/mailers\/notification_test.rb/m, out)
     assert File.exists? "test/mailers/notification_test.rb"
-    contents = open("test/mailers/notification_test.rb").read
+    contents = File.read "test/mailers/notification_test.rb"
     assert_match(/class NotificationTest/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
+    out, err = capture_io do
       MiniTest::Generators::MailerGenerator.start ["notification", "welcome", "--spec"]
     end
-    assert_match(/create  test\/mailers\/notification_test.rb/m, text)
+    assert_match(/create  test\/mailers\/notification_test.rb/m, out)
     assert File.exists? "test/mailers/notification_test.rb"
-    contents = open("test/mailers/notification_test.rb").read
+    contents = File.read "test/mailers/notification_test.rb"
     assert_match(/describe Notification do/m, contents)
-  ensure
-    FileUtils.rm_r "test/mailers"
   end
 end

data/test/generators/test_model_generator.rb

@@ -6,58 +6,60 @@ require "rails/generators"
 
 require "generators/mini_test/model/model_generator"
 
-require "fileutils"
+require "fakefs/safe"
+
+class FakeFS::File
+  def self.binread file
+    File.open(file, "rb") { |f| f.read }
+  end
+end
 
 class TestModelGenerator < MiniTest::Unit::TestCase
-  Rails::Generators.no_color!
+  def setup
+    Rails::Generators.no_color!
+    FakeFS.activate!
+    FakeFS::FileSystem.clone "lib/generators"
+  end
+
+  def teardown
+    FakeFS::FileSystem.clear
+    FakeFS.deactivate!
+  end
 
   def test_model_generator
-    text = capture(:stdout) do
+    out, err = capture_io do
       MiniTest::Generators::ModelGenerator.start ["user"]
     end
-    assert_match(/create  test\/models\/user_test.rb/m, text)
+    assert_match(/create  test\/models\/user_test.rb/m, out)
     assert File.exists? "test/models/user_test.rb"
-    contents = open("test/models/user_test.rb").read
+    contents = File.read "test/models/user_test.rb"
     assert_match(/class UserTest/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/models"
-    FileUtils.rm_r "test/fixtures"
   end
 
   def test_model_generator_spec
-    text = capture(:stdout) do
+    out, err = capture_io do
       MiniTest::Generators::ModelGenerator.start ["user", "--spec"]
     end
-    assert_match(/create  test\/models\/user_test.rb/m, text)
+    assert_match(/create  test\/models\/user_test.rb/m, out)
     assert File.exists? "test/models/user_test.rb"
     assert File.exists? "test/fixtures/users.yml"
-    contents = open("test/models/user_test.rb").read
+    contents = File.read "test/models/user_test.rb"
     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
+    out, err = capture_io do
       MiniTest::Generators::ModelGenerator.start ["user"]
     end
-    assert_match(/create  test\/fixtures\/users.yml/m,  text)
+    assert_match(/create  test\/fixtures\/users.yml/m, out)
     assert File.exists? "test/fixtures/users.yml"
-  ensure
-    FileUtils.rm_r "test/models"
-    FileUtils.rm_r "test/fixtures"
   end
 
   def test_model_generator_skip_fixture
-    text = capture(:stdout) do
+    out, err = capture_io do
       MiniTest::Generators::ModelGenerator.start ["user", "--skip-fixture"]
     end
-    refute_match(/create  test\/fixtures\/users.yml/m,  text)
+    refute_match(/create  test\/fixtures\/users.yml/m, out)
     refute File.exists? "test/fixtures/users.yml"
-  ensure
-    FileUtils.rm_r "test/models"
   end
 end