Merge small screen support to trunk.

[rails.git] / test / integration / user_diaries_test.rb

diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb
index 02908e18d44ef7af4299b07377438ca1c088de8e..8fcc694e9196150d2eeac8cdc07cb84c030d6309 100644 (file)
--- a/test/integration/user_diaries_test.rb
+++ b/test/integration/user_diaries_test.rb
@@ -3,6 +3,8 @@ require File.dirname(__FILE__) + '/../test_helper'
 class UserDiariesTest < ActionController::IntegrationTest
   fixtures :users, :diary_entries
 
+  # Test the creation of a diary entry, making sure that you are redirected to 
+  # login page when not logged in
   def test_showing_create_diary_entry
     get_via_redirect '/user/test/diary/new'
     # We should now be at the login page
@@ -29,15 +31,22 @@ class UserDiariesTest < ActionController::IntegrationTest
     #print @response.body
     #print @html_document.to_yaml
 
+    # We will make sure that the form exists here, full 
+    # assert testing of the full form should be done in the
+    # functional tests rather than this integration test
+    # There are some things that are specific to the integratio
+    # that need to be tested, which can't be tested in the functional tests
     assert_select "html:root" do
       assert_select "body" do
         assert_select "div#content" do
-          assert_select "h1", "New diary entry" 
-          assert_select "form" do
+          assert_select "h1", "New Diary Entry" 
+          assert_select "form[action='/user/#{users(:normal_user).display_name}/diary/new']" do
             assert_select "input[id=diary_entry_title]"
           end
         end
       end
     end
+    
+    
   end
 end