minitest-rails 0.3 → 0.5

data/test/generators/test_helper_generator.rb

@@ -1,66 +1,39 @@
-require "minitest/autorun"
-require "minitest-rails"
-
-require "rails"
-require "rails/generators"
-
+require "helper"
 require "generators/mini_test/helper/helper_generator"
 
-require "fakefs/safe"
-
-class FakeFS::File
-  def self.binread file
-    File.open(file, "rb") { |f| f.read }
-  end
-end
-
-class TestHelperGenerator < MiniTest::Unit::TestCase
-  def setup
-    Rails::Generators.no_color!
-    FakeFS.activate!
-    FakeFS::FileSystem.clone "lib/generators"
-  end
-
-  def teardown
-    FakeFS::FileSystem.clear
-    FakeFS.deactivate!
-  end
+class TestHelperGenerator < GeneratorTest
 
   def test_helper_generator
-    out, err = capture_io do
+    assert_output(/create  test\/helpers\/user_helper_test.rb/m) do
       MiniTest::Generators::HelperGenerator.start ["user"]
     end
-    assert_match(/create  test\/helpers\/user_helper_test.rb/m, out)
     assert File.exists? "test/helpers/user_helper_test.rb"
     contents = File.read "test/helpers/user_helper_test.rb"
-    assert_match(/class UserHelperTest < MiniTest::Rails::ActionView::TestCase/m, contents)
+    assert_match(/class UserHelperTest < ActionView::TestCase/m, contents)
   end
 
   def test_namespaced_helper_generator
-    out, err = capture_io do
+    assert_output(/create  test\/helpers\/admin\/user_helper_test.rb/m) do
       MiniTest::Generators::HelperGenerator.start ["admin/user"]
     end
-    assert_match(/create  test\/helpers\/admin\/user_helper_test.rb/m, out)
     assert File.exists? "test/helpers/admin/user_helper_test.rb"
     contents = File.read "test/helpers/admin/user_helper_test.rb"
-    assert_match(/class Admin::UserHelperTest < MiniTest::Rails::ActionView::TestCase/m, contents)
+    assert_match(/class Admin::UserHelperTest < ActionView::TestCase/m, contents)
   end
 
   def test_helper_generator_spec
-    out, err = capture_io do
+    assert_output(/create  test\/helpers\/user_helper_test.rb/m) do
       MiniTest::Generators::HelperGenerator.start ["user", "--spec"]
     end
-    assert_match(/create  test\/helpers\/user_helper_test.rb/m, out)
     assert File.exists? "test/helpers/user_helper_test.rb"
     contents = File.read "test/helpers/user_helper_test.rb"
     assert_match(/describe UserHelper do/m, contents)
   end
 
   def test_namespaced_helper_generator_spec
-    out, err = capture_io do
+    assert_output(/create  test\/helpers\/admin\/user_helper_test.rb/m) do
       MiniTest::Generators::HelperGenerator.start ["admin/user", "--spec"]
     end
-    assert_match(/create  test\/helpers\/admin\/user_helper_test.rb/m, out)
     assert File.exists? "test/helpers/admin/user_helper_test.rb"
     contents = File.read "test/helpers/admin/user_helper_test.rb"
     assert_match(/describe Admin::UserHelper do/m, contents)

data/test/generators/test_install_generator.rb

@@ -1,39 +1,16 @@
-require "minitest/autorun"
-require "minitest-rails"
-
-require "rails"
-require "rails/generators"
-
+require "helper"
 require "generators/mini_test/install/install_generator"
 
-require "fakefs/safe"
-
-class FakeFS::File
-  def self.binread file
-    File.open(file, "rb") { |f| f.read }
-  end
-end
-
-class TestInstallGenerator < MiniTest::Unit::TestCase
-  def setup
-    Rails::Generators.no_color!
-    FakeFS.activate!
-    FakeFS::FileSystem.clone "lib/generators"
-  end
-
-  def teardown
-    FakeFS::FileSystem.clear
-    FakeFS.deactivate!
-  end
+class TestInstallGenerator < GeneratorTest
 
   def test_install_generator
-    out, err = capture_io do
+    assert_output(/create  test\/minitest_helper.rb/m) do
       MiniTest::Generators::InstallGenerator.start
     end
