aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/template/atom_feed_helper_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-01-17 12:00:05 -0800
committerJosé Valim <jose.valim@gmail.com>2012-01-17 12:00:05 -0800
commitba154bd76fb481d9faca123e988924bd864c0318 (patch)
tree89cb9542a0717e52477e6c0ae08fd703ce80dd6d /actionpack/test/template/atom_feed_helper_test.rb
parent422958f17cbe1b6009313b7acd01cc11aacec3d7 (diff)
parent96a817fb2c5ca32c69469a9d2dc13630d8fa5e8a (diff)
downloadrails-ba154bd76fb481d9faca123e988924bd864c0318.tar.gz
rails-ba154bd76fb481d9faca123e988924bd864c0318.tar.bz2
rails-ba154bd76fb481d9faca123e988924bd864c0318.zip
Merge pull request #4497 from carlosantoniodasilva/action-controller-refactor
Action controller refactor - remove Compatibility module
Diffstat (limited to 'actionpack/test/template/atom_feed_helper_test.rb')
-rw-r--r--actionpack/test/template/atom_feed_helper_test.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/test/template/atom_feed_helper_test.rb b/actionpack/test/template/atom_feed_helper_test.rb
index 81d7444cf8..d26aa9aa85 100644
--- a/actionpack/test/template/atom_feed_helper_test.rb
+++ b/actionpack/test/template/atom_feed_helper_test.rb
@@ -16,7 +16,7 @@ class ScrollsController < ActionController::Base
feed.title("My great blog!")
feed.updated((@scrolls.first.created_at))
- @scrolls.each do |scroll|
+ @scrolls.each do |scroll|
feed.entry(scroll) do |entry|
entry.title(scroll.title)
entry.content(scroll.body, :type => 'html')
@@ -185,11 +185,6 @@ class ScrollsController < ActionController::Base
render :inline => FEEDS[params[:id]], :type => :builder
end
-
- protected
- def rescue_action(e)
- raise(e)
- end
end
class AtomFeedTest < ActionController::TestCase