X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e91956d0f7ea6f2b0719a1459110ad3a09d2ee9a..c4f3d1bd32315abdcf057cae586bbf76eb6263b9:/test/functional/browse_controller_test.rb?ds=sidebyside

diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb
index 2dcf6b330..82a039242 100644
--- a/test/functional/browse_controller_test.rb
+++ b/test/functional/browse_controller_test.rb
@@ -8,37 +8,41 @@ class BrowseControllerTest < ActionController::TestCase
   # test all routes which lead to this controller
   def test_routes
     assert_routing(
-      { :path => "/browse/node/1", :method => :get },
+      { :path => "/node/1", :method => :get },
       { :controller => "browse", :action => "node", :id => "1" }
     )
     assert_routing(
-      { :path => "/browse/node/1/history", :method => :get },
+      { :path => "/node/1/history", :method => :get },
       { :controller => "browse", :action => "node_history", :id => "1" }
     )
     assert_routing(
-      { :path => "/browse/way/1", :method => :get },
+      { :path => "/way/1", :method => :get },
       { :controller => "browse", :action => "way", :id => "1" }
     )
     assert_routing(
-      { :path => "/browse/way/1/history", :method => :get },
+      { :path => "/way/1/history", :method => :get },
       { :controller => "browse", :action => "way_history", :id => "1" }
     )
     assert_routing(
-      { :path => "/browse/relation/1", :method => :get },
+      { :path => "/relation/1", :method => :get },
       { :controller => "browse", :action => "relation", :id => "1" }
     )
     assert_routing(
-      { :path => "/browse/relation/1/history", :method => :get },
+      { :path => "/relation/1/history", :method => :get },
       { :controller => "browse", :action => "relation_history", :id => "1" }
     )
     assert_routing(
-      { :path => "/browse/changeset/1", :method => :get },
+      { :path => "/changeset/1", :method => :get },
       { :controller => "browse", :action => "changeset", :id => "1" }
     )
     assert_routing(
-      { :path => "/browse/note/1", :method => :get },
+      { :path => "/note/1", :method => :get },
       { :controller => "browse", :action => "note", :id => "1" }
     )
+    assert_routing(
+      { :path => "/note/new", :method => :get },
+      { :controller => "browse", :action => "new_note" }
+    )
   end
 
   def test_read_relation
@@ -81,16 +85,30 @@ class BrowseControllerTest < ActionController::TestCase
   # well if that structure changes. so... if you change the page layout
   # then please make it more easily (and robustly) testable!
   ##
+  def test_redacted_node
+    get :node, :id => current_nodes(:redacted_node).id
+    assert_response :success
+    assert_template "feature"
+
+    # check that we don't show lat/lon for a redacted node.
+    assert_select ".browse-section", 1
+    assert_select ".browse-section.browse-node", 1
+    assert_select ".browse-section.browse-node .latitude", 0
+    assert_select ".browse-section.browse-node .longitude", 0
+  end
+
   def test_redacted_node_history
     get :node_history, :id => nodes(:redacted_node_redacted_version).node_id
     assert_response :success
-    assert_template 'browse/history'
+    assert_template "browse/history"
 
     # there are 2 revisions of the redacted node, but only one
     # should be showing details here.
     assert_select ".browse-section", 2
     assert_select ".browse-section.browse-redacted", 1
     assert_select ".browse-section.browse-node", 1
+    assert_select ".browse-section.browse-node .latitude", 0
+    assert_select ".browse-section.browse-node .longitude", 0
   end
 
   def test_redacted_way_history
@@ -127,11 +145,19 @@ private
     assert_raise ActionController::UrlGenerationError do
       get type
     end
+
     assert_raise ActionController::UrlGenerationError do
       get type, {:id => -10} # we won't have an id that's negative
     end
+
     get type, {:id => id}
     assert_response :success
     assert_template template
+    assert_template :layout => "map"
+
+    xhr :get, type, {:id => id}
+    assert_response :success
+    assert_template template
+    assert_template :layout => "xhr"
   end
 end