aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-09-29 08:04:39 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-09-29 08:04:39 +0000
commit4f3bf6cb23991af8fac69b67dc73844f6a92205e (patch)
treebfb4b5e74fc9bbfe61d7ad91781d2a2256348b3c /actionpack/test
parentf0152fb610df134f5b3aaeea08ab82cd9643dd5a (diff)
downloadrails-4f3bf6cb23991af8fac69b67dc73844f6a92205e.tar.gz
rails-4f3bf6cb23991af8fac69b67dc73844f6a92205e.tar.bz2
rails-4f3bf6cb23991af8fac69b67dc73844f6a92205e.zip
Deprecate @cookies
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5205 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/cookie_test.rb2
-rw-r--r--actionpack/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml1
-rw-r--r--actionpack/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml1
3 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/test/controller/cookie_test.rb b/actionpack/test/controller/cookie_test.rb
index f0189ebb11..2e1c7f0eb0 100644
--- a/actionpack/test/controller/cookie_test.rb
+++ b/actionpack/test/controller/cookie_test.rb
@@ -29,7 +29,7 @@ class CookieTest < Test::Unit::TestCase
end
def access_frozen_cookies
- @cookies["will"] = "work"
+ cookies["will"] = "work"
render_text "hello world"
end
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml
new file mode 100644
index 0000000000..4e8a2d804c
--- /dev/null
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_cookies_ivar.rhtml
@@ -0,0 +1 @@
+<%= @cookies[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml b/actionpack/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml
new file mode 100644
index 0000000000..68e88bb746
--- /dev/null
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_cookies_method.rhtml
@@ -0,0 +1 @@
+<%= cookies[:test] %>