Merge branch 'master' into notes

[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 86445e551a4e0480e3feb0e5a8a41ed9d0949ba3..5fc3a02149e88146b2d5bfe383ec28ae2cbb6d72 100644 (file)
--- a/test/functional/site_controller_test.rb
+++ b/test/functional/site_controller_test.rb
@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class SiteControllerTest < ActionController::TestCase
 require File.dirname(__FILE__) + '/../test_helper'
 
 class SiteControllerTest < ActionController::TestCase

-  fixtures :users
+  api_fixtures

 
   ##
   # test all routes which lead to this controller
 
   ##
   # test all routes which lead to this controller


@@ -36,10 +36,10 @@ class SiteControllerTest < ActionController::TestCase
     )
     assert_routing(
       { :path => "/export", :method => :get },
     )
     assert_routing(
       { :path => "/export", :method => :get },

-      { :controller => "site", :action => "export" }
+      { :controller => "site", :action => "index", :export => true }

     )
     assert_recognizes(
     )
     assert_recognizes(

-      { :controller => "site", :action => "export", :format => "html" },
+      { :controller => "site", :action => "index", :export => true, :format => "html" },

       { :path => "/export.html", :method => :get }
     )
     assert_routing(
       { :path => "/export.html", :method => :get }
     )
     assert_routing(


@@ -47,7 +47,7 @@ class SiteControllerTest < ActionController::TestCase
       { :controller => "site", :action => "offline" }
     )
     assert_routing(
       { :controller => "site", :action => "offline" }
     )
     assert_routing(

-      { :path => "/key", :method => :post },
+      { :path => "/key", :method => :get },

       { :controller => "site", :action => "key" }
     )
     assert_routing(
       { :controller => "site", :action => "key" }
     )
     assert_routing(


@@ -76,14 +76,6 @@ class SiteControllerTest < ActionController::TestCase
     assert_redirected_to :controller => :user, :action => 'login', :referer => "/edit"
   end
   
     assert_redirected_to :controller => :user, :action => 'login', :referer => "/edit"
   end
   

-  # Get the export page
-  def test_export
-    get :export
-    assert_response :success
-    assert_template 'index'
-    assert_site_partials
-  end
-  

   # Offline page
   def test_offline
     get :offline
   # Offline page
   def test_offline
     get :offline


@@ -94,7 +86,6 @@ class SiteControllerTest < ActionController::TestCase
   
   def assert_site_partials(count = 1)
     assert_template :partial => '_search', :count => count
   
   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
 
     assert_template :partial => '_sidebar', :count => count
   end
 


@@ -126,5 +117,38 @@ class SiteControllerTest < ActionController::TestCase
     get(:edit, nil, { 'user' => user.id })
     assert_response :success
     assert_template "index"
     get(:edit, nil, { 'user' => user.id })
     assert_response :success
     assert_template "index"

-  end    
+  end
+
+  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 }
+    assert_equal 1.0, assigns(:lat)
+    assert_equal 1.0, assigns(:lon)
+  end
+
+  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 }
+    assert_equal 3.0, assigns(:lat)
+    assert_equal 3.0, assigns(:lon)
+  end
+
+  def test_edit_with_gpx
+    @request.cookies["_osm_username"] = users(:public_user).display_name
+
+    user = users(:public_user)
+    gpx  = gpx_files(:public_trace_file)
+
+    get :edit, { :gpx => gpx.id }, { 'user' => user.id }
+    assert_equal 1.0, assigns(:lat)
+    assert_equal 1.0, assigns(:lon)
+  end

 end
 end