From 9342492e1445c47b02db392ba8430ecb9218fc47 Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Thu, 5 Jan 2012 16:51:37 -0800 Subject: require test/unit and sort test order --- activerecord/test/cases/helper.rb | 2 +- activesupport/lib/active_support/test_case.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index adcfed56f9..d16cccdaea 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -2,7 +2,7 @@ require File.expand_path('../../../../load_paths', __FILE__) require 'config' -require 'test/unit' +require 'minitest/autorun' require 'stringio' require 'mocha' diff --git a/activesupport/lib/active_support/test_case.rb b/activesupport/lib/active_support/test_case.rb index 6903733625..4bb4cd196e 100644 --- a/activesupport/lib/active_support/test_case.rb +++ b/activesupport/lib/active_support/test_case.rb @@ -19,6 +19,12 @@ module ActiveSupport yield if $tags[tag] end + # FIXME: we have tests that depend on run order, we should fix that and + # remove this method. + def self.test_order # :nodoc: + :sorted + end + include ActiveSupport::Testing::SetupAndTeardown include ActiveSupport::Testing::Assertions include ActiveSupport::Testing::Deprecation -- cgit v1.2.3