Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix random spec errors

This commit is contained in:
Gerhard Schlager 2018-03-27 11:14:06 +02:00
parent 31dea5d5fc
commit 558914b986
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/groups_controller.rb
View File

@ -253,7 +253,7 @@ class GroupsController < ApplicationController
if (usernames = group.users.where(id: users.pluck(:id)).pluck(:username)).present? if (usernames = group.users.where(id: users.pluck(:id)).pluck(:username)).present?
render_json_error(I18n.t( render_json_error(I18n.t(
"groups.errors.member_already_exist", "groups.errors.member_already_exist",
username: usernames.join(", "), username: usernames.sort.join(", "),
count: usernames.size count: usernames.size
)) ))
else else

5
spec/requests/groups_controller_spec.rb
View File

@ -589,7 +589,8 @@ describe GroupsController do
end end
it 'fails when multiple member already exists' do it 'fails when multiple member already exists' do
user3 = Fabricate(:user) user2.update!(username: 'alice')
user3 = Fabricate(:user, username: 'bob')
[user2, user3].each { |user| group.add(user) } [user2, user3].each { |user| group.add(user) }
expect do expect do
@ -601,7 +602,7 @@ describe GroupsController do
expect(JSON.parse(response.body)["errors"]).to include(I18n.t( expect(JSON.parse(response.body)["errors"]).to include(I18n.t(
"groups.errors.member_already_exist", "groups.errors.member_already_exist",
username: "#{user2.username}, #{user3.username}", username: "alice, bob",
count: 2 count: 2
)) ))
end end