diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-28 16:17:37 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-12-31 13:57:24 -0300 |
| commit | 5da4d5142a60edda0cb78071553993ee33bb8637 (patch) | |
| tree | 7c9f025bb50cd918c176a429749d221caa27802e /activerecord | |
| parent | eb4930e3c724cf71d6ce5bb2aec4af82b2025b03 (diff) | |
| download | rails-5da4d5142a60edda0cb78071553993ee33bb8637.tar.gz rails-5da4d5142a60edda0cb78071553993ee33bb8637.tar.bz2 rails-5da4d5142a60edda0cb78071553993ee33bb8637.zip | |
Add active_support/testing/autorun
minitest/autorun load minitest/spec polluting the global namespace with
the DSL that we don't want on Rails
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/helper.rb | 3 | ||||
| -rw-r--r-- | activerecord/test/cases/migration/change_table_test.rb | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index 3a315d843b..5ffb32e809 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -2,8 +2,7 @@ require File.expand_path('../../../../load_paths', __FILE__) require 'config' -gem 'minitest' -require 'minitest/autorun' +require 'active_support/testing/autorun' require 'stringio' require 'active_record' diff --git a/activerecord/test/cases/migration/change_table_test.rb b/activerecord/test/cases/migration/change_table_test.rb index ac1ad176db..8065541bfe 100644 --- a/activerecord/test/cases/migration/change_table_test.rb +++ b/activerecord/test/cases/migration/change_table_test.rb @@ -1,4 +1,5 @@ require "cases/migration/helper" +require "minitest/mock" module ActiveRecord class Migration |