more diary entry test

[rails.git] / test / functional / diary_entry_controller_test.rb

diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index a8d0adf6dc82daf5ff31e77b3ef69cb845012206..1dc9026bb2e7c18efb7ab5ca8cb62627c13a2b8a 100644 (file)
--- 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 File.dirname(__FILE__) + '/../test_helper'

-require 'app/controllers/user_controller.rb'

 
 class DiaryEntryControllerTest < ActionController::TestCase
   fixtures :users, :diary_entries, :diary_comments
 
 class DiaryEntryControllerTest < ActionController::TestCase
   fixtures :users, :diary_entries, :diary_comments


@@ -15,23 +14,24 @@ class DiaryEntryControllerTest < ActionController::TestCase
     get :new
     assert_response 302
     assert_redirected_to :controller => :user, :action => "login", :referer => "/diary_entry/new"
     get :new
     assert_response 302
     assert_redirected_to :controller => :user, :action => "login", :referer => "/diary_entry/new"

-    # can't really redirect to the 
-    #follow_redirect
-    # Now login
-    #post  :login, :user_email => "test@openstreetmap.org", :user_password => "test"
+    # Now pretend to login by using the session hash, with the 
+    # id of the person we want to login as through session(:user)=user.id
+    get(:new, nil, {'user' => users(:normal_user).id})
+    assert_response :success
+    #print @response.body

     
     

-    #get :controller => :users, :action => :new
-    #assert_response :success

     #print @response.to_yaml
     #print @response.to_yaml

-    #assert_select "html" do
-    #  assert_select "body" do
-    #    assert_select "div#content" do
-    #      assert_select "form" do
-    #        assert_select "input[id=diary_entry_title]"
-    #      end
-    #    end
-    #  end
-    #end
+    assert_select "html:root", :count => 1 do
+      assert_select "body" do
+        assert_select "div#content" do
+          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
+    end

         
   end
   
         
   end