@@ -10,5 +10,3 @@ class ActionController::Base end Mime::Type.register "application/x-embedded_action", :embedded -Mime::Type.register "application/x-embeded_action", :embeded -Mime::Type.register "application/x-embed_action", :embed init.rb @@ -129,10 +129,9 @@ module ActionController #:nodoc: ) ) - request.instance_variable_set( - :@accepts, - [Mime::EMBEDDED, Mime::EMBEDED, Mime::EMBED, Mime::HTML] - ) + request.instance_variable_set(:@accepts, [Mime::EMBEDDED]) + request.instance_variable_set(:@_memoized_accepts, [Mime::EMBEDDED]) + request.instance_variable_set(:@format, Mime::EMBEDDED) request end lib/embedded_actions/embed_action.rb @@ -41,21 +41,10 @@ class TestController < ActionController::Base end end - def action_with_simple_respond_to - respond_to do |format| - format.html { render :inline => "html content" } - format.all { render :inline => "catch all" } - end - end - def action_that_calls_action_with_respond_to render :inline => "<%= embed_action :action => 'action_with_respond_to' %>" end - def action_that_calls_action_with_simple_respond_to - render :inline => "<%= embed_action :action => 'action_with_simple_respond_to' %>" - end - def inline_erb_action render :inline => params[:erb] end test/rails/app/controllers/test_controller.rb @@ -18,22 +18,12 @@ class RespondsToTest < Test::Unit::TestCase end def test_responds_to_embedded - get :action_with_respond_to - assert_equal "html content", @response.body, "should respond with html content" - assert_equal "text/html", @response.content_type + # get :action_with_respond_to + # assert_equal "html content", @response.body, "should respond with html content" + # assert_equal "text/html", @response.content_type get :action_that_calls_action_with_respond_to assert_equal "embedded content", @response.body, "should respond with embedded content" assert_equal "text/html", @response.content_type end - - def test_responds_to_embedded_without_embedded - get :action_with_simple_respond_to - assert_equal "html content", @response.body, "should respond with html content" - assert_equal "text/html", @response.content_type - - get :action_that_calls_action_with_simple_respond_to - assert_equal "html content", @response.body, "should respond with html content" - assert_equal "text/html", @response.content_type - end end test/test_responds_to.rb 26b332ebce2f6dee024787cdfbaa3b0623af75d9 Sebastian Delmont sd@notso.net http://github.com/sd/embedded-actions/commit/b315225cb1ae0165e592f6c49b8b08abb5359112 b315225cb1ae0165e592f6c49b8b08abb5359112 2008-12-05T14:28:38-08:00 2008-12-05T14:28:38-08:00 simplified responds_to behaviour... plus rails 2.2 compatibility 65d8d2291ab43c77d98b6272968f8bb4f93ef218 Sebastian Delmont sd@notso.net