Merge pull request #5449 from AntonKhorev/edit-preferences

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

diff --git a/test/controllers/relations_controller_test.rb b/test/controllers/relations_controller_test.rb
index 926d9502638c1650b46ae44182e6e723b045e933..0f07a1a4a3b042927e4877db454fed5366ee86fe 100644 (file)
--- a/test/controllers/relations_controller_test.rb
+++ b/test/controllers/relations_controller_test.rb
@@ -12,7 +12,7 @@ class RelationsControllerTest < ActionDispatch::IntegrationTest
 
   def test_show
     relation = create(:relation)
-    sidebar_browse_check :relation_path, relation.id, "browse/feature"
+    sidebar_browse_check :relation_path, relation.id, "elements/show"
     assert_select "h4", /^Version/ do
       assert_select "a[href='#{old_relation_path relation, 1}']", :text => "1", :count => 1
     end
@@ -23,7 +23,7 @@ class RelationsControllerTest < ActionDispatch::IntegrationTest
 
   def test_show_multiple_versions
     relation = create(:relation, :with_history, :version => 2)
-    sidebar_browse_check :relation_path, relation.id, "browse/feature"
+    sidebar_browse_check :relation_path, relation.id, "elements/show"
     assert_select ".secondary-actions a[href='#{relation_history_path relation}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_relation_path relation, 1}']", :count => 1
     assert_select ".secondary-actions a[href='#{old_relation_path relation, 2}']", :count => 1
@@ -33,7 +33,18 @@ class RelationsControllerTest < ActionDispatch::IntegrationTest
     member = create(:relation)
     relation = create(:relation)
     create(:relation_member, :relation => relation, :member => member)
-    sidebar_browse_check :relation_path, member.id, "browse/feature"
+    sidebar_browse_check :relation_path, member.id, "elements/show"
     assert_select "a[href='#{relation_path relation}']", :count => 1
   end
+
+  def test_show_timeout
+    relation = create(:relation)
+    with_settings(:web_timeout => -1) do
+      get relation_path(relation)
+    end
+    assert_response :error
+    assert_template :layout => "map"
+    assert_dom "h2", "Timeout Error"
+    assert_dom "p", /#{Regexp.quote("the relation with the id #{relation.id}")}/
+  end
 end