aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable
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 /actioncable
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 'actioncable')
-rw-r--r--actioncable/test/test_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actioncable/test/test_helper.rb b/actioncable/test/test_helper.rb
index 2a4611fb37..2f186b7193 100644
--- a/actioncable/test/test_helper.rb
+++ b/actioncable/test/test_helper.rb
@@ -4,7 +4,7 @@ require "action_cable"
require "active_support/testing/autorun"
require "puma"
-require "mocha/setup"
+require "mocha/minitest"
require "rack/mock"
begin