Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs2

[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 bdd54288e4f20c174f45033d44ceac1653e7e7bd..1b020380d13243e574ab40df2fb8e9fc3cd32c2d 100644 (file)
--- a/test/functional/site_controller_test.rb
+++ b/test/functional/site_controller_test.rb
@@ -51,11 +51,19 @@ class SiteControllerTest < ActionController::TestCase
   # and when they have...
   def test_edit_with_preference
     user = users(:public_user)
-    user.preferred_editor = "josm"
+    user.preferred_editor = "potlatch"
     user.save!
 
     get(:edit, nil, { 'user' => user.id })
     assert_response :success
-    assert_template :partial => "_josm", :count => 1
+    assert_template :partial => "_potlatch", :count => 1
+
+    user = users(:public_user)
+    user.preferred_editor = "remote"
+    user.save!
+
+    get(:edit, nil, { 'user' => user.id })
+    assert_response :success
+    assert_template "index"
   end    
 end