jro_apps/redmine Commit - r11666:596366b06286

upgrade mocha 0.14 and remove deprecation warning...

Toshi MARUYAMA -

r11666:596366b06286

parent child

Context file:

r11666:596366b06286

Gemfile +1 -1

             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"

lib/plugins/open_id_authentication/test/test_helper.rb +1 -1

             require 'action_controller'
             gem 'mocha'
-            require 'mocha'
+            require 'mocha/setup'
             gem 'ruby-openid'
             require 'openid'

test/integration/account_test.rb +1 -1

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

test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb +1 -1

             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

test/unit/lib/redmine/scm/adapters/cvs_adapter_test.rb +1 -1

             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

test/unit/lib/redmine/scm/adapters/darcs_adapter_test.rb +1 -1

             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

test/unit/lib/redmine/scm/adapters/git_adapter_test.rb +1 -1

             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

test/unit/lib/redmine/scm/adapters/mercurial_adapter_test.rb +1 -1

             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

test/unit/lib/redmine/scm/adapters/subversion_adapter_test.rb +1 -1

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

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages