minitest-rails 1.0.1 → 2.0.0.beta1

data/test/generators/test_helper_generator.rb

@@ -1,11 +1,11 @@
 require "helper"
-require "generators/mini_test/helper/helper_generator"
+require "generators/minitest/helper/helper_generator"
 
 class TestHelperGenerator < GeneratorTest
 
   def test_helper_generator
     assert_output(/create  test\/helpers\/user_helper_test.rb/m) do
-      MiniTest::Generators::HelperGenerator.start ["user"]
+      Minitest::Generators::HelperGenerator.start ["user"]
     end
     assert File.exists? "test/helpers/user_helper_test.rb"
     contents = File.read "test/helpers/user_helper_test.rb"
@@ -14,7 +14,7 @@ class TestHelperGenerator < GeneratorTest
 
   def test_namespaced_helper_generator
     assert_output(/create  test\/helpers\/admin\/user_helper_test.rb/m) do
-      MiniTest::Generators::HelperGenerator.start ["admin/user"]
+      Minitest::Generators::HelperGenerator.start ["admin/user"]
     end
     assert File.exists? "test/helpers/admin/user_helper_test.rb"
     contents = File.read "test/helpers/admin/user_helper_test.rb"
@@ -23,7 +23,7 @@ class TestHelperGenerator < GeneratorTest
 
   def test_helper_generator_spec
     assert_output(/create  test\/helpers\/user_helper_test.rb/m) do
-      MiniTest::Generators::HelperGenerator.start ["user", "--spec"]
+      Minitest::Generators::HelperGenerator.start ["user", "--spec"]
     end
     assert File.exists? "test/helpers/user_helper_test.rb"
     contents = File.read "test/helpers/user_helper_test.rb"
@@ -32,7 +32,7 @@ class TestHelperGenerator < GeneratorTest
 
   def test_namespaced_helper_generator_spec
     assert_output(/create  test\/helpers\/admin\/user_helper_test.rb/m) do
-      MiniTest::Generators::HelperGenerator.start ["admin/user", "--spec"]
+      Minitest::Generators::HelperGenerator.start ["admin/user", "--spec"]
     end
     assert File.exists? "test/helpers/admin/user_helper_test.rb"
     contents = File.read "test/helpers/admin/user_helper_test.rb"

data/test/generators/test_install_generator.rb

@@ -1,11 +1,11 @@
 require "helper"
-require "generators/mini_test/install/install_generator"
+require "generators/minitest/install/install_generator"
 
 class TestInstallGenerator < GeneratorTest
 
   def test_install_generator
     assert_output(/create  test\/test_helper.rb/m) do
-      MiniTest::Generators::InstallGenerator.start
+      Minitest::Generators::InstallGenerator.start
     end
     assert File.exists? "test/test_helper.rb"
     contents = File.read "test/test_helper.rb"
@@ -21,7 +21,7 @@ class TestInstallGenerator < GeneratorTest
 
   def test_install_generator_without_active_record
     assert_output(/create  test\/test_helper.rb/m) do
-      MiniTest::Generators::InstallGenerator.start ["--skip-active-record"]
+      Minitest::Generators::InstallGenerator.start ["--skip-active-record"]
     end
     assert File.exists? "test/test_helper.rb"
     contents = File.read "test/test_helper.rb"

data/test/generators/test_mailer_generator.rb

@@ -1,11 +1,11 @@
 require "helper"
-require "generators/mini_test/mailer/mailer_generator"
+require "generators/minitest/mailer/mailer_generator"
 
 class TestMailerGenerator < GeneratorTest
 
   def test_mailer_generator
     assert_output(/create  test\/mailers\/notification_test.rb/m) do
-      MiniTest::Generators::MailerGenerator.start ["notification"]
+      Minitest::Generators::MailerGenerator.start ["notification"]
     end
     assert File.exists? "test/mailers/notification_test.rb"
     contents = File.read "test/mailers/notification_test.rb"
