From 33fb432beb61d1f77786c9f623b4a30262addd0e Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 7 Nov 2011 21:41:49 +0000
Subject: [PATCH] Update tests to set the username cookie as necessary

---
 test/functional/diary_entry_controller_test.rb | 10 +++++++++-
 test/functional/site_controller_test.rb        |  4 ++++
 test/functional/trace_controller_test.rb       |  2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index 3a402b602..738fbe671 100644
--- 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
+    @request.cookies["_osm_username"] = users(:normal_user).display_name
+
     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
+    @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
@@ -119,7 +123,9 @@ class DiaryEntryControllerTest < ActionController::TestCase
         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
@@ -148,6 +154,8 @@ class DiaryEntryControllerTest < ActionController::TestCase
   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"
diff --git a/test/functional/site_controller_test.rb b/test/functional/site_controller_test.rb
index 1b020380d..4d2162a71 100644
--- 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
+    @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
@@ -50,6 +52,8 @@ class SiteControllerTest < ActionController::TestCase
 
   # 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!
diff --git a/test/functional/trace_controller_test.rb b/test/functional/trace_controller_test.rb
index 812143c81..28c09c899 100644
--- 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
+    @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'
-- 
2.43.2