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

git-svn-id: http://svn.redmine.org/redmine/branches/3.4-stable@19361 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2019-12-11 14:09:01 +00:00
parent c3474a96b2
commit 669c3c206b
2 changed files with 2 additions and 2 deletions

View File

@@ -96,7 +96,7 @@ end
group :test do
gem "minitest"
gem "rails-dom-testing"
gem "mocha"
gem 'mocha', '>= 1.4.0'
gem "simplecov", "~> 0.9.1", :require => false
# TODO: remove this after upgrading to Rails 5
gem "test_after_commit", "~> 0.4.2"

View File

@@ -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!