@@ -14,7 +14,7 @@ class TestMailerGenerator < GeneratorTest
 
   def test_namespaced_mailer_generator
     assert_output(/create  test\/mailers\/admin\/notification_test.rb/m) do
-      MiniTest::Generators::MailerGenerator.start ["admin/notification"]
+      Minitest::Generators::MailerGenerator.start ["admin/notification"]
     end
     assert File.exists? "test/mailers/admin/notification_test.rb"
     contents = File.read "test/mailers/admin/notification_test.rb"
@@ -23,7 +23,7 @@ class TestMailerGenerator < GeneratorTest
 
   def test_mailer_generator_spec
     assert_output(/create  test\/mailers\/notification_test.rb/m) do
-      MiniTest::Generators::MailerGenerator.start ["notification", "welcome", "--spec"]
+      Minitest::Generators::MailerGenerator.start ["notification", "welcome", "--spec"]
     end
     assert File.exists? "test/mailers/notification_test.rb"
     contents = File.read "test/mailers/notification_test.rb"
@@ -32,7 +32,7 @@ class TestMailerGenerator < GeneratorTest
 
   def test_namespaced_mailer_generator_spec
     assert_output(/create  test\/mailers\/admin\/notification_test.rb/m) do
-      MiniTest::Generators::MailerGenerator.start ["admin/notification", "welcome", "--spec"]
+      Minitest::Generators::MailerGenerator.start ["admin/notification", "welcome", "--spec"]
     end
     assert File.exists? "test/mailers/admin/notification_test.rb"
     contents = File.read "test/mailers/admin/notification_test.rb"

data/test/generators/test_model_generator.rb

@@ -1,11 +1,11 @@
 require "helper"
-require "generators/mini_test/model/model_generator"
+require "generators/minitest/model/model_generator"
 
 class TestModelGenerator < GeneratorTest
 
   def test_model_generator
     assert_output(/create  test\/models\/user_test.rb/m) do
-      MiniTest::Generators::ModelGenerator.start ["user"]
+      Minitest::Generators::ModelGenerator.start ["user"]
     end
     assert File.exists? "test/models/user_test.rb"
     contents = File.read "test/models/user_test.rb"
@@ -14,7 +14,7 @@ class TestModelGenerator < GeneratorTest
 
   def test_namespaced_model_generator
     assert_output(/create  test\/models\/admin\/user_test.rb/m) do
-      MiniTest::Generators::ModelGenerator.start ["admin/user"]
+      Minitest::Generators::ModelGenerator.start ["admin/user"]
     end
     assert File.exists? "test/models/admin/user_test.rb"
     contents = File.read "test/models/admin/user_test.rb"
@@ -26,7 +26,7 @@ class TestModelGenerator < GeneratorTest
     Rails::Generators.namespace = TestApp
 
     assert_output(/create  test\/models\/test_app\/user_test.rb/m) do
-      MiniTest::Generators::ModelGenerator.start ["user"]
+      Minitest::Generators::ModelGenerator.start ["user"]
     end
     assert File.exists? "test/models/test_app/user_test.rb"
     contents = File.read "test/models/test_app/user_test.rb"
@@ -39,7 +39,7 @@ class TestModelGenerator < GeneratorTest
 
   def test_model_generator_spec
     assert_output(/create  test\/models\/user_test.rb/m) do
-      MiniTest::Generators::ModelGenerator.start ["user", "--spec"]
+      Minitest::Generators::ModelGenerator.start ["user", "--spec"]
     end
     assert File.exists? "test/models/user_test.rb"
     assert File.exists? "test/fixtures/users.yml"
@@ -49,7 +49,7 @@ class TestModelGenerator < GeneratorTest
 
   def test_namespaced_model_generator_spec
     assert_output(/create  test\/models\/admin\/user_test.rb/m) do
