kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Toshi MARUYAMA 2013-05-21 12:57:11 +00:00
parent f4637c38b4
commit 596366b062
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -78,7 +78,7 @@ end
group :test do group :test do
gem "shoulda", "~> 3.3.2" gem "shoulda", "~> 3.3.2"
gem "mocha", "~> 0.13.3" gem "mocha", ">= 0.14", :require => 'mocha/api'
if RUBY_VERSION >= '1.9.3' if RUBY_VERSION >= '1.9.3'
gem "capybara", "~> 2.1.0" gem "capybara", "~> 2.1.0"
gem "selenium-webdriver" gem "selenium-webdriver"

2
lib/plugins/open_id_authentication/test/test_helper.rb
View File

@ -8,7 +8,7 @@ gem 'actionpack'
require 'action_controller' require 'action_controller'
gem 'mocha' gem 'mocha'
require 'mocha' require 'mocha/setup'
gem 'ruby-openid' gem 'ruby-openid'
require 'openid' require 'openid'

2
test/integration/account_test.rb
View File

@ -18,7 +18,7 @@
require File.expand_path('../../test_helper', __FILE__) require File.expand_path('../../test_helper', __FILE__)
begin begin
require 'mocha' require 'mocha/setup'
rescue rescue
# Won't run some tests # Won't run some tests
end end

2
test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb
View File

@ -17,7 +17,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__) require File.expand_path('../../../../../../test_helper', __FILE__)
begin begin
require 'mocha' require 'mocha/setup'
class BazaarAdapterTest < ActiveSupport::TestCase class BazaarAdapterTest < ActiveSupport::TestCase
REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s REPOSITORY_PATH = Rails.root.join('tmp/test/bazaar_repository').to_s

2
test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb
View File

@ -17,7 +17,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__) require File.expand_path('../../../../../../test_helper', __FILE__)
begin begin
require 'mocha' require 'mocha/setup'
class CvsAdapterTest < ActiveSupport::TestCase class CvsAdapterTest < ActiveSupport::TestCase
REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s REPOSITORY_PATH = Rails.root.join('tmp/test/cvs_repository').to_s

2
test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb
View File

@ -17,7 +17,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__) require File.expand_path('../../../../../../test_helper', __FILE__)
begin begin
require 'mocha' require 'mocha/setup'
class DarcsAdapterTest < ActiveSupport::TestCase class DarcsAdapterTest < ActiveSupport::TestCase
REPOSITORY_PATH = Rails.root.join('tmp/test/darcs_repository').to_s REPOSITORY_PATH = Rails.root.join('tmp/test/darcs_repository').to_s

2
test/unit/lib/redmine/scm/adapters/git_adapter_test.rb
View File

@ -17,7 +17,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__) require File.expand_path('../../../../../../test_helper', __FILE__)
begin begin
require 'mocha' require 'mocha/setup'
class GitAdapterTest < ActiveSupport::TestCase class GitAdapterTest < ActiveSupport::TestCase
REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s REPOSITORY_PATH = Rails.root.join('tmp/test/git_repository').to_s

2
test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb
View File

@ -17,7 +17,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__) require File.expand_path('../../../../../../test_helper', __FILE__)
begin begin
require 'mocha' require 'mocha/setup'
class MercurialAdapterTest < ActiveSupport::TestCase class MercurialAdapterTest < ActiveSupport::TestCase
HELPERS_DIR = Redmine::Scm::Adapters::MercurialAdapter::HELPERS_DIR HELPERS_DIR = Redmine::Scm::Adapters::MercurialAdapter::HELPERS_DIR

2
test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb
View File

@ -18,7 +18,7 @@
require File.expand_path('../../../../../../test_helper', __FILE__) require File.expand_path('../../../../../../test_helper', __FILE__)
begin begin
require 'mocha' require 'mocha/setup'
class SubversionAdapterTest < ActiveSupport::TestCase class SubversionAdapterTest < ActiveSupport::TestCase