Merge branch 'master' of git://github.com/lifo/docrails

1 files changed, 15 insertions, 0 deletions

diff --git a/actionpack/test/controller/new_base/bare_metal_test.rb b/actionpack/test/controller/new_base/bare_metal_test.rb
index 8a06e8d2a0..44922cecff 100644
--- a/actionpack/test/controller/new_base/bare_metal_test.rb
+++ b/actionpack/test/controller/new_base/bare_metal_test.rb
@@ -24,4 +24,19 @@ module BareMetalTest
       assert_equal "Hello world", string
     end
   end
+
+  class HeadController < ActionController::Metal
+    include ActionController::Head
+
+    def index
+      head :not_found
+    end
+  end
+
+  class HeadTest < ActiveSupport::TestCase
+    test "head works on its own" do
+      status, headers, body = HeadController.action(:index).call(Rack::MockRequest.env_for("/"))
+      assert_equal 404, status
+    end
+  end
 end