-      MiniTest::Generators::ModelGenerator.start ["admin/user", "--spec"]
+      Minitest::Generators::ModelGenerator.start ["admin/user", "--spec"]
     end
     assert File.exists? "test/models/admin/user_test.rb"
     contents = File.read "test/models/admin/user_test.rb"
@@ -58,21 +58,21 @@ class TestModelGenerator < GeneratorTest
 
   def test_model_generator_fixture
     assert_output(/create  test\/fixtures\/users.yml/m) do
-      MiniTest::Generators::ModelGenerator.start ["user"]
+      Minitest::Generators::ModelGenerator.start ["user"]
     end
     assert File.exists? "test/fixtures/users.yml"
   end
 
   def test_namespaced_model_generator_fixture
     assert_output(/create  test\/fixtures\/admin\/users.yml/m) do
-      MiniTest::Generators::ModelGenerator.start ["admin/user"]
+      Minitest::Generators::ModelGenerator.start ["admin/user"]
     end
     assert File.exists? "test/fixtures/admin/users.yml"
   end
 
   def test_model_generator_skip_fixture
     out, _ = capture_io do
-      MiniTest::Generators::ModelGenerator.start ["user", "--skip-fixture"]
+      Minitest::Generators::ModelGenerator.start ["user", "--skip-fixture"]
     end
     refute_match(/create  test\/fixtures\/users.yml/m, out)
     refute File.exists? "test/fixtures/users.yml"

data/test/generators/test_route_generator.rb

@@ -1,11 +1,11 @@
 require "helper"
-require "generators/mini_test/route/route_generator"
+require "generators/minitest/route/route_generator"
 
 class TestRouteGenerator < GeneratorTest
 
   def test_route_generator
     assert_output(/create  test\/routes\/route_test.rb/m) do
-      MiniTest::Generators::RouteGenerator.start
+      Minitest::Generators::RouteGenerator.start
     end
     assert File.exists? "test/routes/route_test.rb"
     contents = File.read "test/routes/route_test.rb"
@@ -14,7 +14,7 @@ class TestRouteGenerator < GeneratorTest
 
   def test_route_generator_spec
     assert_output(/create  test\/routes\/route_test.rb/m) do
-      MiniTest::Generators::RouteGenerator.start ["--spec"]
+      Minitest::Generators::RouteGenerator.start ["--spec"]
     end
     assert File.exists? "test/routes/route_test.rb"
     contents = File.read "test/routes/route_test.rb"

data/test/generators/test_scaffold_generator.rb

@@ -1,11 +1,11 @@
 require "helper"
-require "generators/mini_test/scaffold/scaffold_generator"
+require "generators/minitest/scaffold/scaffold_generator"
 
 class TestScaffoldGenerator < GeneratorTest
 
   def test_scaffold_generator
     assert_output(/create  test\/controllers\/users_controller_test.rb/m) do
-      MiniTest::Generators::ScaffoldGenerator.start ["user"]
+      Minitest::Generators::ScaffoldGenerator.start ["user"]
     end
     assert File.exists? "test/controllers/users_controller_test.rb"
     contents = File.read "test/controllers/users_controller_test.rb"
@@ -14,7 +14,7 @@ class TestScaffoldGenerator < GeneratorTest
 
   def test_scaffold_generator_spec
     assert_output(/create  test\/controllers\/users_controller_test.rb/m) do
-      MiniTest::Generators::ScaffoldGenerator.start ["user", "--spec"]
+      Minitest::Generators::ScaffoldGenerator.start ["user", "--spec"]
     end
     assert File.exists? "test/controllers/users_controller_test.rb"
     contents = File.read "test/controllers/users_controller_test.rb"

data/test/helper.rb

@@ -3,6 +3,7 @@ require "minitest/autorun"
 require "rails"
 require "rails/generators"
 
+require "sqlite3"
 require "active_record"
 
 require "action_controller"
@@ -22,7 +23,7 @@ class FakeFS::File
   end
 end
 
