2 files changed, 72 insertions, 1 deletions

diff --git a/actionpack/test/abstract/collector_test.rb b/actionpack/test/abstract/collector_test.rb
new file mode 100644
index 0000000000..2ebcebbbb7
--- /dev/null
+++ b/actionpack/test/abstract/collector_test.rb
@@ -0,0 +1,57 @@
+require 'abstract_unit'
+
+module AbstractController
+  module Testing
+    class MyCollector
+      include Collector
+      attr_accessor :responses
+
+      def initialize
+        @responses = []
+      end
+
+      def custom(mime, *args, &block)
+        @responses << [mime, args, block]
+      end
+    end
+
+    class TestCollector < ActiveSupport::TestCase
+      test "responds to default mime types" do
+        collector = MyCollector.new
+        assert_respond_to collector, :html
+        assert_respond_to collector, :text
+      end
+
+      test "does not respond to unknown mime types" do
+        collector = MyCollector.new
+        assert !collector.respond_to?(:unknown)
+      end
+
+      test "register mime types on method missing" do
+        AbstractController::Collector.send(:remove_method, :js)
+        collector = MyCollector.new
+        assert !collector.respond_to?(:js)
+        collector.js
+        assert_respond_to collector, :js
+      end
+
+      test "does not register unknown mime types" do
+        collector = MyCollector.new
+        assert_raise NameError do
+          collector.unknown
+        end
+      end
+
+      test "generated methods call custom with args received" do
+        collector = MyCollector.new
+        collector.html
+        collector.text(:foo)
+        collector.js(:bar) { :baz }
+        assert_equal [Mime::HTML, [], nil], collector.responses[0]
+        assert_equal [Mime::TEXT, [:foo], nil], collector.responses[1]
+        assert_equal [Mime::JS, [:bar]], collector.responses[2][0,2]
+        assert_equal :baz, collector.responses[2][2].call
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index 5c96d1cfff..bf02e5a864 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -66,7 +66,15 @@ module AbstractControllerTests
     
     class WithChildOfImplied < WithStringImpliedChild
     end
-    
+
+    class WithProc < Base
+      layout proc { |c| "omg" }
+
+      def index
+        render :_template => ActionView::Template::Text.new("Hello proc!")
+      end
+    end
+
     class WithSymbol < Base
       layout :hello
       
@@ -197,6 +205,12 @@ module AbstractControllerTests
         controller.process(:index)
         assert_equal "Hello nil!", controller.response_body
       end
+
+      test "when layout is specified as a proc, call it and use the layout returned" do
+        controller = WithProc.new
+        controller.process(:index)
+        assert_equal "OMGHI2U Hello proc!", controller.response_body
+      end
       
       test "when layout is specified as a symbol, call the requested method and use the layout returned" do
         controller = WithSymbol.new