diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2018-04-07 22:30:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-07 22:30:48 -0500 |
| commit | 8a2f4a212ac5b68cc37050f56a50cae689259920 (patch) | |
| tree | fed0f0eae57b55f0f8ffc655b933a20cb7321f03 /activerecord | |
| parent | a7491b73f830be093fd35740c377d65235078321 (diff) | |
| parent | 1cc282db7dea1b6eba2132775a17d980e40eee23 (diff) | |
| download | rails-8a2f4a212ac5b68cc37050f56a50cae689259920.tar.gz rails-8a2f4a212ac5b68cc37050f56a50cae689259920.tar.bz2 rails-8a2f4a212ac5b68cc37050f56a50cae689259920.zip | |
Merge pull request #32486 from floehopper/mocha-updates
Mocha updates
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/helper.rb | 2 |
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 |