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

5 files changed, 127 insertions, 49 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
diff --git a/actionpack/test/controller/new_base/etag_test.rb b/actionpack/test/controller/new_base/etag_test.rb
deleted file mode 100644
index 2bca5aec6a..0000000000
--- a/actionpack/test/controller/new_base/etag_test.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-require 'abstract_unit'
-
-module Etags
-  class BasicController < ActionController::Base
-    self.view_paths = [ActionView::FixtureResolver.new(
-      "etags/basic/base.html.erb" => "Hello from without_layout.html.erb",
-      "layouts/etags.html.erb"    => "teh <%= yield %> tagz"
-    )]
-
-    def without_layout
-      render :action => "base"
-    end
-
-    def with_layout
-      render :action => "base", :layout => "etags"
-    end
-  end
-
-  class EtagTest < Rack::TestCase
-    describe "Rendering without any special etag options returns an etag that is an MD5 hash of its text"
-
-    test "an action without a layout" do
-      get "/etags/basic/without_layout"
-
-      body = "Hello from without_layout.html.erb"
-      assert_body body
-      assert_header "Etag", etag_for(body)
-      assert_status 200
-    end
-
-    test "an action with a layout" do
-      get "/etags/basic/with_layout"
-
-      body = "teh Hello from without_layout.html.erb tagz"
-      assert_body body
-      assert_header "Etag", etag_for(body)
-      assert_status 200
-    end
-
-    private
-
-    def etag_for(text)
-      %("#{Digest::MD5.hexdigest(text)}")
-    end
-  end
-end
diff --git a/actionpack/test/controller/new_base/render_once_test.rb b/actionpack/test/controller/new_base/render_once_test.rb
new file mode 100644
index 0000000000..63de25be52
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_once_test.rb
@@ -0,0 +1,72 @@
+require 'abstract_unit'
+
+module RenderTemplate
+  class RenderOnceController < ActionController::Base
+    layout false
+
+    RESOLVER = ActionView::FixtureResolver.new(
+      "test/a.html.erb"       => "a",
+      "test/b.html.erb"       => "<>",
+      "test/c.html.erb"       => "c",
+      "test/one.html.erb"     => "<%= render :once => 'test/result' %>",
+      "test/two.html.erb"     => "<%= render :once => 'test/result' %>",
+      "test/three.html.erb"   => "<%= render :once => 'test/result' %>",
+      "test/result.html.erb"  => "YES!",
+      "layouts/test.html.erb" => "l<%= yield %>l"
+    )
+
+    self.view_paths = [RESOLVER]
+
+    def multiple
+      render :once => %w(test/a test/b test/c)
+    end
+
+    def once
+      render :once => %w(test/one test/two test/three)
+    end
+
+    def duplicate
+      render :once => %w(test/a test/a test/a)
+    end
+
+    def with_layout
+      render :once => %w(test/a test/b test/c), :layout => "test"
+    end
+  end
+
+  module Tests
+    def test_mutliple_arguments_get_all_rendered
+      get :multiple
+      assert_response "a\n<>\nc"
+    end
+
+    def test_referenced_templates_get_rendered_once
+      get :once
+      assert_response "YES!\n\n"
+    end
+
+    def test_duplicated_templates_get_rendered_once
+      get :duplicate
+      assert_response "a"
+    end
+
+    def test_layout_wraps_all_rendered_templates
+      get :with_layout
+      assert_response "la\n<>\ncl"
+    end
+  end
+
+  class TestWithResolverCache < Rack::TestCase
+    testing RenderTemplate::RenderOnceController
+    include Tests
+  end
+
+  class TestWithoutResolverCache < Rack::TestCase
+    testing RenderTemplate::RenderOnceController
+    include Tests
+
+    def setup
+      RenderTemplate::RenderOnceController::RESOLVER.stubs(:caching?).returns(false)
+    end
+  end
+end
diff --git a/actionpack/test/controller/new_base/render_partial_test.rb b/actionpack/test/controller/new_base/render_partial_test.rb
index 5c7e66dba2..d800ea264d 100644
--- a/actionpack/test/controller/new_base/render_partial_test.rb
+++ b/actionpack/test/controller/new_base/render_partial_test.rb
@@ -5,10 +5,17 @@ module RenderPartial
   class BasicController < ActionController::Base
 
     self.view_paths = [ActionView::FixtureResolver.new(
-      "render_partial/basic/_basic.html.erb"    => "BasicPartial!",
-      "render_partial/basic/basic.html.erb"      => "<%= @test_unchanged = 'goodbye' %><%= render :partial => 'basic' %><%= @test_unchanged %>"
+      "render_partial/basic/_basic.html.erb"     => "BasicPartial!",
+      "render_partial/basic/basic.html.erb"      => "<%= @test_unchanged = 'goodbye' %><%= render :partial => 'basic' %><%= @test_unchanged %>",
+      "render_partial/basic/with_json.html.erb"  => "<%= render 'with_json.json' %>",
+      "render_partial/basic/_with_json.json.erb" => "<%= render 'final' %>",
+      "render_partial/basic/_final.json.erb"     => "{ final: json }"
     )]
 
+    def html_with_json_inside_json
+      render :action => "with_json"
+    end
+
     def changing
       @test_unchanged = 'hello'
       render :action => "basic"
@@ -22,6 +29,12 @@ module RenderPartial
       get :changing
       assert_response("goodbyeBasicPartial!goodbye")
     end
+
+    test "rendering a template with renders another partial with other format that renders other partial in the same format" do
+      get :html_with_json_inside_json
+      assert_content_type "text/html; charset=utf-8"
+      assert_response "{ final: json }"
+    end
   end
 
 end
diff --git a/actionpack/test/controller/new_base/render_template_test.rb b/actionpack/test/controller/new_base/render_template_test.rb
index fea98d6bbd..d31193a063 100644
--- a/actionpack/test/controller/new_base/render_template_test.rb
+++ b/actionpack/test/controller/new_base/render_template_test.rb
@@ -8,13 +8,21 @@ module RenderTemplate
       "shared.html.erb"          => "Elastica",
       "locals.html.erb"          => "The secret is <%= secret %>",
       "xml_template.xml.builder" => "xml.html do\n  xml.p 'Hello'\nend",
-      "with_raw.html.erb"        => "Hello <%=raw '<strong>this is raw</strong>' %>"
+      "with_raw.html.erb"        => "Hello <%=raw '<strong>this is raw</strong>' %>",
+      "test/with_json.html.erb"  => "<%= render :template => 'test/with_json.json' %>",
+      "test/with_json.json.erb"  => "<%= render :template => 'test/final' %>",
+      "test/final.json.erb"      => "{ final: json }",
+      "test/with_error.html.erb" => "<%= idontexist %>"
     )]
 
     def index
       render :template => "test/basic"
     end
 
+    def html_with_json_inside_json
+      render :template => "test/with_json"
+    end
+
     def index_without_key
       render "test/basic"
     end
@@ -42,6 +50,10 @@ module RenderTemplate
     def with_raw
       render :template => "with_raw"
     end
+
+    def with_error
+      render :template => "test/with_error"
+    end
   end
 
   class TestWithoutLayout < Rack::TestCase
@@ -88,6 +100,18 @@ module RenderTemplate
       assert_body "Hello <strong>this is raw</strong>"
       assert_status 200
     end
+
+    test "rendering a template with renders another template with other format that renders other template in the same format" do
+      get :html_with_json_inside_json
+      assert_content_type "text/html; charset=utf-8"
+      assert_response "{ final: json }"
+    end
+
+    test "rendering a template with error properly exceprts the code" do
+      get :with_error
+      assert_status 500
+      assert_match "undefined local variable or method `idontexist'", response.body
+    end
   end
 
   class WithLayoutController < ::ApplicationController