Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
92167778
Commit
92167778
authored
Oct 28, 2016
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement CreateMembers service to make controller thin
parent
a60cc42b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
82 additions
and
44 deletions
+82
-44
app/controllers/projects/project_members_controller.rb
app/controllers/projects/project_members_controller.rb
+7
-10
app/services/members/create_service.rb
app/services/members/create_service.rb
+16
-0
spec/controllers/projects/project_members_controller_spec.rb
spec/controllers/projects/project_members_controller_spec.rb
+34
-34
spec/services/members/create_service_spec.rb
spec/services/members/create_service_spec.rb
+25
-0
No files found.
app/controllers/projects/project_members_controller.rb
View file @
92167778
...
...
@@ -25,18 +25,15 @@ class Projects::ProjectMembersController < Projects::ApplicationController
end
def
create
if
params
[
:user_ids
].
blank?
return
redirect_to
(
namespace_project_project_members_path
(
@project
.
namespace
,
@project
),
alert:
'No users or groups specified.'
)
end
status
=
Members
::
CreateService
.
new
(
@project
,
current_user
,
params
).
execute
@project
.
team
.
add_users
(
params
[
:user_ids
].
split
(
','
),
params
[
:access_level
],
expires_at:
params
[
:expires_at
],
current_user:
current_user
)
redirect_url
=
namespace_project_project_members_path
(
@project
.
namespace
,
@project
)
redirect_to
namespace_project_project_members_path
(
@project
.
namespace
,
@project
),
notice:
'Users were successfully added.'
if
status
redirect_to
redirect_url
,
notice:
'Users were successfully added.'
else
redirect_to
redirect_url
,
alert:
'No users or groups specified.'
end
end
def
update
...
...
app/services/members/create_service.rb
0 → 100644
View file @
92167778
module
Members
class
CreateService
<
BaseService
def
execute
return
false
if
params
[
:user_ids
].
blank?
project
.
team
.
add_users
(
params
[
:user_ids
].
split
(
','
),
params
[
:access_level
],
expires_at:
params
[
:expires_at
],
current_user:
current_user
)
true
end
end
end
spec/controllers/projects/project_members_controller_spec.rb
View file @
92167778
...
...
@@ -14,7 +14,6 @@ describe Projects::ProjectMembersController do
end
describe
'POST create'
do
context
'when users are added'
do
let
(
:project_user
)
{
create
(
:user
)
}
before
{
sign_in
(
user
)
}
...
...
@@ -37,6 +36,8 @@ 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
)
post
:create
,
namespace_id:
project
.
namespace
,
project_id:
project
,
user_ids:
project_user
.
id
,
...
...
@@ -44,10 +45,11 @@ describe Projects::ProjectMembersController do
expect
(
response
).
to
set_flash
.
to
'Users were successfully added.'
expect
(
response
).
to
redirect_to
(
namespace_project_project_members_path
(
project
.
namespace
,
project
))
expect
(
project
.
users
).
to
include
project_user
end
it
'adds no user to members'
do
expect_any_instance_of
(
Members
::
CreateService
).
to
receive
(
:execute
).
and_return
(
false
)
post
:create
,
namespace_id:
project
.
namespace
,
project_id:
project
,
user_ids:
''
,
...
...
@@ -55,8 +57,6 @@ describe Projects::ProjectMembersController do
expect
(
response
).
to
set_flash
.
to
'No users or groups specified.'
expect
(
response
).
to
redirect_to
(
namespace_project_project_members_path
(
project
.
namespace
,
project
))
expect
(
project
.
users
).
not_to
include
project_user
end
end
end
end
...
...
spec/services/members/create_service_spec.rb
0 → 100644
View file @
92167778
require
'spec_helper'
describe
Members
::
CreateService
,
services:
true
do
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project_user
)
{
create
(
:user
)
}
before
{
project
.
team
<<
[
user
,
:master
]
}
it
'adds user to members'
do
params
=
{
user_ids:
project_user
.
id
.
to_s
,
access_level:
Gitlab
::
Access
::
GUEST
}
result
=
described_class
.
new
(
project
,
user
,
params
).
execute
expect
(
result
).
to
be_truthy
expect
(
project
.
users
).
to
include
project_user
end
it
'adds no user to members'
do
params
=
{
user_ids:
''
,
access_level:
Gitlab
::
Access
::
GUEST
}
result
=
described_class
.
new
(
project
,
user
,
params
).
execute
expect
(
result
).
to
be_falsey
expect
(
project
.
users
).
not_to
include
project_user
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment