From 72a574b5073b1debd58c954b34c54d3bdee7749f Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Fri, 22 May 2009 15:16:28 -0700
Subject: Get controller/layout_test.rb running on new base except for
 ActionController::Base.exempt_from_layout which is going to be deprecated.

---
 actionpack/lib/action_view/template/template.rb | 2 +-
 actionpack/lib/action_view/template/text.rb     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'actionpack/lib/action_view/template')

diff --git a/actionpack/lib/action_view/template/template.rb b/actionpack/lib/action_view/template/template.rb
index 0eedc596d2..d58f4ec19e 100644
--- a/actionpack/lib/action_view/template/template.rb
+++ b/actionpack/lib/action_view/template/template.rb
@@ -7,7 +7,7 @@ require "action_view/template/path"
 module ActionView
   class Template
     extend TemplateHandlers
-    attr_reader :source, :identifier, :handler, :mime_type
+    attr_reader :source, :identifier, :handler, :mime_type, :details
     
     def initialize(source, identifier, handler, details)
       @source     = source
diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb
index a86c3915c2..fd57b1677e 100644
--- a/actionpack/lib/action_view/template/text.rb
+++ b/actionpack/lib/action_view/template/text.rb
@@ -6,6 +6,10 @@ module ActionView #:nodoc:
       @content_type = Mime[content_type]
     end
 
+    def details
+      {:formats => [@content_type.to_sym]}
+    end
+
     def identifier() self end
     
     def render(*) self end
-- 
cgit v1.2.3