X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cd66a5db99fda4920ed559ec71163d5d01ba1f4a..13289d404188bd397ee72852f66c415a2bb87066:/test/functional/site_controller_test.rb

diff --git a/test/functional/site_controller_test.rb b/test/functional/site_controller_test.rb
index bdd54288e..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,12 +52,22 @@ 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!
+
+    get(:edit, nil, { 'user' => user.id })
+    assert_response :success
+    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 })
     assert_response :success
-    assert_template :partial => "_josm", :count => 1
+    assert_template "index"
   end    
 end