Force a login to see your friends' changesets

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

diff --git a/test/functional/site_controller_test.rb b/test/functional/site_controller_test.rb
index 8c378046e89f54ff04bc70ca44fd4b3e6c75890d..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!


@@ -59,7 +63,7 @@ class SiteControllerTest < ActionController::TestCase
     assert_template :partial => "_potlatch", :count => 1
 
     user = users(:public_user)
     assert_template :partial => "_potlatch", :count => 1
 
     user = users(:public_user)

-    user.preferred_editor = "josm"
+    user.preferred_editor = "remote"

     user.save!
 
     get(:edit, nil, { 'user' => user.id })
     user.save!
 
     get(:edit, nil, { 'user' => user.id })