Merge pull request #4354 from rafaelfranca/patch-1

Remove some checks if MiniTest is defined

3 files changed, 30 insertions, 212 deletions

diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb
index d77a62f108..4daffb85d2 100644
--- a/activesupport/test/deprecation_test.rb
+++ b/activesupport/test/deprecation_test.rb
@@ -166,22 +166,4 @@ class DeprecationTest < ActiveSupport::TestCase
   def test_deprecation_with_explicit_message
     assert_deprecated(/you now need to do something extra for this one/) { @dtc.d }
   end
-
-  unless defined?(::MiniTest)
-    def test_assertion_failed_error_doesnt_spout_deprecation_warnings
-      error_class = Class.new(StandardError) do
-        def message
-          ActiveSupport::Deprecation.warn 'warning in error message'
-          super
-        end
-      end
-
-      raise error_class.new('hmm')
-
-    rescue => e
-      error = Test::Unit::Error.new('testing ur doodz', e)
-      assert_not_deprecated { error.message }
-      assert_nil @last_message
-    end
-  end
 end
diff --git a/activesupport/test/isolation_test.rb b/activesupport/test/isolation_test.rb
deleted file mode 100644
index c1932d73d9..0000000000
--- a/activesupport/test/isolation_test.rb
+++ /dev/null
@@ -1,162 +0,0 @@
-require 'abstract_unit'
-require 'rbconfig'
-
-if defined?(MiniTest) || defined?(Test::Unit::TestResultFailureSupport)
-  $stderr.puts "Isolation tests can test test-unit 1 only"
-
-elsif ENV['CHILD']
-  class ChildIsolationTest < ActiveSupport::TestCase
-    include ActiveSupport::Testing::Isolation
-
-    def self.setup
-      File.open(File.join(File.dirname(__FILE__), "fixtures", "isolation_test"), "a") do |f|
-        f.puts "hello"
-      end
-    end
-
-    def setup
-      @instance = "HELLO"
-    end
-
-    def teardown
-      raise if @boom
-    end
-
-    test "runs the test" do
-      assert true
-    end
-
-    test "captures errors" do
-      raise
-    end
-
-    test "captures failures" do
-      assert false
-    end
-
-    test "first runs in isolation" do
-      assert_nil $x
-      $x = 1
-    end
-
-    test "second runs in isolation" do
-      assert_nil $x
-      $x = 2
-    end
-
-    test "runs with slow tests" do
-      sleep 0.3
-      assert true
-      sleep 0.2
-    end
-
-    test "runs setup" do
-      assert "HELLO", @instance
-    end
-
-    test "runs teardown" do
-      @boom = true
-    end
-
-    test "resets requires one" do
-      assert !defined?(Custom)
-      assert_equal 0, $LOADED_FEATURES.grep(/fixtures\/custom/).size
-      require File.expand_path(File.join(File.dirname(__FILE__), "fixtures", "custom"))
-    end
-
-    test "resets requires two" do
-      assert !defined?(Custom)
-      assert_equal 0, $LOADED_FEATURES.grep(/fixtures\/custom/).size
-      require File.expand_path(File.join(File.dirname(__FILE__), "fixtures", "custom"))
-    end
-  end
-else
-  class ParentIsolationTest < ActiveSupport::TestCase
-
-    File.open(File.join(File.dirname(__FILE__), "fixtures", "isolation_test"), "w") {}
-
-    ENV["CHILD"] = "1"
-    OUTPUT = `#{RbConfig::CONFIG["bindir"]}/#{RbConfig::CONFIG["ruby_install_name"]} -I#{File.dirname(__FILE__)} "#{File.expand_path(__FILE__)}" -v`
-    ENV.delete("CHILD")
-
-    def setup
-      @results = {}
-      OUTPUT[/Started\n\s*(.*)\s*\nFinished/mi, 1].to_s.split(/\s*\n\s*/).each do |result|
-        result =~ %r'^\w+#(\w+):.*:\s*(.*Assertion.*|.*RuntimeError.*|\.\s*)$'
-        val = :success
-        val = :error if $2.include?('RuntimeError')
-        val = :failure if $2.include?('Assertion')
-
-        @results[$1] = val
-      end
-
-      # Extract the backtraces
-      @backtraces = {}
-      OUTPUT.scan(/^\s*\d+\).*?\n\n/m).each do |backtrace|
-        # \n  1) Error:\ntest_captures_errors(ChildIsolationTest):
-        backtrace =~ %r'\s*\d+\)\s*(Error|Failure):\n(\w+)'i
-        @backtraces[$2] = {:type => $1, :output => backtrace}
-      end
-    end
-
-    def assert_failing(name)
-      assert_equal :failure, @results[name.to_s], "Test #{name} failed"
-    end
-
-    def assert_passing(name)
-      assert_equal :success, @results[name.to_s], "Test #{name} passed"
-    end
-
-    def assert_erroring(name)
-      assert_equal :error, @results[name.to_s], "Test #{name} errored"
-    end
-
-    test "has all tests" do
-      assert_equal 10, @results.length
-    end
-
-    test "passing tests are still reported" do
-      assert_passing :test_runs_the_test
-      assert_passing :test_runs_with_slow_tests
-    end
-
-    test "resets global variables" do
-      assert_passing :test_first_runs_in_isolation
-      assert_passing :test_second_runs_in_isolation
-    end
-
-    test "resets requires" do
-      assert_passing :test_resets_requires_one
-      assert_passing :test_resets_requires_two
-    end
-
-    test "erroring tests are still reported" do
-      assert_erroring :test_captures_errors
-    end
-
-    test "runs setup and teardown methods" do
-      assert_passing :test_runs_setup
-      assert_erroring :test_runs_teardown
-    end
-
-    test "correct tests fail" do
-      assert_failing :test_captures_failures
-    end
-
-    test "backtrace is printed for errors" do
-      assert_equal 'Error', @backtraces["test_captures_errors"][:type]
-      assert_match %r{isolation_test.rb:\d+}, @backtraces["test_captures_errors"][:output]
-    end
-
-    test "backtrace is printed for failures" do
-      assert_equal 'Failure', @backtraces["test_captures_failures"][:type]
-      assert_match %r{isolation_test.rb:\d+}, @backtraces["test_captures_failures"][:output]
-    end
-
-    test "self.setup is run only once" do
-      text = File.read(File.join(File.dirname(__FILE__), "fixtures", "isolation_test"))
-      assert_equal "hello\n", text
-    end
-
-  end
-end
diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb
index 756d21b3e4..20982d089d 100644
--- a/activesupport/test/test_case_test.rb
+++ b/activesupport/test/test_case_test.rb
@@ -18,44 +18,42 @@ module ActiveSupport
       end
     end
 