-    assert_match(/create  test\/minitest_helper.rb/m, out)
     assert File.exists? "test/minitest_helper.rb"
     contents = File.read "test/minitest_helper.rb"
     assert_match(/require "minitest\/autorun"/m, contents)
     assert_match(/require "minitest\/rails"/m, contents)
   end
+
 end

data/test/generators/test_mailer_generator.rb

@@ -1,48 +1,24 @@
-require "minitest/autorun"
-require "minitest-rails"
-
-require "rails"
-require "rails/generators"
-
+require "helper"
 require "generators/mini_test/mailer/mailer_generator"
 
-require "fakefs/safe"
-
-class FakeFS::File
-  def self.binread file
-    File.open(file, "rb") { |f| f.read }
-  end
-end
-
-class TestMailerGenerator < MiniTest::Unit::TestCase
-  def setup
-    Rails::Generators.no_color!
-    FakeFS.activate!
-    FakeFS::FileSystem.clone "lib/generators"
-  end
-
-  def teardown
-    FakeFS::FileSystem.clear
-    FakeFS.deactivate!
-  end
+class TestMailerGenerator < GeneratorTest
 
   def test_mailer_generator
-    out, err = capture_io do
+    assert_output(/create  test\/mailers\/notification_test.rb/m) do
       MiniTest::Generators::MailerGenerator.start ["notification"]
     end
-    assert_match(/create  test\/mailers\/notification_test.rb/m, out)
     assert File.exists? "test/mailers/notification_test.rb"
     contents = File.read "test/mailers/notification_test.rb"
     assert_match(/class NotificationTest/m, contents)
   end
 
   def test_mailer_generator_spec
-    out, err = capture_io do
+    assert_output(/create  test\/mailers\/notification_test.rb/m) do
       MiniTest::Generators::MailerGenerator.start ["notification", "welcome", "--spec"]
     end
-    assert_match(/create  test\/mailers\/notification_test.rb/m, out)
     assert File.exists? "test/mailers/notification_test.rb"
     contents = File.read "test/mailers/notification_test.rb"
     assert_match(/describe Notification do/m, contents)
   end
+
 end

data/test/generators/test_model_generator.rb

@@ -1,46 +1,21 @@
-require "minitest/autorun"
-require "minitest-rails"
-
-require "rails"
-require "rails/generators"
-
+require "helper"
 require "generators/mini_test/model/model_generator"
 
-require "fakefs/safe"
-
-class FakeFS::File
-  def self.binread file
-    File.open(file, "rb") { |f| f.read }
-  end
-end
-
-class TestModelGenerator < MiniTest::Unit::TestCase
-  def setup
-    Rails::Generators.no_color!
-    FakeFS.activate!
-    FakeFS::FileSystem.clone "lib/generators"
-  end
-
-  def teardown
-    FakeFS::FileSystem.clear
-    FakeFS.deactivate!
-  end
+class TestModelGenerator < GeneratorTest
 
   def test_model_generator
-    out, err = capture_io do
+    assert_output(/create  test\/models\/user_test.rb/m) do
       MiniTest::Generators::ModelGenerator.start ["user"]
     end
-    assert_match(/create  test\/models\/user_test.rb/m, out)
     assert File.exists? "test/models/user_test.rb"
     contents = File.read "test/models/user_test.rb"
     assert_match(/class UserTest/m, contents)
   end
 
   def test_model_generator_spec
-    out, err = capture_io do
+    assert_output(/create  test\/models\/user_test.rb/m) do
       MiniTest::Generators::ModelGenerator.start ["user", "--spec"]
     end
-    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 = File.read "test/models/user_test.rb"
@@ -48,18 +23,18 @@ class TestModelGenerator < MiniTest::Unit::TestCase
   end
 
   def test_model_generator_fixture
-    out, err = capture_io do
+    assert_output(/create  test\/fixtures\/users.yml/m) do
       MiniTest::Generators::ModelGenerator.start ["user"]
     end
-    assert_match(/create  test\/fixtures\/users.yml/m, out)
     assert File.exists? "test/fixtures/users.yml"
   end
 
   def test_model_generator_skip_fixture
-    out, err = capture_io do
+    out, _ = capture_io do
       MiniTest::Generators::ModelGenerator.start ["user", "--skip-fixture"]
     end
     refute_match(/create  test\/fixtures\/users.yml/m, out)
     refute File.exists? "test/fixtures/users.yml"
   end
+
 end

data/test/generators/test_scaffold_generator.rb

