X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d87d06fee55c4827ade4590280f0caaf297a8217..b8a1a904c6273252c56998178b69f5f65d744d69:/test/controllers/old_nodes_controller_test.rb

diff --git a/test/controllers/old_nodes_controller_test.rb b/test/controllers/old_nodes_controller_test.rb
index bb4dffdc6..8e3a14ab6 100644
--- a/test/controllers/old_nodes_controller_test.rb
+++ b/test/controllers/old_nodes_controller_test.rb
@@ -14,7 +14,7 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest
 
   def test_history
     node = create(:node, :with_history)
-    sidebar_browse_check :node_history_path, node.id, "browse/history"
+    sidebar_browse_check :node_history_path, node.id, "old_elements/index"
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_node_path node, 1}']", :text => "1", :count => 1
     end
@@ -27,7 +27,7 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest
 
     get node_history_path(:id => node)
     assert_response :success
-    assert_template "browse/history"
+    assert_template "old_elements/index"
 
     # there are 2 revisions of the redacted node, but only one
     # should be showing details here.
@@ -46,7 +46,7 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest
 
     get node_history_path(:id => node, :params => { :show_redactions => true })
     assert_response :success
-    assert_template "browse/history"
+    assert_template "old_elements/index"
 
     assert_select ".browse-section", 2
     assert_select ".browse-section.browse-redacted", 0
@@ -213,11 +213,22 @@ class OldNodesControllerTest < ActionDispatch::IntegrationTest
   def test_not_found
     get old_node_path(0, 0)
     assert_response :not_found
-    assert_template "old_nodes/not_found"
+    assert_template "browse/not_found"
     assert_template :layout => "map"
     assert_select "#sidebar_content", /node #0 version 0 could not be found/
   end
 
+  def test_show_timeout
+    node = create(:node, :with_history)
+    with_settings(:web_timeout => -1) do
+      get old_node_path(node, 1)
+    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
+
   private
 
   def create_redacted_node