X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e84ed734aae9eea6f970f203bd28d8f698588b97..c78853a97e6bcc7c742602867deb70e8da39523e:/test/functional/site_controller_test.rb

diff --git a/test/functional/site_controller_test.rb b/test/functional/site_controller_test.rb
index 770f3e2b5..711f94bcd 100644
--- a/test/functional/site_controller_test.rb
+++ b/test/functional/site_controller_test.rb
@@ -3,6 +3,20 @@ require File.dirname(__FILE__) + '/../test_helper'
 class SiteControllerTest < ActionController::TestCase
   api_fixtures
 
+  ##
+  # setup oauth keys
+  def setup
+    Object.const_set("ID_KEY", client_applications(:oauth_web_app).key)
+    Object.const_set("POTLATCH2_KEY", client_applications(:oauth_web_app).key)
+  end
+
+  ##
+  # clear oauth keys
+  def teardown
+    Object.send("remove_const", "ID_KEY")
+    Object.send("remove_const", "POTLATCH2_KEY")
+  end
+
   ##
   # test all routes which lead to this controller
   def test_routes
@@ -14,10 +28,6 @@ class SiteControllerTest < ActionController::TestCase
       { :path => "/", :method => :post },
       { :controller => "site", :action => "index" }
     )
-    assert_recognizes(
-      { :controller => "site", :action => "index" },
-      { :path => "/index.html", :method => :get }
-    )
     assert_routing(
       { :path => "/edit", :method => :get },
       { :controller => "site", :action => "edit" }
@@ -34,12 +44,16 @@ class SiteControllerTest < ActionController::TestCase
       { :path => "/copyright/locale", :method => :get },
       { :controller => "site", :action => "copyright", :copyright_locale => "locale" }
     )
+    assert_routing(
+      { :path => "/welcome", :method => :get },
+      { :controller => "site", :action => "welcome" }
+    )
     assert_routing(
       { :path => "/export", :method => :get },
-      { :controller => "site", :action => "index", :export => true }
+      { :controller => "site", :action => "export" }
     )
     assert_recognizes(
-      { :controller => "site", :action => "index", :export => true, :format => "html" },
+      { :controller => "site", :action => "export", :format => "html" },
       { :path => "/export.html", :method => :get }
     )
     assert_routing(
@@ -55,7 +69,7 @@ class SiteControllerTest < ActionController::TestCase
       { :controller => "site", :action => "permalink", :code => "shortcode" }
     )
     assert_routing(
-      { :path => "/preview/formatname", :method => :get },
+      { :path => "/preview/formatname", :method => :post },
       { :controller => "site", :action => "preview", :format => "formatname" }
     )
     assert_routing(
@@ -64,117 +78,232 @@ class SiteControllerTest < ActionController::TestCase
     )
   end
 
-  ## Lets check that we can get all the pages without any errors  
-  # Get the index
+  # Test the index page
   def test_index
     get :index
     assert_response :success
     assert_template 'index'
-    assert_site_partials
   end
 
+  # Test the index page redirects
   def test_index_redirect
     get :index, :lat => 4, :lon => 5
-    assert_redirected_to :controller => :site, :action => 'index', :anchor => 'map=5/4/5'
+    assert_redirected_to :controller => :site, :action => :index, :anchor => 'map=5/4/5'
 
     get :index, :lat => 4, :lon => 5, :zoom => 3
-    assert_redirected_to :controller => :site, :action => 'index', :anchor => 'map=3/4/5'
+    assert_redirected_to :controller => :site, :action => :index, :anchor => 'map=3/4/5'
 
     get :index, :layers => 'T'
-    assert_redirected_to :controller => :site, :action => 'index', :anchor => 'layers=T'
+    assert_redirected_to :controller => :site, :action => :index, :anchor => 'layers=T'
 
     get :index, :notes => 'yes'
-    assert_redirected_to :controller => :site, :action => 'index', :anchor => 'layers=N'
+    assert_redirected_to :controller => :site, :action => :index, :anchor => 'layers=N'
 
     get :index, :lat => 4, :lon => 5, :zoom => 3, :layers => 'T'
-    assert_redirected_to :controller => :site, :action => 'index', :anchor => 'map=3/4/5&layers=T'
+    assert_redirected_to :controller => :site, :action => :index, :anchor => 'map=3/4/5&layers=T'
   end
 
+  # Test the permalink redirect
   def test_permalink
     get :permalink, :code => 'wBz3--'
-    assert_redirected_to :controller => :site, :action => 'index', :anchor => 'map=3/4.8779296875/3.955078125'
+    assert_response :redirect
+    assert_redirected_to :controller => :site, :action => :index, :anchor => 'map=3/4.8779296875/3.955078125'
   end
 
-  # Get the edit page
-  def test_edit
-    get :edit
-    # Should be redirected
-    assert_redirected_to :controller => :user, :action => 'login', :referer => "/edit"
-  end
-  
-  # Offline page
-  def test_offline
-    get :offline
+  # Test the key page
+  def test_key
+    xhr :get, :key
     assert_response :success
-    assert_template 'offline'
-    assert_site_partials 0
+    assert_template "key"
+    assert_template :layout => false
   end
-  
-  def assert_site_partials(count = 1)
-    assert_template :partial => '_search', :count => count
-    assert_template :partial => '_sidebar', :count => count
+
+  # Test the edit page redirects when you aren't logged in
+  def test_edit
+    get :edit
+    assert_response :redirect
+    assert_redirected_to :controller => :user, :action => :login, :referer => "/edit"
   end
 
-  # test the right editor gets used when the user hasn't set a 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 })
+    get :edit, nil, { :user => users(:public_user).id }
     assert_response :success
