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

diff --git a/test/functional/site_controller_test.rb b/test/functional/site_controller_test.rb
index 63f88f350..bdd54288e 100644
--- a/test/functional/site_controller_test.rb
+++ b/test/functional/site_controller_test.rb
@@ -1,22 +1,22 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class SiteControllerTest < ActionController::TestCase
-  ## Lets check that we can get all the pages without any errors
-  
+  fixtures :users
+
+  ## Lets check that we can get all the pages without any errors  
   # Get the index
   def test_index
     get :index
     assert_response :success
     assert_template 'index'
-    # Seems that we need to wait for Rails 2.3 for this one
-    # assert_template :partial => '_search', :count => 1
+    assert_site_partials
   end
   
   # Get the edit page
   def test_edit
     get :edit
     # Should be redirected
-    assert_response :redirect
+    assert_redirected_to :controller => :user, :action => 'login', :referer => "/edit"
   end
   
   # Get the export page
@@ -24,6 +24,7 @@ class SiteControllerTest < ActionController::TestCase
     get :export
     assert_response :success
     assert_template 'index'
+    assert_site_partials
   end
   
   # Offline page
@@ -31,5 +32,30 @@ class SiteControllerTest < ActionController::TestCase
     get :offline
     assert_response :success
     assert_template 'offline'
+    assert_site_partials 0
+  end
+  
+  def assert_site_partials(count = 1)
+    assert_template :partial => '_search', :count => count
+    assert_template :partial => '_key', :count => count
+    assert_template :partial => '_sidebar', :count => count
+  end
+
+  # test the right editor gets used when the user hasn't set a preference
+  def test_edit_without_preference
+    get(:edit, nil, { 'user' => users(:public_user).id })
+    assert_response :success
+    assert_template :partial => "_#{DEFAULT_EDITOR}", :count => 1
   end
+
+  # and when they have...
+  def test_edit_with_preference
+    user = users(:public_user)
+    user.preferred_editor = "josm"
+    user.save!
+
+    get(:edit, nil, { 'user' => user.id })
+    assert_response :success
+    assert_template :partial => "_josm", :count => 1
+  end    
 end