@@ -1,48 +1,24 @@
-require "minitest/autorun"
-require "minitest-rails"
-
-require "rails"
-require "rails/generators"
-
+require "helper"
 require "generators/mini_test/scaffold/scaffold_generator"
 
-require "fakefs/safe"
-
-class FakeFS::File
-  def self.binread file
-    File.open(file, "rb") { |f| f.read }
-  end
-end
-
-class TestScaffoldGenerator < MiniTest::Unit::TestCase
-  def setup
-    Rails::Generators.no_color!
-    FakeFS.activate!
-    FakeFS::FileSystem.clone "lib/generators"
-  end
-
-  def teardown
-    FakeFS::FileSystem.clear
-    FakeFS.deactivate!
-  end
+class TestScaffoldGenerator < GeneratorTest
 
   def test_scaffold_generator
-    out, err = capture_io do
+    assert_output(/create  test\/controllers\/users_controller_test.rb/m) do
       MiniTest::Generators::ScaffoldGenerator.start ["user"]
     end
-    assert_match(/create  test\/controllers\/users_controller_test.rb/m, out)
     assert File.exists? "test/controllers/users_controller_test.rb"
     contents = File.read "test/controllers/users_controller_test.rb"
     assert_match(/class UsersControllerTest/m, contents)
   end
 
   def test_scaffold_generator_spec
-    out, err = capture_io do
+    assert_output(/create  test\/controllers\/users_controller_test.rb/m) do
       MiniTest::Generators::ScaffoldGenerator.start ["user", "--spec"]
     end
-    assert_match(/create  test\/controllers\/users_controller_test.rb/m, out)
     assert File.exists? "test/controllers/users_controller_test.rb"
     contents = File.read "test/controllers/users_controller_test.rb"
     assert_match(/describe UsersController do/m, contents)
   end
+
 end

data/test/helper.rb

@@ -0,0 +1,35 @@
+require "minitest/autorun"
+
+require "rails"
+require "rails/generators"
+
+require "active_record"
+
+require "action_controller"
+require "action_controller/railtie"
+
+require "action_mailer"
+
+require "minitest-rails"
+require "minitest/rails"
+
+require "fakefs/safe"
+
+class FakeFS::File
+  def self.binread file
+    File.open(file, "rb") { |f| f.read }
+  end
+end
+
+class GeneratorTest < MiniTest::Unit::TestCase
+  def setup
+    Rails::Generators.no_color!
+    FakeFS.activate!
+    FakeFS::FileSystem.clone "lib/generators"
+  end
+
+  def teardown
+    FakeFS::FileSystem.clear
+    FakeFS.deactivate!
+  end
+end

data/test/rails/action_controller/test_controllers.rb

@@ -1,19 +1,9 @@
-require "minitest/autorun"
-require "rails"
-
-require "minitest/rails/action_controller"
-require "action_controller"
-
-# require "active_record/railtie"
-require "action_controller/railtie"
-# require "action_mailer/railtie"
-# require "active_resource/railtie"
-# require "sprockets/railtie"
-# require "rails/test_unit/railtie"
+require "helper"
 
 class TestApp < Rails::Application
 end
 Rails.application = TestApp
+Rails.configuration.secret_key_base = "abc123"
 
 class ApplicationController < ActionController::Base; end
 class ModelsController      < ApplicationController;  end
@@ -145,7 +135,7 @@ end
 
 # Nested Admin::WidgetsControllerTest
 module Admin
-  class WidgetsControllerTest < MiniTest::Rails::ActionController::TestCase
+  class WidgetsControllerTest < ActionController::TestCase
     test "exists" do
       assert_kind_of Admin::WidgetsController, @controller
     end
@@ -168,7 +158,7 @@ module Admin
   end
 end
 
-class Admin::WidgetsControllerTest < MiniTest::Rails::ActionController::TestCase
+class Admin::WidgetsControllerTest < ActionController::TestCase
   test "exists here too" do
     assert_kind_of Admin::WidgetsController, @controller
   end

data/test/rails/action_controller/test_spec_type.rb

@@ -1,19 +1,15 @@
-require "minitest/autorun"
-require "rails"
-
-require "minitest/rails/action_controller"
-require "action_controller"
+require "helper"
 
 class ApplicationController < ActionController::Base; end
 class ModelsController      < ApplicationController;  end
 
 class TestApplicationControllerSpecType < MiniTest::Unit::TestCase
   def assert_controller actual
