adding first integration for testing user diaries, as multiple controllers are requir...

diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index 7eebfa57e6d1632e28c4ca8922208aa7349655bf..a8d0adf6dc82daf5ff31e77b3ef69cb845012206 100644 (file)
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -1,6 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
+require 'app/controllers/user_controller.rb'
 
 class DiaryEntryControllerTest < ActionController::TestCase
+  fixtures :users, :diary_entries, :diary_comments
   def basic_authorization(user, pass)
     @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
   end
@@ -10,11 +12,32 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
   
   def test_showing_create_diary_entry
+    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"
     
+    #get :controller => :users, :action => :new
+    #assert_response :success
+    #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
+        
   end
   
   def test_editing_diary_entry
-    
+    get :edit
+    assert :not_authorized
   end
   
   def test_editing_creating_diary_comment
@@ -26,6 +49,8 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
   
   def test_rss
+    get :rss
+    assert :success
     
   end
   

diff --git a/test/integration/user_diaries_test.rb b/test/integration/user_diaries_test.rb
new file mode 100644 (file)
index 0000000..7ec7438
--- /dev/null
+++ b/test/integration/user_diaries_test.rb
@@ -0,0 +1,28 @@
+require 'test_helper'
+
+class UserDiariesTest < ActionController::IntegrationTest
+  fixtures :users, :diary_entries
+
+  def test_showing_create_diary_entry
+    get '/user/test/diary/new'
+    assert_response 302
+    assert_redirected_to :controller => :user, :action => "login", :referer => "/user/test/diary/new"
+    #follow_redirect
+    # Now login
+    #post  :login, :user_email => "test@openstreetmap.org", :user_password => "test"
+    #
+    #get :controller => :users, :action => :new
+    #assert_response :success
+    #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
+        
+  end
+end