-class GeneratorTest < MiniTest::Unit::TestCase
+class GeneratorTest < Minitest::Test
   def setup
     Rails::Generators.no_color!
     FakeFS.activate!
@@ -61,3 +62,5 @@ TestApp::Application.routes.draw do
     resources :widgets
   end
 end
+
+ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"

data/test/rails/action_controller/test_spec_type.rb

@@ -3,7 +3,7 @@ require "helper"
 class ApplicationController < ActionController::Base; end
 class ModelsController      < ApplicationController;  end
 
-class TestApplicationControllerSpecType < MiniTest::Unit::TestCase
+class TestApplicationControllerSpecType < Minitest::Test
   def assert_controller actual
     assert_equal ActionController::TestCase, actual
   end
@@ -13,25 +13,30 @@ class TestApplicationControllerSpecType < MiniTest::Unit::TestCase
   end
 
   def test_spec_type_resolves_for_class_constants
-    assert_controller MiniTest::Spec.spec_type(ApplicationController)
-    assert_controller MiniTest::Spec.spec_type(ModelsController)
+    assert_controller Minitest::Spec.spec_type(ApplicationController)
+    assert_controller Minitest::Spec.spec_type(ModelsController)
   end
 
   def test_spec_type_resolves_for_matching_strings
-    assert_controller MiniTest::Spec.spec_type("WidgetController")
-    assert_controller MiniTest::Spec.spec_type("WidgetControllerTest")
-    assert_controller MiniTest::Spec.spec_type("Widget Controller Test")
+    assert_controller Minitest::Spec.spec_type("WidgetController")
+    assert_controller Minitest::Spec.spec_type("WidgetControllerTest")
+    assert_controller Minitest::Spec.spec_type("Widget Controller Test")
     # And is not case sensitive
-    assert_controller MiniTest::Spec.spec_type("widgetcontroller")
-    assert_controller MiniTest::Spec.spec_type("widgetcontrollertest")
-    assert_controller MiniTest::Spec.spec_type("widget controller test")
+    assert_controller Minitest::Spec.spec_type("widgetcontroller")
+    assert_controller Minitest::Spec.spec_type("widgetcontrollertest")
+    assert_controller Minitest::Spec.spec_type("widget controller test")
   end
 
   def test_spec_type_wont_match_non_space_characters
-    refute_controller MiniTest::Spec.spec_type("Widget Controller\tTest")
-    refute_controller MiniTest::Spec.spec_type("Widget Controller\rTest")
-    refute_controller MiniTest::Spec.spec_type("Widget Controller\nTest")
-    refute_controller MiniTest::Spec.spec_type("Widget Controller\fTest")
-    refute_controller MiniTest::Spec.spec_type("Widget ControllerXTest")
+    refute_controller Minitest::Spec.spec_type("Widget Controller\tTest")
+    refute_controller Minitest::Spec.spec_type("Widget Controller\rTest")
+    refute_controller Minitest::Spec.spec_type("Widget Controller\nTest")
+    refute_controller Minitest::Spec.spec_type("Widget Controller\fTest")
+    refute_controller Minitest::Spec.spec_type("Widget ControllerXTest")
+  end
+
+  def test_spec_type_resolves_for_additional_desc_controller
+    refute_controller Minitest::Spec.spec_type("Unmatched String")
+    assert_controller Minitest::Spec.spec_type(["Unmatched String", :controller])
   end
 end

data/test/rails/action_dispatch/test_spec_type.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class TestActionDispatchSpecType < MiniTest::Unit::TestCase
+class TestActionDispatchSpecType < Minitest::Test
   def assert_dispatch actual
     assert_equal ActionDispatch::IntegrationTest, actual
   end
@@ -10,44 +10,47 @@ class TestActionDispatchSpecType < MiniTest::Unit::TestCase
   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")
