X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/54dec279495bdd91b841f709f817234aa943fd21..fdb3a7a102f5c9c438542e6edcf042dbbfda2e07:/test/controllers/ways_controller_test.rb

diff --git a/test/controllers/ways_controller_test.rb b/test/controllers/ways_controller_test.rb
index 6c3c5a8a3..5b80a070c 100644
--- a/test/controllers/ways_controller_test.rb
+++ b/test/controllers/ways_controller_test.rb
@@ -12,7 +12,7 @@ class WaysControllerTest < ActionDispatch::IntegrationTest
 
   def test_show
     way = create(:way)
-    sidebar_browse_check :way_path, way.id, "browse/feature"
+    sidebar_browse_check :way_path, way.id, "elements/show"
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_way_path way, 1}']", :text => "1", :count => 1
     end
@@ -23,9 +23,28 @@ class WaysControllerTest < ActionDispatch::IntegrationTest
 
   def test_show_multiple_versions
     way = create(:way, :with_history, :version => 2)
-    sidebar_browse_check :way_path, way.id, "browse/feature"
+    sidebar_browse_check :way_path, way.id, "elements/show"
     assert_select ".secondary-actions a[href='#{way_history_path way}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_way_path way, 1}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_way_path way, 2}']", :count => 1
   end
+
+  def test_show_relation_member
+    member = create(:way)
+    relation = create(:relation)
+    create(:relation_member, :relation => relation, :member => member)
+    sidebar_browse_check :way_path, member.id, "elements/show"
+    assert_select "a[href='#{relation_path relation}']", :count => 1
+  end
+
+  def test_show_timeout
+    way = create(:way)
+    with_settings(:web_timeout => -1) do
+      get way_path(way)
+    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
 end