Style rules; Revert some examples
This commit is contained in:
parent
396926bbe4
commit
a2cd8e0dab
|
@ -70,11 +70,14 @@ describe Admin::GroupsController do
|
|||
end
|
||||
|
||||
it 'updates the subgroup_creation_level successfully' do
|
||||
MAINTAINER = ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS
|
||||
|
||||
expect do
|
||||
post :update,
|
||||
params: { id: group.to_param,
|
||||
group: { subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS } }
|
||||
end.to change { group.reload.subgroup_creation_level }.to(::Gitlab::Access::OWNER_SUBGROUP_ACCESS)
|
||||
group: { subgroup_creation_level: MAINTAINER } }
|
||||
end.to change { group.reload.subgroup_creation_level }
|
||||
.to(MAINTAINER)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -506,15 +506,11 @@ describe GroupPolicy do
|
|||
|
||||
context "create_subgroup" do
|
||||
context 'when group has subgroup creation level set to owner' do
|
||||
<<<<<<< HEAD
|
||||
let(:group) do
|
||||
create(
|
||||
:group,
|
||||
subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS)
|
||||
end
|
||||
=======
|
||||
let(:group) { create(:group, subgroup_creation_level: ::Gitlab::Access::OWNER_SUBGROUP_ACCESS) }
|
||||
>>>>>>> Add examples specing the setting to choose who can create subgroups
|
||||
|
||||
context 'reporter' do
|
||||
let(:current_user) { reporter }
|
||||
|
@ -542,15 +538,11 @@ describe GroupPolicy do
|
|||
end
|
||||
|
||||
context 'when group has subgroup creation level set to maintainer' do
|
||||
<<<<<<< HEAD
|
||||
let(:group) do
|
||||
create(
|
||||
:group,
|
||||
subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS)
|
||||
end
|
||||
=======
|
||||
let(:group) { create(:group, subgroup_creation_level: ::Gitlab::Access::MAINTAINER_SUBGROUP_ACCESS) }
|
||||
>>>>>>> Add examples specing the setting to choose who can create subgroups
|
||||
|
||||
context 'reporter' do
|
||||
let(:current_user) { reporter }
|
||||
|
|
|
@ -803,10 +803,10 @@ describe API::Groups do
|
|||
group2.add_maintainer(user1)
|
||||
end
|
||||
|
||||
it 'can create subgroups' do
|
||||
it 'cannot create subgroups' do
|
||||
post api("/groups", user1), params: { parent_id: group2.id, name: 'foo', path: 'foo' }
|
||||
|
||||
expect(response).to have_gitlab_http_status(201)
|
||||
expect(response).to have_gitlab_http_status(403)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -89,9 +89,9 @@ describe Groups::CreateService, '#execute' do
|
|||
it { is_expected.to be_persisted }
|
||||
end
|
||||
|
||||
context 'as maintainer' do
|
||||
context 'as Owner' do
|
||||
before do
|
||||
group.add_maintainer(user)
|
||||
group.add_owner(user)
|
||||
end
|
||||
|
||||
it { is_expected.to be_persisted }
|
||||
|
|
Loading…
Reference in New Issue