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

Gemfile

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

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!