aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/assertions
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-09-04 03:07:17 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-09-04 03:07:17 +0000
commitc3a52523ceaf4aab819c7c5da748d552f9cb3f99 (patch)
tree18d27610f2e5084f62a3bd7c6d3ef1bcaaa9a800 /actionpack/lib/action_controller/assertions
parent23d579b262e6f665d8d343d066aa7fd640ce46b4 (diff)
downloadrails-c3a52523ceaf4aab819c7c5da748d552f9cb3f99.tar.gz
rails-c3a52523ceaf4aab819c7c5da748d552f9cb3f99.tar.bz2
rails-c3a52523ceaf4aab819c7c5da748d552f9cb3f99.zip
Active Record integration deprecation tests
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4962 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/assertions')
-rw-r--r--actionpack/lib/action_controller/assertions/deprecated_assertions.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/assertions/deprecated_assertions.rb b/actionpack/lib/action_controller/assertions/deprecated_assertions.rb
index 07adb83695..c7d2eec66c 100644
--- a/actionpack/lib/action_controller/assertions/deprecated_assertions.rb
+++ b/actionpack/lib/action_controller/assertions/deprecated_assertions.rb
@@ -215,14 +215,14 @@ module ActionController #:nodoc:
end
def find_record_in_template(key = nil)
- assert_template_has(key)
+ assert_not_nil assigns(key)
record = @response.template_objects[key]
assert_not_nil(record)
assert_kind_of ActiveRecord::Base, record
return record
- end
+ end
end
end
-end \ No newline at end of file
+end