diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-05 18:54:28 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-05 18:54:28 +0200 |
| commit | f2400de8013c4d9798e7f69c44b1c987e719a5a4 (patch) | |
| tree | 2ab0d3b2b2530ad296c34cc57df66c715ee7be0b /actionpack/test/abstract_unit.rb | |
| parent | a8f4568f5396b68ae81eddc636604bb78bb6632a (diff) | |
| parent | 81bc771e7cccb8a43f067a89f721f83798e63483 (diff) | |
| download | rails-f2400de8013c4d9798e7f69c44b1c987e719a5a4.tar.gz rails-f2400de8013c4d9798e7f69c44b1c987e719a5a4.tar.bz2 rails-f2400de8013c4d9798e7f69c44b1c987e719a5a4.zip | |
Merge pull request #21506 from rodzyn/remove_mocha_part_3
Remove mocha from ActionPack tests
Diffstat (limited to 'actionpack/test/abstract_unit.rb')
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index 1954324222..3c498960e4 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -406,7 +406,6 @@ def jruby_skip(message = '') skip message if defined?(JRUBY_VERSION) end -require 'mocha/setup' # FIXME: stop using mocha require 'active_support/testing/method_call_assertions' class ForkingExecutor |