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 /actionpack | |
| 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 'actionpack')
| -rw-r--r-- | actionpack/test/template/sprockets_helper_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/template/sprockets_helper_with_routes_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb index 72d03e43e9..e944cfaee3 100644 --- a/actionpack/test/template/sprockets_helper_test.rb +++ b/actionpack/test/template/sprockets_helper_test.rb @@ -1,7 +1,7 @@ require 'abstract_unit' require 'sprockets' require 'sprockets/helpers/rails_helper' -require 'mocha' +require 'mocha/setup' class SprocketsHelperTest < ActionView::TestCase include Sprockets::Helpers::RailsHelper diff --git a/actionpack/test/template/sprockets_helper_with_routes_test.rb b/actionpack/test/template/sprockets_helper_with_routes_test.rb index bcbd81a7dd..bc253ea0fd 100644 --- a/actionpack/test/template/sprockets_helper_with_routes_test.rb +++ b/actionpack/test/template/sprockets_helper_with_routes_test.rb @@ -1,7 +1,7 @@ require 'abstract_unit' require 'sprockets' require 'sprockets/helpers/rails_helper' -require 'mocha' +require 'mocha/setup' class SprocketsHelperWithRoutesTest < ActionView::TestCase include Sprockets::Helpers::RailsHelper @@ -54,4 +54,4 @@ class SprocketsHelperWithRoutesTest < ActionView::TestCase stylesheet_link_tag(:application) end -end
\ No newline at end of file +end |