diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-08-24 12:44:01 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-08-24 12:44:01 +0200 |
| commit | b9825801e2cbb39fafc761ea24667e714d3cee2f (patch) | |
| tree | e84263a49fe56a05fc9245b0385000c57ebe70ab /actionpack/test/abstract_unit.rb | |
| parent | a256a5790a907c67b823496f0ed15a705418291c (diff) | |
| parent | 3a161e65e76a83be6d62c424227fe10b5b66b77d (diff) | |
| download | rails-b9825801e2cbb39fafc761ea24667e714d3cee2f.tar.gz rails-b9825801e2cbb39fafc761ea24667e714d3cee2f.tar.bz2 rails-b9825801e2cbb39fafc761ea24667e714d3cee2f.zip | |
Merge pull request #21321 from rodzyn/removing_mocha
Get rid of mocha tests in actionpack - part 1
Diffstat (limited to 'actionpack/test/abstract_unit.rb')
| -rw-r--r-- | actionpack/test/abstract_unit.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb index fa0b6087ba..7ea4249e7e 100644 --- a/actionpack/test/abstract_unit.rb +++ b/actionpack/test/abstract_unit.rb @@ -397,6 +397,7 @@ def jruby_skip(message = '') end require 'mocha/setup' # FIXME: stop using mocha +require 'minitest/mock' class ForkingExecutor class Server |