Merge branch 'master' into openstreetbugs

[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..1b020380d13243e574ab40df2fb8e9fc3cd32c2d 100644 (file)
--- a/test/functional/site_controller_test.rb
+++ b/test/functional/site_controller_test.rb
@@ -59,7 +59,7 @@ class SiteControllerTest < ActionController::TestCase
     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 })