Changeset 7181

Timestamp:

07/11/07 23:32:02 (1 year ago)

Author:

nzkoz

Message:

Make sure missing template exceptions actually say which template they were looking for. Closes #8683 [dasil003]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_controller/base.rb (modified) (1 diff)
• trunk/actionpack/test/controller/rescue_test.rb (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Make sure missing template exceptions actually say which template they were looking for.  Closes #8683 [dasil003]
-
-* Fix errors with around_filters which do not yield, restore 1.1 behaviour with after filters. Closes #8891 [skaes]

trunk/actionpack/lib/action_controller/base.rb

@@ -1242 +1242 @@
-      def assert_existence_of_template_file(template_name)
-        unless template_exists?(template_name) || ignore_missing_templates
-
+
+
-          template_type = (template_name =~ /layouts/i) ? 'layout' : 'template'
-
+ in view path #{display_paths}
-        end
-      end

trunk/actionpack/test/controller/rescue_test.rb

@@ -16 +16 @@
-    raise ActionController::NotImplemented.new(:get, :put)
-  end
+  
+  def missing_template; end
-end
-
@@ -114 +116 @@
-    assert_response :not_found
-    assert_equal ' ', @response.body
+  end
+
+
+  def test_rescue_missing_template_in_public
+    with_rails_root FIXTURE_PUBLIC do
+      with_all_requests_local true do
+        get :missing_template
+      end
+    end
+
+    assert_response :internal_server_error
+    assert @response.body.include?('missing_template'), "Response should include the template name."
-  end
-