Require 'mocha/minitest' instead of deprecated 'mocha/setup' (#32592).

Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@19358 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2019-12-11 13:59:01 +00:00
parent d302f778be
commit b6f1d03194
2 changed files with 2 additions and 2 deletions

View File

@@ -76,7 +76,7 @@ end
group :test do group :test do
gem "rails-dom-testing" gem "rails-dom-testing"
gem "mocha" gem 'mocha', '>= 1.4.0'
gem "simplecov", "~> 0.17.0", :require => false gem "simplecov", "~> 0.17.0", :require => false
gem "ffi", platforms: [:mingw, :x64_mingw, :mswin] gem "ffi", platforms: [:mingw, :x64_mingw, :mswin]
# For running system tests # For running system tests

View File

@@ -35,7 +35,7 @@ require File.expand_path(File.dirname(__FILE__) + '/object_helpers')
include ObjectHelpers include ObjectHelpers
require 'net/ldap' require 'net/ldap'
require 'mocha/setup' require 'mocha/minitest'
require 'fileutils' require 'fileutils'
Redmine::SudoMode.disable! Redmine::SudoMode.disable!