diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-22 15:19:19 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-22 19:19:12 -0800 |
| commit | f927a60d0fa33f3e0fc3c0c891ae7657a227707f (patch) | |
| tree | 3a9541a4d16e0ba6a8d1afeee03f26e57a09044e /activesupport/test/json | |
| parent | 708f4c3ae6a41a46ab36a05ea4e126392b81511b (diff) | |
| download | rails-f927a60d0fa33f3e0fc3c0c891ae7657a227707f.tar.gz rails-f927a60d0fa33f3e0fc3c0c891ae7657a227707f.tar.bz2 rails-f927a60d0fa33f3e0fc3c0c891ae7657a227707f.zip | |
Require mocha >= 0.9.0 for AS tests
Diffstat (limited to 'activesupport/test/json')
| -rw-r--r-- | activesupport/test/json/encoding_test.rb | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb index c070e0d9ed..8ed21cc9ad 100644 --- a/activesupport/test/json/encoding_test.rb +++ b/activesupport/test/json/encoding_test.rb @@ -126,15 +126,13 @@ class TestJSONEncoding < Test::Unit::TestCase end end -uses_mocha 'JsonOptionsTests' do - class JsonOptionsTests < Test::Unit::TestCase - def test_enumerable_should_passthrough_options_to_elements - json_options = { :include => :posts } - ActiveSupport::JSON.expects(:encode).with(1, json_options) - ActiveSupport::JSON.expects(:encode).with(2, json_options) - ActiveSupport::JSON.expects(:encode).with('foo', json_options) - - [1, 2, 'foo'].to_json(json_options) - end +class JsonOptionsTests < Test::Unit::TestCase + def test_enumerable_should_passthrough_options_to_elements + json_options = { :include => :posts } + ActiveSupport::JSON.expects(:encode).with(1, json_options) + ActiveSupport::JSON.expects(:encode).with(2, json_options) + ActiveSupport::JSON.expects(:encode).with('foo', json_options) + + [1, 2, 'foo'].to_json(json_options) end end |