1d1363e2bb
Ran: - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch - git checkout -b 9-2-5-security-patch origin/v9.2.2 - git apply patchfile.patch - git commit - [Got the sha ref for the commit] - git checkout -b upstream-9-2-security master - git cherry-pick <SHA of the patchfile commit> - [Resolved conflicts] - git cherry-pick --continue
31 lines
1.1 KiB
Ruby
31 lines
1.1 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe Projects::ParticipantsService, services: true do
|
|
describe '#groups' do
|
|
describe 'avatar_url' do
|
|
let(:project) { create(:empty_project, :public) }
|
|
let(:group) { create(:group, avatar: fixture_file_upload(Rails.root + 'spec/fixtures/dk.png')) }
|
|
let(:user) { create(:user) }
|
|
let!(:group_member) { create(:group_member, group: group, user: user) }
|
|
|
|
it 'should return an url for the avatar' do
|
|
participants = described_class.new(project, user)
|
|
groups = participants.groups
|
|
|
|
expect(groups.size).to eq 1
|
|
expect(groups.first[:avatar_url]).to eq("/uploads/system/group/avatar/#{group.id}/dk.png")
|
|
end
|
|
|
|
it 'should return an url for the avatar with relative url' do
|
|
stub_config_setting(relative_url_root: '/gitlab')
|
|
stub_config_setting(url: Settings.send(:build_gitlab_url))
|
|
|
|
participants = described_class.new(project, user)
|
|
groups = participants.groups
|
|
|
|
expect(groups.size).to eq 1
|
|
expect(groups.first[:avatar_url]).to eq("/gitlab/uploads/system/group/avatar/#{group.id}/dk.png")
|
|
end
|
|
end
|
|
end
|
|
end
|