Merge diffs from master

This commit is contained in:
Neil Lalonde 2020-09-24 16:07:12 -04:00
parent 1de85c0b1d
commit ccfdb7eb39
No known key found for this signature in database
GPG Key ID: FF871CA9037D0A91

View File

@ -225,16 +225,6 @@ RSpec.describe ListController do
expect(response.status).to eq(404)
end
it 'should return the right response when user does not belong to group' do
Fabricate(:private_message_topic, allowed_groups: [group])
group.remove(user)
get "/topics/private-messages-group/#{user.username}/#{group.name}.json"
expect(response.status).to eq(404)
end
it 'should return the right response' do
topic = Fabricate(:private_message_topic, allowed_groups: [group])
get "/topics/private-messages-group/#{user.username}/#{group.name}.json"