Update tests to set the username cookie as necessary

diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index 3a402b602a52cd0289be9c88acd22cf9b56d84b6..738fbe67110e0f6dc8a23abd8cb8f7db50bb2845 100644 (file)
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -6,6 +6,8 @@ class DiaryEntryControllerTest < ActionController::TestCase
   include ActionView::Helpers::NumberHelper
 
   def test_showing_new_diary_entry
   include ActionView::Helpers::NumberHelper
 
   def test_showing_new_diary_entry

+    @request.cookies["_osm_username"] = users(:normal_user).display_name
+

     get :new
     assert_response :redirect
     assert_redirected_to :controller => :user, :action => "login", :referer => "/diary/new"
     get :new
     assert_response :redirect
     assert_redirected_to :controller => :user, :action => "login", :referer => "/diary/new"


@@ -39,6 +41,8 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
   
   def test_editing_diary_entry
   end
   
   def test_editing_diary_entry

+    @request.cookies["_osm_username"] = users(:normal_user).display_name
+

     # Make sure that you are redirected to the login page when you are 
     # not logged in, without and with the id of the entry you want to edit
     get :edit
     # Make sure that you are redirected to the login page when you are 
     # not logged in, without and with the id of the entry you want to edit
     get :edit


@@ -119,7 +123,9 @@ class DiaryEntryControllerTest < ActionController::TestCase
         end
       end
     end
         end
       end
     end

-    
+
+    @request.cookies["_osm_username"] = users(:public_user).display_name
+

     # and when not logged in as the user who wrote the entry
     get :view, {:id => diary_entries(:normal_user_entry_1).id, :display_name => 'test'}, {'user' => users(:public_user).id}
     assert_response :success
     # and when not logged in as the user who wrote the entry
     get :view, {:id => diary_entries(:normal_user_entry_1).id, :display_name => 'test'}, {'user' => users(:public_user).id}
     assert_response :success


@@ -148,6 +154,8 @@ class DiaryEntryControllerTest < ActionController::TestCase
   end
   
   def test_edit_diary_entry_i18n
   end
   
   def test_edit_diary_entry_i18n

+    @request.cookies["_osm_username"] = users(:normal_user).display_name
+

     get(:edit, {:id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id})
     assert_response :success
     assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry"
     get(:edit, {:id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id})
     assert_response :success
     assert_select "span[class=translation_missing]", false, "Missing translation in edit diary entry"

diff --git a/test/functional/site_controller_test.rb b/test/functional/site_controller_test.rb
index 1b020380d13243e574ab40df2fb8e9fc3cd32c2d..4d2162a7161269985daf7cbb54a9a8509232af58 100644 (file)
--- a/test/functional/site_controller_test.rb
+++ b/test/functional/site_controller_test.rb
@@ -43,6 +43,8 @@ class SiteControllerTest < ActionController::TestCase
 
   # test the right editor gets used when the user hasn't set a preference
   def test_edit_without_preference
 
   # test the right editor gets used when the user hasn't set a preference
   def test_edit_without_preference

+    @request.cookies["_osm_username"] = users(:public_user).display_name
+

     get(:edit, nil, { 'user' => users(:public_user).id })
     assert_response :success
     assert_template :partial => "_#{DEFAULT_EDITOR}", :count => 1
     get(:edit, nil, { 'user' => users(:public_user).id })
     assert_response :success
     assert_template :partial => "_#{DEFAULT_EDITOR}", :count => 1


@@ -50,6 +52,8 @@ class SiteControllerTest < ActionController::TestCase
 
   # and when they have...
   def test_edit_with_preference
 
   # and when they have...
   def test_edit_with_preference

+    @request.cookies["_osm_username"] = users(:public_user).display_name
+

     user = users(:public_user)
     user.preferred_editor = "potlatch"
     user.save!
     user = users(:public_user)
     user.preferred_editor = "potlatch"
     user.save!

diff --git a/test/functional/trace_controller_test.rb b/test/functional/trace_controller_test.rb
index 812143c81dd0fe4817ccc833f9ab89da28d60f96..28c09c8995c96d42acf8cd839bd40e0bdb0e4e78 100644 (file)
--- a/test/functional/trace_controller_test.rb
+++ b/test/functional/trace_controller_test.rb
@@ -13,6 +13,8 @@ class TraceControllerTest < ActionController::TestCase
 
   # Check that I can get mine
   def test_list_mine
 
   # Check that I can get mine
   def test_list_mine

+    @request.cookies["_osm_username"] = users(:public_user).display_name
+

     # First try to get it when not logged in
     get :mine
     assert_redirected_to :controller => 'user', :action => 'login', :referer => '/traces/mine'
     # First try to get it when not logged in
     get :mine
     assert_redirected_to :controller => 'user', :action => 'login', :referer => '/traces/mine'