Merge remote-tracking branch 'upstream/pull/5480'

[rails.git] / test / controllers / old_ways_controller_test.rb

diff --git a/test/controllers/old_ways_controller_test.rb b/test/controllers/old_ways_controller_test.rb
index 6455343cfa63af9b1e4c43cb28bab6b9bbb021a6..c7b383202bb45081f2396b4a916e93108f9ab606 100644 (file)
--- a/test/controllers/old_ways_controller_test.rb
+++ b/test/controllers/old_ways_controller_test.rb
@@ -14,7 +14,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
 
   def test_history
     way = create(:way, :with_history)
-    sidebar_browse_check :way_history_path, way.id, "browse/history"
+    sidebar_browse_check :way_history_path, way.id, "old_elements/index"
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1
     end
@@ -29,7 +29,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
 
     get way_history_path(:id => way)
     assert_response :success
-    assert_template "browse/history"
+    assert_template "old_elements/index"
 
     # there are 4 revisions of the redacted way, but only 2
     # should be showing details here.
@@ -48,7 +48,7 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
 
     get way_history_path(:id => way, :params => { :show_redactions => true })
     assert_response :success
-    assert_template "browse/history"
+    assert_template "old_elements/index"
 
     assert_select ".browse-section", 4
     assert_select ".browse-section.browse-redacted", 0
@@ -177,11 +177,22 @@ class OldWaysControllerTest < ActionDispatch::IntegrationTest
   def test_not_found
     get old_way_path(0, 0)
     assert_response :not_found
-    assert_template "old_ways/not_found"
+    assert_template "browse/not_found"
     assert_template :layout => "map"
     assert_select "#sidebar_content", /way #0 version 0 could not be found/
   end
 
+  def test_show_timeout
+    way = create(:way, :with_history)
+    with_settings(:web_timeout => -1) do
+      get old_way_path(way, 1)
+    end
+    assert_response :error
+    assert_template :layout => "map"
+    assert_dom "h2", "Timeout Error"
+    assert_dom "p", /#{Regexp.quote("the way with the id #{way.id}")}/
+  end
+
   private
 
   def create_redacted_way