Commit bd107f2f authored by tmaruyama's avatar tmaruyama

upgrade mocha 0.14 and remove deprecation warning

<pre>
Mocha deprecation warning: Change `require 'mocha'` to `require 'mocha/setup'`.
</pre>

git-svn-id: https://svn.redmine.org/redmine/trunk@11896 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 02d1e451
......@@ -78,7 +78,7 @@ end
group :test do
gem "shoulda", "~> 3.3.2"
gem "mocha", "~> 0.13.3"
gem "mocha", ">= 0.14", :require => 'mocha/api'
if RUBY_VERSION >= '1.9.3'
gem "capybara", "~> 2.1.0"
gem "selenium-webdriver"
......
......@@ -8,7 +8,7 @@ gem 'actionpack'
require 'action_controller'
gem 'mocha'
require 'mocha'
require 'mocha/setup'
gem 'ruby-openid'
require 'openid'
......
......@@ -18,7 +18,7 @@
require File.expand_path('../../test_helper', __FILE__)
begin
require 'mocha'
require 'mocha/setup'
rescue
# Won't run some tests
end
......
......@@ -17,7 +17,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__)
begin
require 'mocha'
require 'mocha/setup'
class BazaarAdapterTest < ActiveSupport::TestCase
REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s
......
......@@ -17,7 +17,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__)
begin
require 'mocha'
require 'mocha/setup'
class CvsAdapterTest < ActiveSupport::TestCase
REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s
......
......@@ -17,7 +17,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__)
begin
require 'mocha'
require 'mocha/setup'
class DarcsAdapterTest < ActiveSupport::TestCase
REPOSITORY_PATH = Rails.root.join('tmp/test/darcs_repository').to_s
......
......@@ -17,7 +17,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__)
begin
require 'mocha'
require 'mocha/setup'
class GitAdapterTest < ActiveSupport::TestCase
REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s
......
......@@ -17,7 +17,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__)
begin
require 'mocha'
require 'mocha/setup'
class MercurialAdapterTest < ActiveSupport::TestCase
HELPERS_DIR = Redmine::Scm::Adapters::MercurialAdapter::HELPERS_DIR
......
......@@ -18,7 +18,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__)
begin
require 'mocha'
require 'mocha/setup'
class SubversionAdapterTest < ActiveSupport::TestCase
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment