X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d115a1a7d7c7660696328ac3b10e159156d34489..1be841589acce5e2748037e8d0045e77deacf79d:/test/controllers/nodes_controller_test.rb

diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index 5bb08ea71..6db340c21 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -12,7 +12,7 @@ class NodesControllerTest < ActionDispatch::IntegrationTest
 
   def test_show
     node = create(:node)
-    sidebar_browse_check :node_path, node.id, "browse/feature"
+    sidebar_browse_check :node_path, node.id, "elements/show"
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
     end
@@ -23,7 +23,7 @@ class NodesControllerTest < ActionDispatch::IntegrationTest
 
   def test_show_multiple_versions
     node = create(:node, :with_history, :version => 2)
-    sidebar_browse_check :node_path, node.id, "browse/feature"
+    sidebar_browse_check :node_path, node.id, "elements/show"
     assert_select ".secondary-actions a[href='#{node_history_path node}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_node_path node, 1}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_node_path node, 2}']", :count => 1
@@ -33,13 +33,13 @@ class NodesControllerTest < ActionDispatch::IntegrationTest
     member = create(:node)
     relation = create(:relation)
     create(:relation_member, :relation => relation, :member => member)
-    sidebar_browse_check :node_path, member.id, "browse/feature"
+    sidebar_browse_check :node_path, member.id, "elements/show"
     assert_select "a[href='#{relation_path relation}']", :count => 1
   end
 
   def test_show_deleted
     node = create(:node, :visible => false)
-    sidebar_browse_check :node_path, node.id, "browse/feature"
+    sidebar_browse_check :node_path, node.id, "elements/show"
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
     end
@@ -53,7 +53,7 @@ class NodesControllerTest < ActionDispatch::IntegrationTest
 
     get node_path(node)
     assert_response :success
-    assert_template "feature"
+    assert_template "elements/show"
 
     # check that we don't show lat/lon for a redacted node.
     assert_select ".browse-section", 1
@@ -90,4 +90,15 @@ class NodesControllerTest < ActionDispatch::IntegrationTest
     assert_select ".secondary-actions a", :text => "View History", :count => 1
     assert_select ".secondary-actions a", :text => "View Unredacted History", :count => 1
   end
+
+  def test_show_timeout
+    node = create(:node)
+    with_settings(:web_timeout => -1) do
+      get node_path(node)
+    end
+    assert_response :error
+    assert_template :layout => "map"
+    assert_dom "h2", "Timeout Error"
+    assert_dom "p", /#{Regexp.quote("the node with the id #{node.id}")}/
+  end
 end