From 30735ab7261db54209a7dca3410236abfbc997e0 Mon Sep 17 00:00:00 2001
From: James Mead <james@floehopper.org>
Date: Sat, 7 Apr 2018 12:23:40 +0100
Subject: 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.
---
 actioncable/test/test_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actioncable')

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
-- 
cgit v1.2.3