+    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")
+    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
-    refute_dispatch MiniTest::Spec.spec_type("Widget Acceptance\tTest")
-    refute_dispatch MiniTest::Spec.spec_type("Widget Acceptance\rTest")
-    # TODO: Update regex so that new lines don't match.
-    refute_dispatch MiniTest::Spec.spec_type("Widget Acceptance\nTest")
-    refute_dispatch MiniTest::Spec.spec_type("Widget Acceptance\fTest")
-    refute_dispatch MiniTest::Spec.spec_type("Widget AcceptanceXTest")
+    refute_dispatch Minitest::Spec.spec_type("Widget Acceptance\tTest")
+    refute_dispatch Minitest::Spec.spec_type("Widget Acceptance\rTest")
+    refute_dispatch Minitest::Spec.spec_type("Widget Acceptance\nTest")
+    refute_dispatch Minitest::Spec.spec_type("Widget Acceptance\fTest")
+    refute_dispatch Minitest::Spec.spec_type("Widget AcceptanceXTest")
   end
 
   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")
+    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")
+    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"), 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"), ActionDispatch::IntegrationTest
-    refute_equal MiniTest::Spec.spec_type("Widget Integration\fTest"), ActionDispatch::IntegrationTest
-    refute_equal MiniTest::Spec.spec_type("Widget IntegrationXTest"),  ActionDispatch::IntegrationTest
+    refute_dispatch Minitest::Spec.spec_type("Widget Integration\tTest")
+    refute_dispatch Minitest::Spec.spec_type("Widget Integration\rTest")
+    refute_dispatch Minitest::Spec.spec_type("Widget Integration\nTest")
+    refute_dispatch Minitest::Spec.spec_type("Widget Integration\fTest")
+    refute_dispatch Minitest::Spec.spec_type("Widget IntegrationXTest")
+  end
+
+  def test_spec_type_resolves_for_additional_desc_integration
+    refute_dispatch Minitest::Spec.spec_type("Unmatched String")
+    assert_dispatch Minitest::Spec.spec_type(["Unmatched String", :integration])
   end
 end

data/test/rails/action_mailer/test_spec_type.rb

@@ -3,7 +3,7 @@ require "helper"
 class NotificationMailer < ActionMailer::Base; end
 class Notifications < ActionMailer::Base; end
 
-class TestActionMailerSpecType < MiniTest::Unit::TestCase
+class TestActionMailerSpecType < Minitest::Test
   def assert_mailer actual
     assert_equal ActionMailer::TestCase, actual
   end
@@ -13,25 +13,30 @@ class TestActionMailerSpecType < MiniTest::Unit::TestCase
   end
 
   def test_spec_type_resolves_for_class_constants
-    assert_mailer MiniTest::Spec.spec_type(NotificationMailer)
-    assert_mailer MiniTest::Spec.spec_type(Notifications)
+    assert_mailer Minitest::Spec.spec_type(NotificationMailer)
+    assert_mailer Minitest::Spec.spec_type(Notifications)
   end
 
   def test_spec_type_resolves_for_matching_strings
-    assert_mailer MiniTest::Spec.spec_type("WidgetMailer")
-    assert_mailer MiniTest::Spec.spec_type("WidgetMailerTest")
-    assert_mailer MiniTest::Spec.spec_type("Widget Mailer Test")
+    assert_mailer Minitest::Spec.spec_type("WidgetMailer")
+    assert_mailer Minitest::Spec.spec_type("WidgetMailerTest")
+    assert_mailer Minitest::Spec.spec_type("Widget Mailer Test")
     # And is not case sensitive
-    assert_mailer MiniTest::Spec.spec_type("widgetmailer")
-    assert_mailer MiniTest::Spec.spec_type("widgetmailertest")
-    assert_mailer MiniTest::Spec.spec_type("widget mailer test")
+    assert_mailer Minitest::Spec.spec_type("widgetmailer")
+    assert_mailer Minitest::Spec.spec_type("widgetmailertest")
+    assert_mailer Minitest::Spec.spec_type("widget mailer test")
   end
 
   def test_spec_type_wont_match_non_space_characters
-    refute_mailer MiniTest::Spec.spec_type("Widget Mailer\tTest")
-    refute_mailer MiniTest::Spec.spec_type("Widget Mailer\rTest")
-    refute_mailer MiniTest::Spec.spec_type("Widget Mailer\nTest")
-    refute_mailer MiniTest::Spec.spec_type("Widget Mailer\fTest")
-    refute_mailer MiniTest::Spec.spec_type("Widget MailerXTest")
+    refute_mailer Minitest::Spec.spec_type("Widget Mailer\tTest")
+    refute_mailer Minitest::Spec.spec_type("Widget Mailer\rTest")
+    refute_mailer Minitest::Spec.spec_type("Widget Mailer\nTest")
+    refute_mailer Minitest::Spec.spec_type("Widget Mailer\fTest")
+    refute_mailer Minitest::Spec.spec_type("Widget MailerXTest")
+  end
+
+  def test_spec_type_resolves_for_additional_desc_mailer
+    refute_mailer Minitest::Spec.spec_type("Unmatched String")
+    assert_mailer Minitest::Spec.spec_type(["Unmatched String", :mailer])
   end
 end

data/test/rails/action_view/test_spec_type.rb

@@ -1,6 +1,6 @@
 require "helper"
 
-class TestActionViewSpecType < MiniTest::Unit::TestCase
+class TestActionViewSpecType < Minitest::Test
   def assert_view actual
     assert_equal ActionView::TestCase, actual
   end
@@ -10,33 +10,39 @@ class TestActionViewSpecType < MiniTest::Unit::TestCase
   end
 
   def test_spec_type_resolves_for_matching_helper_strings
-    assert_view MiniTest::Spec.spec_type("WidgetHelper")
-    assert_view MiniTest::Spec.spec_type("WidgetHelperTest")
-    assert_view MiniTest::Spec.spec_type("Widget Helper Test")
+    assert_view Minitest::Spec.spec_type("WidgetHelper")
+    assert_view Minitest::Spec.spec_type("WidgetHelperTest")
+    assert_view Minitest::Spec.spec_type("Widget Helper Test")
     # And is not case sensitive
-    assert_view MiniTest::Spec.spec_type("widgethelper")
-    assert_view MiniTest::Spec.spec_type("widgethelpertest")
-    assert_view MiniTest::Spec.spec_type("widget helper test")
+    assert_view Minitest::Spec.spec_type("widgethelper")
+    assert_view Minitest::Spec.spec_type("widgethelpertest")
+    assert_view Minitest::Spec.spec_type("widget helper test")
   end
 
   def test_spec_type_resolves_for_matching_view_strings
-    assert_view MiniTest::Spec.spec_type("Widget View Test")
+    assert_view Minitest::Spec.spec_type("Widget View Test")
     # And is not case sensitive
-    assert_view MiniTest::Spec.spec_type("widget view test")
+    assert_view Minitest::Spec.spec_type("widget view test")
   end
 
   def test_spec_type_wont_match_models_that_end_in_view
-    refute_view MiniTest::Spec.spec_type("NewsOverviewTest")
-    refute_view MiniTest::Spec.spec_type("News Overview Test")
-    refute_view MiniTest::Spec.spec_type("NewsOverview")
-    refute_view MiniTest::Spec.spec_type("News Overview")
+    refute_view Minitest::Spec.spec_type("NewsOverviewTest")
+    refute_view Minitest::Spec.spec_type("News Overview Test")
+    refute_view Minitest::Spec.spec_type("NewsOverview")
+    refute_view Minitest::Spec.spec_type("News Overview")
   end
 
   def test_spec_type_wont_match_non_space_characters
