Merge branch 'minitest_cleanup'

2 files changed, 0 insertions, 95 deletions

diff --git a/actionpack/test/template/spec_type_test.rb b/actionpack/test/template/spec_type_test.rb
deleted file mode 100644
index 08a7bdf81d..0000000000
--- a/actionpack/test/template/spec_type_test.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require 'abstract_unit'
-
-class ActionViewSpecTypeTest < ActiveSupport::TestCase
-  def assert_view actual
-    assert_equal ActionView::TestCase, actual
-  end
-
-  def refute_view actual
-    refute_equal ActionView::TestCase, actual
-  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")
-    # 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")
-  end
-
-  def test_spec_type_resolves_for_matching_view_strings
-    assert_view MiniTest::Spec.spec_type("WidgetView")
-    assert_view MiniTest::Spec.spec_type("WidgetViewTest")
-    assert_view MiniTest::Spec.spec_type("Widget View Test")
-    # And is not case sensitive
-    assert_view MiniTest::Spec.spec_type("widgetview")
-    assert_view MiniTest::Spec.spec_type("widgetviewtest")
-    assert_view MiniTest::Spec.spec_type("widget view test")
-  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")
-  end
-end
diff --git a/actionpack/test/template/test_test.rb b/actionpack/test/template/test_test.rb
index e843a1deb4..108a674d95 100644
--- a/actionpack/test/template/test_test.rb
+++ b/actionpack/test/template/test_test.rb
@@ -78,59 +78,3 @@ class CrazyStringHelperTest < ActionView::TestCase
     assert_equal PeopleHelper, self.class.helper_class
   end
 end
-
-describe PeopleHelper do
-  it "resolves the right helper_class" do
-    assert_equal PeopleHelper, self.class.helper_class
-  end
-end
-
-describe PeopleHelper, :helper_class do
-  it "resolves the right helper_class" do
-    assert_equal PeopleHelper, self.class.helper_class
-  end
-end
-
-describe PeopleHelper do
-  describe "even while nested" do
-    it "resolves the right helper_class" do
-      assert_equal PeopleHelper, self.class.helper_class
-    end
-  end
-end
-
-describe PeopleHelper, :helper_class do
-  describe "even while nested" do
-    it "resolves the right helper_class" do
-      assert_equal PeopleHelper, self.class.helper_class
-    end
-  end
-end
-
-describe "PeopleHelper" do
-  it "resolves the right helper_class" do
-    assert_equal PeopleHelper, self.class.helper_class
-  end
-end
-
-describe "PeopleHelperTest" do
-  it "resolves the right helper_class" do
-    assert_equal PeopleHelper, self.class.helper_class
-  end
-end
-
-describe "PeopleHelper" do
-  describe "even while nested" do
-    it "resolves the right helper_class" do
-      assert_equal PeopleHelper, self.class.helper_class
-    end
-  end
-end
-
-describe "PeopleHelperTest" do
-  describe "even while nested" do
-    it "resolves the right helper_class" do
-      assert_equal PeopleHelper, self.class.helper_class
-    end
-  end
-end