Merge remote-tracking branch 'upstream/pull/5178'
This commit is contained in:
commit
70f1b327b4
5 changed files with 40 additions and 16 deletions
|
@ -68,5 +68,25 @@ module ChangesetComments
|
|||
get changesets_comments_feed_path(:format => "rss", :limit => 100001)
|
||||
assert_response :bad_request
|
||||
end
|
||||
|
||||
def test_feed_timeout
|
||||
with_settings(:web_timeout => -1) do
|
||||
get changesets_comments_feed_path
|
||||
end
|
||||
assert_response :error
|
||||
assert_equal "application/rss+xml; charset=utf-8", @response.header["Content-Type"]
|
||||
assert_dom "rss>channel>title", :text => "OpenStreetMap changeset discussion"
|
||||
assert_dom "rss>channel>description", :text => /the list of changeset comments you requested took too long to retrieve/
|
||||
end
|
||||
|
||||
def test_feed_changeset_timeout
|
||||
with_settings(:web_timeout => -1) do
|
||||
get changeset_comments_feed_path(123)
|
||||
end
|
||||
assert_response :error
|
||||
assert_equal "application/rss+xml; charset=utf-8", @response.header["Content-Type"]
|
||||
assert_dom "rss>channel>title", :text => "OpenStreetMap changeset #123 discussion"
|
||||
assert_dom "rss>channel>description", :text => /the list of changeset comments you requested took too long to retrieve/
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue