diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-08-24 10:29:27 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-08-24 10:29:27 +0200 |
| commit | ef8d09d932e36b0614905ea5bc3fb6af318b6ce2 (patch) | |
| tree | c00eb8242e07fa0f3f875284ccb91f29c3ddca4f /actionview/test/abstract_unit.rb | |
| parent | 4f252cddc1ee4e28c633a2250335b2fac4d31108 (diff) | |
| parent | 0a5b08a1e7a50377f94b50e2fdadf9551ad81912 (diff) | |
| download | rails-ef8d09d932e36b0614905ea5bc3fb6af318b6ce2.tar.gz rails-ef8d09d932e36b0614905ea5bc3fb6af318b6ce2.tar.bz2 rails-ef8d09d932e36b0614905ea5bc3fb6af318b6ce2.zip | |
Merge pull request #21347 from ronakjangir47/remove_mocha_actionview
Removed Mocha from ActionView part 1
Diffstat (limited to 'actionview/test/abstract_unit.rb')
| -rw-r--r-- | actionview/test/abstract_unit.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb index 35f520ed1c..12870acaa6 100644 --- a/actionview/test/abstract_unit.rb +++ b/actionview/test/abstract_unit.rb @@ -16,6 +16,7 @@ silence_warnings do end require 'active_support/testing/autorun' +require 'active_support/testing/method_call_assertions' require 'action_controller' require 'action_view' require 'action_view/testing/resolvers' @@ -281,3 +282,6 @@ def jruby_skip(message = '') end require 'mocha/setup' # FIXME: stop using mocha +class ActiveSupport::TestCase + include ActiveSupport::Testing::MethodCallAssertions +end |