diff options
| author | Go MAEDA <maeda@farend.jp> | 2019-12-11 14:09:01 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2019-12-11 14:09:01 +0000 |
| commit | 669c3c206b9f435cd639d308dfd31099fd8d1698 (patch) | |
| tree | 25ff38fafbe45fd3cc29fdb5198b69141f363da5 | |
| parent | c3474a96b22ded58e556cc290d804b25b3e6279a (diff) | |
| download | redmine-669c3c206b9f435cd639d308dfd31099fd8d1698.tar.gz redmine-669c3c206b9f435cd639d308dfd31099fd8d1698.zip | |
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
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | test/test_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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" diff --git a/test/test_helper.rb b/test/test_helper.rb index 0066d3819..270acb5ea 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! |