diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2013-11-06 10:26:02 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2013-11-06 10:26:02 -0800 |
| commit | 0f5a36eb4c344ab84d45adc76239a9bd82b87684 (patch) | |
| tree | 912c2a18d3fd91292f48515f818965cdb90695c7 /actionpack/test/lib | |
| parent | aeaf3a9d0094d527f6f79ba48747bb2b28c9d30a (diff) | |
| parent | ff1192fea40c55a11c52e26f22a814d68d058170 (diff) | |
| download | rails-0f5a36eb4c344ab84d45adc76239a9bd82b87684.tar.gz rails-0f5a36eb4c344ab84d45adc76239a9bd82b87684.tar.bz2 rails-0f5a36eb4c344ab84d45adc76239a9bd82b87684.zip | |
Merge pull request #12783 from chancancode/eliminate_direct_json_gem_use
Eliminate `JSON.{parse,load,generate,dump}` and `def to_json`
Diffstat (limited to 'actionpack/test/lib')
| -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 |