-    assert_equal MiniTest::Rails::ActionController::TestCase, actual
+    assert_equal ActionController::TestCase, actual
   end
 
   def refute_controller actual
-    refute_equal MiniTest::Rails::ActionController::TestCase, actual
+    refute_equal ActionController::TestCase, actual
   end
 
   def test_spec_type_resolves_for_class_constants

data/test/rails/action_dispatch/test_spec_type.rb

@@ -1,23 +1,24 @@
-require "minitest/autorun"
-require "rails"
-
-require "minitest/rails/action_dispatch"
+require "helper"
 
 class TestActionDispatchSpecType < MiniTest::Unit::TestCase
   def assert_dispatch actual
-    assert_equal MiniTest::Rails::ActionDispatch::IntegrationTest, actual
+    assert_equal ActionDispatch::IntegrationTest, actual
   end
 
   def refute_dispatch actual
-    refute_equal MiniTest::Rails::ActionDispatch::IntegrationTest, actual
+    refute_equal ActionDispatch::IntegrationTest, actual
   end
 
   def test_spec_type_resolves_for_matching_acceptance_strings
     assert_dispatch MiniTest::Spec.spec_type("WidgetAcceptanceTest")
     assert_dispatch MiniTest::Spec.spec_type("Widget Acceptance Test")
+    assert_dispatch MiniTest::Spec.spec_type("WidgetAcceptance")
+    assert_dispatch MiniTest::Spec.spec_type("Widget Acceptance")
     # And is not case sensitive
     assert_dispatch MiniTest::Spec.spec_type("widgetacceptancetest")
     assert_dispatch MiniTest::Spec.spec_type("widget acceptance test")
+    assert_dispatch MiniTest::Spec.spec_type("widgetacceptance")
+    assert_dispatch MiniTest::Spec.spec_type("widget acceptance")
   end
 
   def test_spec_type_wont_match_non_space_characters_acceptance
@@ -32,17 +33,21 @@ class TestActionDispatchSpecType < MiniTest::Unit::TestCase
   def test_spec_type_resolves_for_matching_integration_strings
     assert_dispatch MiniTest::Spec.spec_type("WidgetIntegrationTest")
     assert_dispatch MiniTest::Spec.spec_type("Widget Integration Test")
+    assert_dispatch MiniTest::Spec.spec_type("WidgetIntegration")
+    assert_dispatch MiniTest::Spec.spec_type("Widget Integration")
     # And is not case sensitive
     assert_dispatch MiniTest::Spec.spec_type("widgetintegrationtest")
     assert_dispatch MiniTest::Spec.spec_type("widget integration test")
+    assert_dispatch MiniTest::Spec.spec_type("widgetintegration")
+    assert_dispatch MiniTest::Spec.spec_type("widget integration")
   end
 
   def test_spec_type_wont_match_non_space_characters_integration
-    refute_equal MiniTest::Spec.spec_type("Widget Integration\tTest"), MiniTest::Rails::ActionDispatch::IntegrationTest
-    refute_equal MiniTest::Spec.spec_type("Widget Integration\rTest"), MiniTest::Rails::ActionDispatch::IntegrationTest
+    refute_equal MiniTest::Spec.spec_type("Widget Integration\tTest"), ActionDispatch::IntegrationTest
+    refute_equal MiniTest::Spec.spec_type("Widget Integration\rTest"), ActionDispatch::IntegrationTest
     # TODO: Update regex so that new lines don't match.
-    refute_equal MiniTest::Spec.spec_type("Widget Integration\nTest"), MiniTest::Rails::ActionDispatch::IntegrationTest
-    refute_equal MiniTest::Spec.spec_type("Widget Integration\fTest"), MiniTest::Rails::ActionDispatch::IntegrationTest
-    refute_equal MiniTest::Spec.spec_type("Widget IntegrationXTest"),  MiniTest::Rails::ActionDispatch::IntegrationTest
+    refute_equal MiniTest::Spec.spec_type("Widget Integration\nTest"), ActionDispatch::IntegrationTest
+    refute_equal MiniTest::Spec.spec_type("Widget Integration\fTest"), ActionDispatch::IntegrationTest
+    refute_equal MiniTest::Spec.spec_type("Widget IntegrationXTest"),  ActionDispatch::IntegrationTest
   end
 end