diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2013-11-05 20:05:58 -0800 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2013-11-05 22:26:45 -0800 |
| commit | ff1192fea40c55a11c52e26f22a814d68d058170 (patch) | |
| tree | 6cc0b55aeed8013c2bf9aa39dac0eb4f9733249d /actionpack/test/lib/controller | |
| parent | dcee010ce8c05cd0180e691ca165d774fba60de7 (diff) | |
| download | rails-ff1192fea40c55a11c52e26f22a814d68d058170.tar.gz rails-ff1192fea40c55a11c52e26f22a814d68d058170.tar.bz2 rails-ff1192fea40c55a11c52e26f22a814d68d058170.zip | |
Eliminate `JSON.{parse,load,generate,dump}` and `def to_json`
JSON.{dump,generate} offered by the JSON gem is not compatiable with
Rails at the moment and can cause a lot of subtle bugs when passed
certain data structures. This changed all direct usage of the JSON gem
in internal Rails code to always go through AS::JSON.{decode,encode}.
We also shouldn't be implementing `to_json` most of the time, and
these occurances are replaced with an equivilent `as_json`
implementation to avoid problems down the road.
See [1] for all the juicy details.
[1]: intridea/multi_json#138 (comment)
Diffstat (limited to 'actionpack/test/lib/controller')
| -rw-r--r-- | actionpack/test/lib/controller/fake_models.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/lib/controller/fake_models.rb b/actionpack/test/lib/controller/fake_models.rb index 08af187311..b8b51d86c2 100644 --- a/actionpack/test/lib/controller/fake_models.rb +++ b/actionpack/test/lib/controller/fake_models.rb @@ -112,7 +112,7 @@ module Blog end class RenderJsonTestException < Exception - def to_json(options = nil) - return { :error => self.class.name, :message => self.to_s }.to_json + def as_json(options = nil) + { :error => self.class.name, :message => self.to_s } end end |