From: Shaun McDonald <shaun@shaunmcdonald.me.uk>
Date: Tue, 11 Nov 2008 18:33:08 +0000 (+0000)
Subject: more diary entry test
X-Git-Tag: live~7609^2~158
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/22f3d7ce2ebd1ebeb54929ac8334988d195aaa1b

more diary entry test
---

diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index ca9ce4c36..1dc9026bb 100644
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/../test_helper'
-require 'app/controllers/user_controller.rb'
 
 class DiaryEntryControllerTest < ActionController::TestCase
   fixtures :users, :diary_entries, :diary_comments
@@ -20,13 +19,15 @@ class DiaryEntryControllerTest < ActionController::TestCase
     get(:new, nil, {'user' => users(:normal_user).id})
     assert_response :success
     #print @response.body
-        
+    
     #print @response.to_yaml
-    assert_select "html" do
+    assert_select "html:root", :count => 1 do
       assert_select "body" do
         assert_select "div#content" do
-          assert_select "form" do
-            assert_select "input[id=diary_entry_title]"
+          assert_select "h1", "New diary entry" 
+          assert_select "form[action='/diary_entry/new']" do
+            assert_select "input[id=diary_entry_title][name='diary_entry[title]']"
+            assert_select "textarea#diary_entry_body[name='diary_entry[body]']"
           end
         end
       end
diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb
index 02908e18d..2e7a01030 100644
--- a/test/integration/user_diaries_test.rb
+++ b/test/integration/user_diaries_test.rb
@@ -29,15 +29,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 "form[action='/user/#{users(:normal_user).display_name}/diary/new']" do
             assert_select "input[id=diary_entry_title]"
           end
         end
       end
     end
+    
+    
   end
 end