From 71234daef1517cf190adfc5978e56882d2a57ea6 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper
Date: Sat, 8 Jul 2006 18:14:49 +0000
Subject: r4487@asus: jeremy | 2006-04-29 12:21:39 -0700 Check whether
@flash is defined? for warnings-safety. r4488@asus: jeremy | 2006-04-29
12:23:15 -0700 Check whether @flash is defined? for warnings-safety.
Obviates nil? check. r4489@asus: jeremy | 2006-04-29 12:45:18 -0700 Check
whether @session is defined? for warnings-safety. r4490@asus: jeremy |
2006-04-29 12:50:41 -0700 Check whether @rendering_runtime is defined? for
warnings-safety. r4491@asus: jeremy | 2006-04-29 12:55:01 -0700 Check
whether @_cycles is defined? for warnings-safety. r4492@asus: jeremy |
2006-04-29 12:59:19 -0700 Check whether instance variables are defined? for
warnings-safety. r4493@asus: jeremy | 2006-04-29 13:14:09 -0700 Add nil
@template to PrototypeHelperTest to suppress unitialized instance variable
warning. r4494@asus: jeremy | 2006-04-29 13:31:34 -0700 Check whether
@auto_index defined? for warnings-safety. r4495@asus: jeremy | 2006-04-29
13:32:24 -0700 Wrap content_columns redefinitions with silence_warnings.
r4496@asus: jeremy | 2006-04-29 13:35:28 -0700 Wrap more redefinitions with
silence_warnings. r4829@asus: jeremy | 2006-07-08 10:59:20 -0700 abstract
unit, fix warnings r4830@asus: jeremy | 2006-07-08 11:06:12 -0700 Use
parens to silence warning. r4831@asus: jeremy | 2006-07-08 11:06:48 -0700
Use parens to silence warning.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4595 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
.../test/template/active_record_helper_test.rb | 29 +++++++++++++++-------
1 file changed, 20 insertions(+), 9 deletions(-)
(limited to 'actionpack/test/template/active_record_helper_test.rb')
diff --git a/actionpack/test/template/active_record_helper_test.rb b/actionpack/test/template/active_record_helper_test.rb
index 928c31832a..6f7f013de4 100644
--- a/actionpack/test/template/active_record_helper_test.rb
+++ b/actionpack/test/template/active_record_helper_test.rb
@@ -49,7 +49,9 @@ class ActiveRecordHelperTest < Test::Unit::TestCase
Post.content_columns.select { |column| column.name == attr_name }.first
end
- def Post.content_columns() [ Column.new(:string, "title", "Title"), Column.new(:text, "body", "Body") ] end
+ silence_warnings do
+ def Post.content_columns() [ Column.new(:string, "title", "Title"), Column.new(:text, "body", "Body") ] end
+ end
@post.title = "Hello World"
@post.author_name = ""
@@ -76,7 +78,9 @@ class ActiveRecordHelperTest < Test::Unit::TestCase
User.content_columns.select { |column| column.name == attr_name }.first
end
- def User.content_columns() [ Column.new(:string, "email", "Email") ] end
+ silence_warnings do
+ def User.content_columns() [ Column.new(:string, "email", "Email") ] end
+ end
@user.email = ""
end
@@ -119,11 +123,14 @@ class ActiveRecordHelperTest < Test::Unit::TestCase
form("post")
)
- class << @post
- def new_record?() false end
- def to_param() id end
- def id() 1 end
+ silence_warnings do
+ class << @post
+ def new_record?() false end
+ def to_param() id end
+ def id() 1 end
+ end
end
+
assert_dom_equal(
%(
),
form("post")
@@ -131,16 +138,20 @@ class ActiveRecordHelperTest < Test::Unit::TestCase
end
def test_form_with_date
- def Post.content_columns() [ Column.new(:date, "written_on", "Written on") ] end
+ silence_warnings do
+ def Post.content_columns() [ Column.new(:date, "written_on", "Written on") ] end
+ end
assert_dom_equal(
%(),
form("post")
)
end
-
+
def test_form_with_datetime
- def Post.content_columns() [ Column.new(:datetime, "written_on", "Written on") ] end
+ silence_warnings do
+ def Post.content_columns() [ Column.new(:datetime, "written_on", "Written on") ] end
+ end
@post.written_on = Time.gm(2004, 6, 15, 16, 30)
assert_dom_equal(
--
cgit v1.2.3