-    if defined?(MiniTest::Assertions) && TestCase < MiniTest::Assertions
-      def test_callback_with_exception
-        tc = Class.new(TestCase) do
-          setup :bad_callback
-          def bad_callback; raise 'oh noes' end
-          def test_true; assert true end
-        end
-
-        test_name = 'test_true'
-        fr = FakeRunner.new
-
-        test = tc.new test_name
-        test.run fr
-        klass, name, exception = *fr.puked.first
-
-        assert_equal tc, klass
-        assert_equal test_name, name
-        assert_equal 'oh noes', exception.message
+    def test_callback_with_exception
+      tc = Class.new(TestCase) do
+        setup :bad_callback
+        def bad_callback; raise 'oh noes' end
+        def test_true; assert true end
       end
 
-      def test_teardown_callback_with_exception
-        tc = Class.new(TestCase) do
-          teardown :bad_callback
-          def bad_callback; raise 'oh noes' end
-          def test_true; assert true end
-        end
+      test_name = 'test_true'
+      fr = FakeRunner.new
 
-        test_name = 'test_true'
-        fr = FakeRunner.new
+      test = tc.new test_name
+      test.run fr
+      klass, name, exception = *fr.puked.first
 
-        test = tc.new test_name
-        test.run fr
-        klass, name, exception = *fr.puked.first
+      assert_equal tc, klass
+      assert_equal test_name, name
+      assert_equal 'oh noes', exception.message
+    end
 
-        assert_equal tc, klass
-        assert_equal test_name, name
-        assert_equal 'oh noes', exception.message
+    def test_teardown_callback_with_exception
+      tc = Class.new(TestCase) do
+        teardown :bad_callback
+        def bad_callback; raise 'oh noes' end
+        def test_true; assert true end
       end
+
+      test_name = 'test_true'
+      fr = FakeRunner.new
+
+      test = tc.new test_name
+      test.run fr
+      klass, name, exception = *fr.puked.first
+
+      assert_equal tc, klass
+      assert_equal test_name, name
+      assert_equal 'oh noes', exception.message
     end
   end
 end