aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorNeeraj Singh <neerajdotname@gmail.com>2011-06-10 02:27:57 -0400
committerNeeraj Singh <neerajdotname@gmail.com>2011-06-10 02:27:57 -0400
commitfdbe8eb08cd227cc57315134e4e253818ccf1b67 (patch)
tree685a07604c9b08b12778dc39dd54a0a213cdf88d /actionpack/test
parent49d032929b4924a3fc3e43aa21ca90d7f1174724 (diff)
downloadrails-fdbe8eb08cd227cc57315134e4e253818ccf1b67.tar.gz
rails-fdbe8eb08cd227cc57315134e4e253818ccf1b67.tar.bz2
rails-fdbe8eb08cd227cc57315134e4e253818ccf1b67.zip
replaced and with && as per coding guidelines
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/caching_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index dcb88d604d..da3314fe6d 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -141,7 +141,7 @@ class PageCachingTest < ActionController::TestCase
[:ok, :no_content, :found, :not_found].each do |status|
[:get, :post, :put, :delete].each do |method|
- unless method == :get and status == :ok
+ unless method == :get && status == :ok
define_method "test_shouldnt_cache_#{method}_with_#{status}_status" do
send(method, status)
assert_response status