ec0061a95c
Changes include: - Ensure Member.add_user is not called directly when not necessary - New GroupMember.add_users_to_group to have the same abstraction level as for Project - Refactor Member.add_user to take a source instead of an array of members - Fix Rubocop offenses - Always use Project#add_user instead of project.team.add_user - Factorize users addition as members in Member.add_users_to_source - Make access_level a keyword argument in GroupMember.add_users_to_group and ProjectMember.add_users_to_projects - Destroy any requester before adding them as a member - Improve the way we handle access requesters in Member.add_user Instead of removing the requester and creating a new member, we now simply accepts their access request. This way, they will receive a "access request granted" email. - Fix error that was previously silently ignored - Stop raising when access level is invalid in Member, let Rails validation do their work Signed-off-by: Rémy Coutable <remy@rymai.me>
48 lines
1.6 KiB
Ruby
48 lines
1.6 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe Projects::TemplatesController do
|
|
let(:project) { create(:project) }
|
|
let(:user) { create(:user) }
|
|
let(:user2) { create(:user) }
|
|
let(:file_path_1) { '.gitlab/issue_templates/bug.md' }
|
|
let(:body) { JSON.parse(response.body) }
|
|
|
|
before do
|
|
project.team << [user, :developer]
|
|
sign_in(user)
|
|
end
|
|
|
|
before do
|
|
project.add_user(user, Gitlab::Access::MASTER)
|
|
project.repository.commit_file(user, file_path_1, "something valid", "test 3", "master", false)
|
|
end
|
|
|
|
describe '#show' do
|
|
it 'renders template name and content as json' do
|
|
get(:show, namespace_id: project.namespace.to_param, template_type: "issue", key: "bug", project_id: project.path, format: :json)
|
|
|
|
expect(response.status).to eq(200)
|
|
expect(body["name"]).to eq("bug")
|
|
expect(body["content"]).to eq("something valid")
|
|
end
|
|
|
|
it 'renders 404 when unauthorized' do
|
|
sign_in(user2)
|
|
get(:show, namespace_id: project.namespace.to_param, template_type: "issue", key: "bug", project_id: project.path, format: :json)
|
|
|
|
expect(response.status).to eq(404)
|
|
end
|
|
|
|
it 'renders 404 when template type is not found' do
|
|
sign_in(user)
|
|
get(:show, namespace_id: project.namespace.to_param, template_type: "dont_exist", key: "bug", project_id: project.path, format: :json)
|
|
|
|
expect(response.status).to eq(404)
|
|
end
|
|
|
|
it 'renders 404 without errors' do
|
|
sign_in(user)
|
|
expect { get(:show, namespace_id: project.namespace.to_param, template_type: "dont_exist", key: "bug", project_id: project.path, format: :json) }.not_to raise_error
|
|
end
|
|
end
|
|
end
|