diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-12 20:29:15 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-13 09:24:43 -0200 |
| commit | 17ccefc4360caea1a80eada324513dc6cb809c75 (patch) | |
| tree | b7741b29488087d2abb4ab75b667b113b978ab6d /railties/test | |
| parent | 25b23d7ecc3a6c339fb580bd94dc5830ceb71b6f (diff) | |
| download | rails-17ccefc4360caea1a80eada324513dc6cb809c75.tar.gz rails-17ccefc4360caea1a80eada324513dc6cb809c75.tar.bz2 rails-17ccefc4360caea1a80eada324513dc6cb809c75.zip | |
Update mocha version to 0.13.0 and change requires
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/application/rack/logger_test.rb | 1 | ||||
| -rw-r--r-- | railties/test/application/route_inspect_test.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators_test.rb | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/railties/test/application/rack/logger_test.rb b/railties/test/application/rack/logger_test.rb index c13f9a49e7..984d8374fb 100644 --- a/railties/test/application/rack/logger_test.rb +++ b/railties/test/application/rack/logger_test.rb @@ -1,6 +1,7 @@ require "isolation/abstract_unit" require "active_support/log_subscriber/test_helper" require "rack/test" +require "mocha/setup" module ApplicationTests module RackTests diff --git a/railties/test/application/route_inspect_test.rb b/railties/test/application/route_inspect_test.rb index b897cf15b8..5c920cb33a 100644 --- a/railties/test/application/route_inspect_test.rb +++ b/railties/test/application/route_inspect_test.rb @@ -1,5 +1,5 @@ require 'test/unit' -require 'mocha' +require 'mocha/setup' require 'rails/application/route_inspector' require 'action_controller' require 'rails/engine' diff --git a/railties/test/generators_test.rb b/railties/test/generators_test.rb index 5f9ee220dc..01bd11e1ab 100644 --- a/railties/test/generators_test.rb +++ b/railties/test/generators_test.rb @@ -1,7 +1,7 @@ require 'generators/generators_test_helper' require 'rails/generators/rails/model/model_generator' require 'rails/generators/test_unit/model/model_generator' -require 'mocha' +require 'mocha/setup' class GeneratorsTest < Rails::Generators::TestCase include GeneratorsTestHelper @@ -201,7 +201,7 @@ class GeneratorsTest < Rails::Generators::TestCase mspec = Rails::Generators.find_by_namespace :fixjour assert mspec.source_paths.include?(File.join(Rails.root, "lib", "templates", "fixjour")) end - + def test_usage_with_embedded_ruby require File.expand_path("fixtures/lib/generators/usage_template/usage_template_generator", File.dirname(__FILE__)) output = capture(:stdout) { Rails::Generators.invoke :usage_template, ['--help'] } |