aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/helper.rb
diff options
context:
space:
mode:
authorJames Mead <james@floehopper.org>2018-04-07 12:23:40 +0100
committerJames Mead <james@floehopper.org>2018-04-07 12:23:40 +0100
commit30735ab7261db54209a7dca3410236abfbc997e0 (patch)
treebd8e727ac90551005f5380cfbc8e335d5ef37cc1 /activerecord/test/cases/helper.rb
parent364756c15c085a5157c7fbbc49aa615486993dfb (diff)
downloadrails-30735ab7261db54209a7dca3410236abfbc997e0.tar.gz
rails-30735ab7261db54209a7dca3410236abfbc997e0.tar.bz2
rails-30735ab7261db54209a7dca3410236abfbc997e0.zip
Make Mocha setup explcitly Minitest-specific
This has been possible since Mocha v1.0 and makes it clear that we want Mocha to integrate with Minitest, not Test::Unit.
Diffstat (limited to 'activerecord/test/cases/helper.rb')
-rw-r--r--activerecord/test/cases/helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 6ea02ac191..66f11fe5bd 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -184,4 +184,4 @@ module InTimeZone
end
end
-require "mocha/setup" # FIXME: stop using mocha
+require "mocha/minitest" # FIXME: stop using mocha