summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-05-21 12:57:11 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2013-05-21 12:57:11 +0000
commit596366b062863ea8654536493480437208fcc965 (patch)
treef37afda5dbc026ab9ec72e3ac166d853fac45e1c /test
parentf4637c38b4733535aa3c34876f206840761b0a14 (diff)
downloadredmine-596366b062863ea8654536493480437208fcc965.tar.gz
redmine-596366b062863ea8654536493480437208fcc965.zip
upgrade mocha 0.14 and remove deprecation warning
<pre> Mocha deprecation warning: Change `require 'mocha'` to `require 'mocha/setup'`. </pre> git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11896 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
-rw-r--r--test/integration/account_test.rb2
-rw-r--r--test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb2
-rw-r--r--test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb2
-rw-r--r--test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb2
-rw-r--r--test/unit/lib/redmine/scm/adapters/git_adapter_test.rb2
-rw-r--r--test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb2
-rw-r--r--test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb2
7 files changed, 7 insertions, 7 deletions
diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb
index e950a0918..874fbf6a4 100644
--- a/test/integration/account_test.rb
+++ b/test/integration/account_test.rb
@@ -18,7 +18,7 @@
require File.expand_path('../../test_helper', __FILE__)
begin
- require 'mocha'
+ require 'mocha/setup'
rescue
# Won't run some tests
end
diff --git a/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb
index 763872db9..3eb614cf8 100644
--- a/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb
@@ -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
diff --git a/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb
index 26e962ce7..7ea234536 100644
--- a/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb
@@ -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
diff --git a/test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb
index 0fd2f1a74..eff12ee88 100644
--- a/test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb
@@ -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
diff --git a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
index 2b28a46d0..420d411c5 100644
--- a/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
@@ -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
diff --git a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
index c640b22d7..7a9696194 100644
--- a/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
@@ -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
diff --git a/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
index 145e7f0d6..e6ed5329f 100644
--- a/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
@@ -18,7 +18,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__)
begin
- require 'mocha'
+ require 'mocha/setup'
class SubversionAdapterTest < ActiveSupport::TestCase