-    refute_view MiniTest::Spec.spec_type("Widget Helper\tTest")
-    refute_view MiniTest::Spec.spec_type("Widget Helper\rTest")
-    refute_view MiniTest::Spec.spec_type("Widget Helper\nTest")
-    refute_view MiniTest::Spec.spec_type("Widget Helper\fTest")
-    refute_view MiniTest::Spec.spec_type("Widget HelperXTest")
+    refute_view Minitest::Spec.spec_type("Widget Helper\tTest")
+    refute_view Minitest::Spec.spec_type("Widget Helper\rTest")
+    refute_view Minitest::Spec.spec_type("Widget Helper\nTest")
+    refute_view Minitest::Spec.spec_type("Widget Helper\fTest")
+    refute_view Minitest::Spec.spec_type("Widget HelperXTest")
+  end
+
+  def test_spec_type_resolves_for_additional_desc_view_or_helper
+    refute_view Minitest::Spec.spec_type("Unmatched String")
+    assert_view Minitest::Spec.spec_type(["Unmatched String", :view])
+    assert_view Minitest::Spec.spec_type(["Unmatched String", :helper])
   end
 end

data/test/rails/active_support/test_assertions.rb

@@ -2,34 +2,6 @@ require "helper"
 
 class TestActiveSupportAssertions < ActiveSupport::TestCase
 
-  def test_assert_blank
-    assert_blank ""
-    assert_blank nil
-    assert_blank []
-    assert_blank Hash.new
-  end
-
-  def test_refute_present
-    refute_present ""
-    refute_present nil
-    refute_present []
-    refute_present Hash.new
-  end
-
-  def test_assert_present
-    assert_present "here"
-    assert_present Object.new
-    assert_present [1,2,3]
-    assert_present :key => :value
-  end
-
-  def test_refute_blank
-    refute_blank "here"
-    refute_blank Object.new
-    refute_blank [1,2,3]
-    refute_blank :key => :value
-  end
-
   def test_assert_difference
     counter = 0
     assert_difference "counter" do

data/test/rails/active_support/test_expectations.rb

@@ -3,34 +3,6 @@ require "helper"
 # Can't use describe because there is no spec type to use
 class TestActiveSupportExpectations < ActiveSupport::TestCase
 
-  def test_must_be_blank
-    "".must_be_blank
-    nil.must_be_blank
-    [].must_be_blank
-    Hash.new.must_be_blank
-  end
-
-  def test_wont_be_present
-    "".wont_be_present
-    nil.wont_be_present
-    [].wont_be_present
-    Hash.new.wont_be_present
-  end
-
-  def test_must_be_present
-    "here".must_be_present
-    Object.new.must_be_present
-    [1,2,3].must_be_present
-    {:key => :value}.must_be_present
-  end
-
-  def test_wont_be_blank
-    "here".wont_be_blank
-    Object.new.wont_be_blank
-    [1,2,3].wont_be_blank
-    {:key => :value}.wont_be_blank
-  end
-
   def test_must_change
     counter = 0
 

data/test/rails/active_support/test_spec_type.rb

@@ -2,21 +2,25 @@ require "helper"
 
 class SomeRandomModel < ActiveRecord::Base; end
 
-class TestActiveSupportSpecType < MiniTest::Unit::TestCase
+class TestActiveSupportSpecType < Minitest::Test
 
   def assert_support actual
     assert_equal ActiveSupport::TestCase, actual
   end
 
-  def assert_spec actual
-    assert_equal MiniTest::Spec, actual
+  def refute_support actual
+    refute_equal ActiveSupport::TestCase, actual
   end
 
   def test_spec_type_resolves_for_actitive_record_constants
-    assert_support MiniTest::Spec.spec_type(SomeRandomModel)
+    assert_support Minitest::Spec.spec_type(SomeRandomModel)
   end
 
   def test_spec_type_doesnt_resolve_random_strings
-    assert_spec MiniTest::Spec.spec_type("Unmatched String")
+    refute_support Minitest::Spec.spec_type("Unmatched String")
+  end
+
+  def test_spec_type_resolves_for_additional_desc_model
+    assert_support Minitest::Spec.spec_type(["Unmatched String", :model])
   end
 end