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

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

diff --git a/test/controllers/ways_controller_test.rb b/test/controllers/ways_controller_test.rb
index 6c3c5a8a33c39eae1a0f5b37a5bad10e8b566217..995004cb4179236a95c8998263b90e872ae9366b 100644 (file)
--- a/test/controllers/ways_controller_test.rb
+++ b/test/controllers/ways_controller_test.rb
@@ -28,4 +28,23 @@ class WaysControllerTest < ActionDispatch::IntegrationTest
     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
     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, "browse/feature"
+    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
 end