introducing page templates - need to add edit capabilities

renamed the custom template folder

forgot one fix for the new custom template path

page templates refined

renamed page attribute template to template_name as i suspected it to be a reserved word. it still didn't work until i discovered that simon defined the accessible attributes! That costed me 40 minutes of lifetime. But he apologized ;)

tests for public and custom page templates

1 files changed, 22 insertions, 0 deletions

diff --git a/test/functional/content_controller_test.rb b/test/functional/content_controller_test.rb
index c374a83..2f390c6 100644
--- a/test/functional/content_controller_test.rb
+++ b/test/functional/content_controller_test.rb
@@ -67,7 +67,29 @@ class ContentControllerTest < ActionController::TestCase
     assert_select(".sidebar_headline", "two")
   end
   
+  def test_nonexistant_custom_template_defaults_to_standard_template
+    new_node = create_node_under_root "fnord"
+    draft = new_node.find_or_create_draft @user1
+    draft.template_name = "huchibu"
+    draft.save
+    new_node.publish_draft!
+    
+    get :render_page, :locale => 'de', :page_path => ["fnord"]
+    assert_response :success
+    assert_template "custom/page_templates/public/render_page.html.erb"
+  end
   
+  def test_custom_template_no_date_and_author
+    new_node = create_node_under_root "fnord"
+    draft = new_node.find_or_create_draft @user1
+    draft.template_name = "no_date_and_author"
+    draft.save
+    new_node.publish_draft!
+    
+    get :render_page, :locale => 'de', :page_path => ["fnord"]
+    assert_response :success
+    assert_template "custom/page_templates/public/no_date_and_author.html.erb"
+  end
   
   protected