Merge branch 'minitest_cleanup'

5 files changed, 5 insertions, 27 deletions

diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb
index 8a67b148c3..90e50f235b 100644
--- a/activesupport/test/abstract_unit.rb
+++ b/activesupport/test/abstract_unit.rb
@@ -15,7 +15,7 @@ silence_warnings do
   Encoding.default_external = "UTF-8"
 end
 
-require 'minitest/autorun'
+require 'active_support/testing/autorun'
 require 'empty_bool'
 
 ENV['NO_RELOAD'] = '1'
diff --git a/activesupport/test/core_ext/thread_test.rb b/activesupport/test/core_ext/thread_test.rb
index b58f59a8d4..230c1203ad 100644
--- a/activesupport/test/core_ext/thread_test.rb
+++ b/activesupport/test/core_ext/thread_test.rb
@@ -39,14 +39,14 @@ class ThreadExt < ActiveSupport::TestCase
   end
 
   def test_thread_variable?
-    refute Thread.new { Thread.current.thread_variable?("foo") }.join.value
+    assert_not Thread.new { Thread.current.thread_variable?("foo") }.join.value
     t = Thread.new {
       Thread.current.thread_variable_set("foo", "bar")
     }.join
 
     assert t.thread_variable?("foo")
     assert t.thread_variable?(:foo)
-    refute t.thread_variable?(:bar)
+    assert_not t.thread_variable?(:bar)
   end
 
   def test_thread_variable_strings_and_symbols_are_the_same_key
diff --git a/activesupport/test/spec_type_test.rb b/activesupport/test/spec_type_test.rb
deleted file mode 100644
index 9a6cb4ded2..0000000000
--- a/activesupport/test/spec_type_test.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require "abstract_unit"
-require "active_record"
-
-class SomeRandomModel < ActiveRecord::Base; end
-
-class SpecTypeTest < ActiveSupport::TestCase
-  def assert_support actual
-    assert_equal ActiveSupport::TestCase, actual
-  end
-
-  def assert_spec actual
-    assert_equal MiniTest::Spec, actual
-  end
-
-  def test_spec_type_resolves_for_active_record_constants
-    assert_support MiniTest::Spec.spec_type(SomeRandomModel)
-  end
-
-  def test_spec_type_doesnt_resolve_random_strings
-    assert_spec MiniTest::Spec.spec_type("Unmatched String")
-  end
-end
diff --git a/activesupport/test/string_inquirer_test.rb b/activesupport/test/string_inquirer_test.rb
index 94d5fe197d..a2ed577eb0 100644
--- a/activesupport/test/string_inquirer_test.rb
+++ b/activesupport/test/string_inquirer_test.rb
@@ -10,7 +10,7 @@ class StringInquirerTest < ActiveSupport::TestCase
   end
 
   def test_miss
-    refute @string_inquirer.development?
+    assert_not @string_inquirer.development?
   end
 
   def test_missing_question_mark
diff --git a/activesupport/test/ts_isolated.rb b/activesupport/test/ts_isolated.rb
index 2c217157d3..294d6595f7 100644
--- a/activesupport/test/ts_isolated.rb
+++ b/activesupport/test/ts_isolated.rb
@@ -1,4 +1,4 @@
-require 'minitest/autorun'
+require 'active_support/testing/autorun'
 require 'active_support/test_case'
 require 'rbconfig'
 require 'active_support/core_ext/kernel/reporting'