4 files changed, 1 insertions, 189 deletions
diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb
index 80f323873d..207f949fe2 100644
--- a/actionmailer/lib/action_mailer/test_case.rb
+++ b/actionmailer/lib/action_mailer/test_case.rb
@@ -10,13 +10,6 @@ module ActionMailer
   end
 
   class TestCase < ActiveSupport::TestCase
-
-    # Use AM::TestCase for the base class when describing a mailer
-    register_spec_type(self) do |desc|
-      Class === desc && desc < ActionMailer::Base
-    end
-    register_spec_type(/Mailer( ?Test)?\z/i, self)
-
     module Behavior
       extend ActiveSupport::Concern
 
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index 99c44179fd..15729bafba 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -8,7 +8,7 @@ silence_warnings do
   Encoding.default_external = "UTF-8"
 end
 
-require 'minitest/autorun'
+require 'active_support/testing/autorun'
 require 'action_mailer'
 require 'action_mailer/test_case'
 
diff --git a/actionmailer/test/spec_type_test.rb b/actionmailer/test/spec_type_test.rb
deleted file mode 100644
index 90db59c2d2..0000000000
--- a/actionmailer/test/spec_type_test.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-require 'abstract_unit'
-
-class NotificationMailer < ActionMailer::Base; end
-class Notifications < ActionMailer::Base; end
-
-class SpecTypeTest < ActiveSupport::TestCase
-  def assert_mailer actual
-    assert_equal ActionMailer::TestCase, actual
-  end
-
-  def refute_mailer actual
-    refute_equal ActionMailer::TestCase, actual
-  end
-
-  def test_spec_type_resolves_for_class_constants
-    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")
-    # 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")
-  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")
-  end
-end
diff --git a/actionmailer/test/test_test.rb b/actionmailer/test/test_test.rb
index 139eb53359..86fd37bea6 100644
--- a/actionmailer/test/test_test.rb
+++ b/actionmailer/test/test_test.rb
@@ -26,147 +26,3 @@ class CrazyStringNameMailerTest < ActionMailer::TestCase
     assert_equal TestTestMailer, self.class.mailer_class
   end
 end
-
-describe TestTestMailer do
-  it "gets the mailer from the test name" do
-    assert_equal TestTestMailer, self.class.mailer_class
-  end
-end
-
-describe TestTestMailer, :action do
-  it "gets the mailer from the test name" do
-    assert_equal TestTestMailer, self.class.mailer_class
-  end
-end
-
-describe TestTestMailer do
-  describe "nested" do
-    it "gets the mailer from the test name" do
-      assert_equal TestTestMailer, self.class.mailer_class
-    end
-  end
-end
-
-describe TestTestMailer, :action do
-  describe "nested" do
-    it "gets the mailer from the test name" do
-      assert_equal TestTestMailer, self.class.mailer_class
-    end
-  end
-end
-
-describe "TestTestMailer" do
-  it "gets the mailer from the test name" do
-    assert_equal TestTestMailer, self.class.mailer_class
-  end
-end
-
-describe "TestTestMailerTest" do
-  it "gets the mailer from the test name" do
-    assert_equal TestTestMailer, self.class.mailer_class
-  end
-end
-
-describe "TestTestMailer" do
-  describe "nested" do
-    it "gets the mailer from the test name" do
-      assert_equal TestTestMailer, self.class.mailer_class
-    end
-  end
-end
-
-describe "TestTestMailerTest" do
-  describe "nested" do
-    it "gets the mailer from the test name" do
-      assert_equal TestTestMailer, self.class.mailer_class
-    end
-  end
-end
-
-describe "AnotherCrazySymbolNameMailerTest" do
-  tests :test_test_mailer
-
-  it "gets the mailer after setting it with a symbol" do
-    assert_equal TestTestMailer, self.class.mailer_class
-  end
-end
-
-describe "AnotherCrazyStringNameMailerTest" do
-  tests 'test_test_mailer'
-
-  it "gets the mailer after setting it with a string" do
-    assert_equal TestTestMailer, self.class.mailer_class
-  end
-end
-
-describe "Another Crazy Name Mailer Test" do
-  tests TestTestMailer
-
-  it "gets the mailer after setting it manually" do
-    assert_equal TestTestMailer, self.class.mailer_class
-  end
-end
-
-describe "Another Crazy Symbol Name Mailer Test" do
-  tests :test_test_mailer
-
-  it "gets the mailer after setting it with a symbol" do
-    assert_equal TestTestMailer, self.class.mailer_class
-  end
-end
-
-describe "Another Crazy String Name Mailer Test" do
-  tests 'test_test_mailer'
-
-  it "gets the mailer after setting it with a string" do
-    assert_equal TestTestMailer, self.class.mailer_class
-  end
-end
-
-describe "AnotherCrazySymbolNameMailerTest" do
-  tests :test_test_mailer
-
-  describe "nested" do
-    it "gets the mailer after setting it with a symbol" do
-      assert_equal TestTestMailer, self.class.mailer_class
-    end
-  end
-end
-
-describe "AnotherCrazyStringNameMailerTest" do
-  tests 'test_test_mailer'
-
-  describe "nested" do
-    it "gets the mailer after setting it with a string" do
-      assert_equal TestTestMailer, self.class.mailer_class
-    end
-  end
-end
-
-describe "Another Crazy Name Mailer Test" do
-  tests TestTestMailer
-
-  describe "nested" do
-    it "gets the mailer after setting it manually" do
-      assert_equal TestTestMailer, self.class.mailer_class
-    end
-  end
-end
-
-describe "Another Crazy Symbol Name Mailer Test" do
-  tests :test_test_mailer
-
-  describe "nested" do
-    it "gets the mailer after setting it with a symbol" do
-      assert_equal TestTestMailer, self.class.mailer_class
-    end
-  end
-end
-
-describe "Another Crazy String Name Mailer Test" do
-  tests 'test_test_mailer'
-
-  it "gets the mailer after setting it with a string" do
-    assert_equal TestTestMailer, self.class.mailer_class
-  end
-end