aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-05-30 13:04:33 -0700
committerPiotr Sarnacki <drogus@gmail.com>2012-05-30 13:04:33 -0700
commitaab0d4e2c67df1bf05ddcb2b90bee8e5dfea5909 (patch)
treed812c47c4cf538de1f2d7cc666ccdee7f0191db0 /activesupport/test
parentd5025f15d8ec753ebc03597a0a28f0e05575454e (diff)
parent1f5dddcf2fb05f460c13f2ea32c81033ca6b14de (diff)
downloadrails-aab0d4e2c67df1bf05ddcb2b90bee8e5dfea5909.tar.gz
rails-aab0d4e2c67df1bf05ddcb2b90bee8e5dfea5909.tar.bz2
rails-aab0d4e2c67df1bf05ddcb2b90bee8e5dfea5909.zip
Merge pull request #6554 from erichmenge/remove-json-variable
Remove deprecated ActiveSupport::JSON::Variable.
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/json/encoding_test.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb
index 212ee262a3..a947635f4a 100644
--- a/activesupport/test/json/encoding_test.rb
+++ b/activesupport/test/json/encoding_test.rb
@@ -54,8 +54,6 @@ class TestJSONEncoding < ActiveSupport::TestCase
HashlikeTests = [[ Hashlike.new, %({\"a\":1}) ]]
CustomTests = [[ Custom.new, '"custom"' ]]
- VariableTests = [[ ActiveSupport::JSON::Variable.new('foo'), 'foo'],
- [ ActiveSupport::JSON::Variable.new('alert("foo")'), 'alert("foo")']]
RegexpTests = [[ /^a/, '"(?-mix:^a)"' ], [/^\w{1,2}[a-z]+/ix, '"(?ix-m:^\\\\w{1,2}[a-z]+)"']]
DateTests = [[ Date.new(2005,2,1), %("2005/02/01") ]]