diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-12-11 14:01:43 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-12-11 14:01:43 +0000 |
| commit | a5e6be4d7043a3a2a311328f58cc1ec65be2d57e (patch) | |
| tree | 96195447d3f30a35b8adc7c27d92692e3f1e8fe9 | |
| parent | 50b1809d8c8389222347d2d98a0d29c3cb0b7f05 (diff) | |
| download | redmine-a5e6be4d7043a3a2a311328f58cc1ec65be2d57e.tar.gz redmine-a5e6be4d7043a3a2a311328f58cc1ec65be2d57e.zip | |
Merged r19358 from trunk to 4.1-stable (#32592).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19359 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | test/test_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -76,7 +76,7 @@ end group :test do gem "rails-dom-testing" - gem "mocha" + gem 'mocha', '>= 1.4.0' gem "simplecov", "~> 0.17.0", :require => false gem "ffi", platforms: [:mingw, :x64_mingw, :mswin] # For running system tests diff --git a/test/test_helper.rb b/test/test_helper.rb index e27334ca4..822c9eb0a 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -35,7 +35,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! |