From af845488c869edf6ad241c4b73889333fddc8e7e Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Wed, 11 Dec 2019 14:04:50 +0000 Subject: [PATCH] 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 --- Gemfile | 2 +- test/test_helper.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index e8ef8bd42..2a2181cb2 100644 --- 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 796daf268..9456ea229 100644 --- 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! -- 2.39.5