2 files changed, 42 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
   
diff --git a/test/functional/nodes_controller_test.rb b/test/functional/nodes_controller_test.rb
index 20090d0..fdeb6cb 100644
--- a/test/functional/nodes_controller_test.rb
+++ b/test/functional/nodes_controller_test.rb
@@ -56,4 +56,24 @@ class NodesControllerTest < ActionController::TestCase
     assert_equal "Hello", test_node.draft.title
     assert_equal "There", test_node.draft.body
   end
+  
+  def test_update_a_draft_with_changing_the_template
+    test_node = Node.create! :slug => "test_node"
+    test_node.move_to_child_of Node.root
+    
+    login_as :quentin
+    put :update, {
+      :id => test_node.id, 
+      :page => {
+        :title => "Hello", 
+        :body => "There",
+        :template_name => "Foobar"
+      }
+    }
+    
+    test_node.reload
+    assert_equal "Hello", test_node.draft.title
+    assert_equal "There", test_node.draft.body
+    assert_equal "Foobar", test_node.draft.template_name
+  end
 end