summaryrefslogtreecommitdiff
path: root/spec/controllers/projects
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-06-06 20:45:34 +0000
committerDouwe Maan <douwe@gitlab.com>2017-06-06 20:45:34 +0000
commit71f9c43c833531fb6e2231225b74a42dea4ae00c (patch)
treee1e4dac0d9f100c4cf10d265a926065e1d17a07b /spec/controllers/projects
parentd1c2d36f0325c79aed9b5ae2e6396591c6ced3be (diff)
parent5c602e306cdf979a70aaa81cd473f491f2eee45a (diff)
downloadgitlab-ce-71f9c43c833531fb6e2231225b74a42dea4ae00c.tar.gz
Merge branch '27148-limit-bulk-create-memberships' into 'master'
Limit non-administrators to adding 100 members at a time to groups and projects Closes #27148 See merge request !11940
Diffstat (limited to 'spec/controllers/projects')
-rw-r--r--spec/controllers/projects/project_members_controller_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/projects/project_members_controller_spec.rb b/spec/controllers/projects/project_members_controller_spec.rb
index a4b4392d7cc..2294d5df581 100644
--- a/spec/controllers/projects/project_members_controller_spec.rb
+++ b/spec/controllers/projects/project_members_controller_spec.rb
@@ -36,7 +36,7 @@ describe Projects::ProjectMembersController do
before { project.team << [user, :master] }
it 'adds user to members' do
- expect_any_instance_of(Members::CreateService).to receive(:execute).and_return(true)
+ expect_any_instance_of(Members::CreateService).to receive(:execute).and_return(status: :success)
post :create, namespace_id: project.namespace,
project_id: project,
@@ -48,14 +48,14 @@ describe Projects::ProjectMembersController do
end
it 'adds no user to members' do
- expect_any_instance_of(Members::CreateService).to receive(:execute).and_return(false)
+ expect_any_instance_of(Members::CreateService).to receive(:execute).and_return(status: :failure, message: 'Message')
post :create, namespace_id: project.namespace,
project_id: project,
user_ids: '',
access_level: Gitlab::Access::GUEST
- expect(response).to set_flash.to 'No users specified.'
+ expect(response).to set_flash.to 'Message'
expect(response).to redirect_to(namespace_project_settings_members_path(project.namespace, project))
end
end