diff --git a/app/assets/javascripts/discourse/routes/groups-index.js.es6 b/app/assets/javascripts/discourse/routes/groups-index.js.es6 index ea30d026c46..e7189d778fd 100644 --- a/app/assets/javascripts/discourse/routes/groups-index.js.es6 +++ b/app/assets/javascripts/discourse/routes/groups-index.js.es6 @@ -11,8 +11,6 @@ export default Discourse.Route.extend({ username: { refreshModel: true } }, - refreshQueryWithoutTransition: true, - model(params) { this._params = params; return this.store.findAll("group", params); diff --git a/test/javascripts/acceptance/groups-index-test.js.es6 b/test/javascripts/acceptance/groups-index-test.js.es6 index 75c26df3b9a..891cf4803fa 100644 --- a/test/javascripts/acceptance/groups-index-test.js.es6 +++ b/test/javascripts/acceptance/groups-index-test.js.es6 @@ -3,6 +3,10 @@ import { acceptance } from "helpers/qunit-helpers"; acceptance("Groups"); QUnit.test("Browsing Groups", async assert => { + await visit("/groups?username=eviltrout"); + + assert.equal(count(".groups-table-row"), 1, "it displays user's groups"); + await visit("/groups"); assert.equal(count(".groups-table-row"), 2, "it displays visible groups"); diff --git a/test/javascripts/fixtures/groups-fixtures.js.es6 b/test/javascripts/fixtures/groups-fixtures.js.es6 index 136f8bcb392..46d6511dd22 100644 --- a/test/javascripts/fixtures/groups-fixtures.js.es6 +++ b/test/javascripts/fixtures/groups-fixtures.js.es6 @@ -50,5 +50,34 @@ export default { extras: { group_user_ids: [] }, total_rows_groups: 2, load_more_groups: "/groups?page=1" + }, + "/groups.json?username=eviltrout": { + groups: [ + { + id: 41, + automatic: false, + name: "discourse", + user_count: 0, + alias_level: 0, + visible: true, + automatic_membership_email_domains: "", + automatic_membership_retroactive: false, + primary_group: false, + title: null, + grant_trust_level: null, + has_messages: false, + flair_url: null, + flair_bg_color: null, + flair_color: null, + bio_raw: "", + bio_cooked: null, + public_admission: true, + allow_membership_requests: false, + full_name: "Awesome Team" + } + ], + extras: { group_user_ids: [] }, + total_rows_groups: 1, + load_more_groups: "/groups?page=1" } }; diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index ad43108cc77..09ecf38ed10 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -350,6 +350,10 @@ export default function() { return response(200, fixturesByUrl["/groups.json"]); }); + this.get("/groups.json", () => { + return response(200, fixturesByUrl["/groups.json?username=eviltrout"]); + }); + this.get("groups/search.json", () => { return response(200, []); });