IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix randomly failing JS build.

Browse Source 
For some reason, the test rack server would block on
a `/letter_avatar_proxy` route causing ajax requests to
stack up.
This commit is contained in:
Guo Xiang Tan
2018-04-11 22:16:41 +08:00
parent 88324a13fe
commit 66abd340db
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/javascripts/acceptance/group-test.js.es6
View File

@@ -133,7 +133,7 @@ QUnit.test("Admin viewing group messages when there are no messages", assert =>
QUnit.test("Admin viewing group messages", assert => { QUnit.test("Admin viewing group messages", assert => {
server.get('/topics/private-messages-group/eviltrout/discourse.json', () => { // eslint-disable-line no-undef server.get('/topics/private-messages-group/eviltrout/discourse.json', () => { // eslint-disable-line no-undef
return response({"users":[{"id":2, "username":"bruce1", "avatar_template":"/letter_avatar_proxy/v2/letter/b/9de053/{size}.png"}, {"id":3, "username":"CodingHorror", "avatar_template":"/letter_avatar_proxy/v2/letter/c/e8c25b/{size}.png"}], "primary_groups":[], "topic_list":{"can_create_topic":true, "draft":null, "draft_key":"new_topic", "draft_sequence":0, "per_page":30, "topics":[{"id":12199, "title":"This is a private message 1", "fancy_title":"This is a private message 1", "slug":"this-is-a-private-message-1", "posts_count":0, "reply_count":0, "highest_post_number":0, "image_url":null, "created_at":"2018-03-16T03:38:45.583Z", "last_posted_at":null, "bumped":true, "bumped_at":"2018-03-16T03:38:45.583Z", "unseen":false, "pinned":false, "unpinned":null, "visible":true, "closed":false, "archived":false, "bookmarked":null, "liked":null, "views":0, "like_count":0, "has_summary":false, "archetype":"private_message", "last_poster_username":"bruce1", "category_id":null, "pinned_globally":false, "featured_link":null, "posters":[{"extras":"latest single", "description":"Original Poster, Most Recent Poster", "user_id":2, "primary_group_id":null}], "participants":[{"extras":"latest", "description":null, "user_id":2, "primary_group_id":null}, {"extras":null, "description":null, "user_id":3, "primary_group_id":null}]}]}}); return response({"users":[{"id":2, "username":"bruce1", "avatar_template":"/user_avatar/meta.discourse.org/bruce1/{size}/5245.png"}, {"id":3, "username":"CodingHorror", "avatar_template":"/user_avatar/meta.discourse.org/codinghorror/{size}/5245.png"}], "primary_groups":[], "topic_list":{"can_create_topic":true, "draft":null, "draft_key":"new_topic", "draft_sequence":0, "per_page":30, "topics":[{"id":12199, "title":"This is a private message 1", "fancy_title":"This is a private message 1", "slug":"this-is-a-private-message-1", "posts_count":0, "reply_count":0, "highest_post_number":0, "image_url":null, "created_at":"2018-03-16T03:38:45.583Z", "last_posted_at":null, "bumped":true, "bumped_at":"2018-03-16T03:38:45.583Z", "unseen":false, "pinned":false, "unpinned":null, "visible":true, "closed":false, "archived":false, "bookmarked":null, "liked":null, "views":0, "like_count":0, "has_summary":false, "archetype":"private_message", "last_poster_username":"bruce1", "category_id":null, "pinned_globally":false, "featured_link":null, "posters":[{"extras":"latest single", "description":"Original Poster, Most Recent Poster", "user_id":2, "primary_group_id":null}], "participants":[{"extras":"latest", "description":null, "user_id":2, "primary_group_id":null}, {"extras":null, "description":null, "user_id":3, "primary_group_id":null}]}]}});
}); });
logIn(); logIn();

4
test/javascripts/fixtures/group-fixtures.js.es6
View File

@@ -57,12 +57,12 @@ export default {
{ {
"id":2, "id":2,
"username":"bruce1", "username":"bruce1",
"avatar_template":"/letter_avatar_proxy/v2/letter/b/9de053/{size}.png" "avatar_template":"/user_avatar/meta.discourse.org/bruce1/{size}/5245.png"
}, },
{ {
"id":1, "id":1,
"username":"bruce0", "username":"bruce0",
"avatar_template":"/letter_avatar_proxy/v2/letter/b/90ced4/{size}.png" "avatar_template":"/user_avatar/meta.discourse.org/bruce0/{size}/5245.png"
} }
], ],
"primary_groups":[], "primary_groups":[],