Merged r19358 from trunk to 4.0-stable (#32592).

git-svn-id: http://svn.redmine.org/redmine/branches/4.0-stable@19360 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/Gemfile b/Gemfile
index e8ef8bd42def1e61c654e49e7b315a935b11937e..2a2181cb2cda06b3322114dd124f99222df892a2 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -83,7 +83,7 @@ end
 
 group :test do
   gem "rails-dom-testing"
-  gem "mocha"
+  gem 'mocha', '>= 1.4.0'
   gem "simplecov", "~> 0.14.1", :require => false
   # For running system tests
   gem 'puma', '~> 3.7'

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 796daf268e2d7ff1efbf485613bb29c2cceaada3..9456ea229896786076106bf1e82c0fac082b0335 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -33,7 +33,7 @@ require File.expand_path(File.dirname(__FILE__) + '/object_helpers')
 include ObjectHelpers
 
 require 'net/ldap'
-require 'mocha/setup'
+require 'mocha/minitest'
 require 'fileutils'
 
 Redmine::SudoMode.disable!