+    assert_template "edit"
     assert_template :partial => "_#{DEFAULT_EDITOR}", :count => 1
   end
 
-  # and when they have...
+  # Test the right editor gets used when the user has set a preference
   def test_edit_with_preference
-    @request.cookies["_osm_username"] = users(:public_user).display_name
+    user = users(:public_user)
+    user.preferred_editor = "id"
+    user.save!
+
+    get :edit, nil, { :user => user.id }
+    assert_response :success
+    assert_template "edit"
+    assert_template :partial => "_id", :count => 1
+
+    user = users(:public_user)
+    user.preferred_editor = "potlatch2"
+    user.save!
+
+    get :edit, nil, { :user => user.id }
+    assert_response :success
+    assert_template "edit"
+    assert_template :partial => "_potlatch2", :count => 1
 
     user = users(:public_user)
     user.preferred_editor = "potlatch"
     user.save!
 
-    get(:edit, nil, { 'user' => user.id })
+    get :edit, nil, { :user => user.id }
     assert_response :success
+    assert_template "edit"
     assert_template :partial => "_potlatch", :count => 1
 
     user = users(:public_user)
     user.preferred_editor = "remote"
     user.save!
 
-    get(:edit, nil, { 'user' => user.id })
+    get :edit, nil, { :user => user.id }
     assert_response :success
     assert_template "index"
   end
 
+  # Test editing a specific node
   def test_edit_with_node
-    @request.cookies["_osm_username"] = users(:public_user).display_name
-
     user = users(:public_user)
     node = current_nodes(:visible_node)
 
-    get :edit, { :node => node.id }, { 'user' => user.id }
+    get :edit, { :node => node.id }, { :user => user.id }
+    assert_response :success
+    assert_template "edit"
     assert_equal 1.0, assigns(:lat)
     assert_equal 1.0, assigns(:lon)
+    assert_equal 18, assigns(:zoom)
   end
 
+  # Test editing a specific way
   def test_edit_with_way
-    @request.cookies["_osm_username"] = users(:public_user).display_name
-
     user = users(:public_user)
     way  = current_ways(:visible_way)
 
-    get :edit, { :way => way.id }, { 'user' => user.id }
+    get :edit, { :way => way.id }, { :user => user.id }
+    assert_response :success
+    assert_template "edit"
     assert_equal 3.0, assigns(:lat)
     assert_equal 3.0, assigns(:lon)
+    assert_equal 17, assigns(:zoom)
   end
 
-  def test_edit_with_gpx
-    @request.cookies["_osm_username"] = users(:public_user).display_name
+  # Test editing a specific note
+  def test_edit_with_note
+    user = users(:public_user)
+    note  = notes(:open_note)
+
+    get :edit, { :note => note.id }, { :user => user.id }
+    assert_response :success
+    assert_template "edit"
+    assert_equal 1.0, assigns(:lat)
+    assert_equal 1.0, assigns(:lon)
+    assert_equal 17, assigns(:zoom)
+  end
 
+  # Test editing a specific GPX trace
+  def test_edit_with_gpx
     user = users(:public_user)
     gpx  = gpx_files(:public_trace_file)
 
-    get :edit, { :gpx => gpx.id }, { 'user' => user.id }
+    get :edit, { :gpx => gpx.id }, { :user => user.id }
+    assert_response :success
+    assert_template "edit"
     assert_equal 1.0, assigns(:lat)
     assert_equal 1.0, assigns(:lon)
+    assert_equal 16, assigns(:zoom)
+  end
+
+  # Test the edit page redirects
+  def test_edit_redirect
+    get :edit, :lat => 4, :lon => 5
+    assert_redirected_to :controller => :site, :action => :edit, :anchor => 'map=5/4/5'
+
+    get :edit, :lat => 4, :lon => 5, :zoom => 3
+    assert_redirected_to :controller => :site, :action => :edit, :anchor => 'map=3/4/5'
+
+    get :edit, :lat => 4, :lon => 5, :zoom => 3, :editor => 'id'
+    assert_redirected_to :controller => :site, :action => :edit, :editor => 'id', :anchor => 'map=3/4/5'
+  end
+
+  # Test the copyright page
+  def test_copyright
+    get :copyright
+    assert_response :success
+    assert_template "copyright"
+  end
+
+  # Test the welcome page
+  def test_welcome
+    get :welcome
+    assert_response :redirect
+    assert_redirected_to :controller => :user, :action => :login, :referer => "/welcome"
+
+    get :welcome, nil, { :user => users(:public_user).id }
+    assert_response :success
+    assert_template "welcome"
+  end
+
+  # Test the help page
+  def test_help
+    get :help
+    assert_response :success
+    assert_template "help"
+  end
+
+  # Test the about page
+  def test_about
+    get :about
+    assert_response :success
+    assert_template "about"
+  end
+
+  # Test the export page
+  def test_export
+    get :export
+    assert_response :success
+    assert_template "export"
+    assert_template :layout => "map"
+
+    xhr :get, :export
+    assert_response :success
+    assert_template "export"
+    assert_template :layout => "xhr"
+  end
+
+  # Test the offline page
+  def test_offline
+    get :offline
+    assert_response :success
+    assert_template "offline"
+  end
+
+  # Test the rich text preview
+  def test_preview
+    xhr :post, :preview, :format => "html"
+    assert_response :success
+
+    xhr :post, :preview, :format => "markdown"
+    assert_response :success
+
+    xhr :post, :preview, :format => "text"
+    assert_response :success
+  end
+
+  # Test the id frame
+  def test_id
+    get :id, nil, { :user => users(:public_user).id }
+    assert_response :success
+    assert_template "id"
+    assert_template :layout => false
   end
 end