Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
af1fb493
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
af1fb493
编写于
11月 01, 2017
作者:
F
Francisco Javier López
提交者:
Douwe Maan
11月 01, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor/group links controller
上级
713052c7
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
76 addition
and
7 deletion
+76
-7
app/controllers/projects/group_links_controller.rb
app/controllers/projects/group_links_controller.rb
+8
-7
app/services/projects/group_links/create_service.rb
app/services/projects/group_links/create_service.rb
+15
-0
app/services/projects/group_links/destroy_service.rb
app/services/projects/group_links/destroy_service.rb
+10
-0
changelogs/unreleased/refactor-group_links_controller.yml
changelogs/unreleased/refactor-group_links_controller.yml
+5
-0
spec/services/projects/group_links/create_service_spec.rb
spec/services/projects/group_links/create_service_spec.rb
+22
-0
spec/services/projects/group_links/destroy_service_spec.rb
spec/services/projects/group_links/destroy_service_spec.rb
+16
-0
未找到文件。
app/controllers/projects/group_links_controller.rb
浏览文件 @
af1fb493
...
...
@@ -12,12 +12,7 @@ class Projects::GroupLinksController < Projects::ApplicationController
if
group
return
render_404
unless
can?
(
current_user
,
:read_group
,
group
)
project
.
project_group_links
.
create
(
group:
group
,
group_access:
params
[
:link_group_access
],
expires_at:
params
[
:expires_at
]
)
Projects
::
GroupLinks
::
CreateService
.
new
(
project
,
current_user
,
group_link_create_params
).
execute
(
group
)
else
flash
[
:alert
]
=
'Please select a group.'
end
...
...
@@ -32,7 +27,9 @@ class Projects::GroupLinksController < Projects::ApplicationController
end
def
destroy
project
.
project_group_links
.
find
(
params
[
:id
]).
destroy
group_link
=
project
.
project_group_links
.
find
(
params
[
:id
])
::
Projects
::
GroupLinks
::
DestroyService
.
new
(
project
,
current_user
).
execute
(
group_link
)
respond_to
do
|
format
|
format
.
html
do
...
...
@@ -47,4 +44,8 @@ class Projects::GroupLinksController < Projects::ApplicationController
def
group_link_params
params
.
require
(
:group_link
).
permit
(
:group_access
,
:expires_at
)
end
def
group_link_create_params
params
.
permit
(
:link_group_access
,
:expires_at
)
end
end
app/services/projects/group_links/create_service.rb
0 → 100644
浏览文件 @
af1fb493
module
Projects
module
GroupLinks
class
CreateService
<
BaseService
def
execute
(
group
)
return
false
unless
group
project
.
project_group_links
.
create
(
group:
group
,
group_access:
params
[
:link_group_access
],
expires_at:
params
[
:expires_at
]
)
end
end
end
end
app/services/projects/group_links/destroy_service.rb
0 → 100644
浏览文件 @
af1fb493
module
Projects
module
GroupLinks
class
DestroyService
<
BaseService
def
execute
(
group_link
)
return
false
unless
group_link
group_link
.
destroy
end
end
end
end
changelogs/unreleased/refactor-group_links_controller.yml
0 → 100644
浏览文件 @
af1fb493
---
title
:
Refactor GroupLinksController
merge_request
:
author
:
15121
type
:
other
spec/services/projects/group_links/create_service_spec.rb
0 → 100644
浏览文件 @
af1fb493
require
'spec_helper'
describe
Projects
::
GroupLinks
::
CreateService
,
'#execute'
do
let
(
:user
)
{
create
:user
}
let
(
:group
)
{
create
:group
}
let
(
:project
)
{
create
:project
}
let
(
:opts
)
do
{
link_group_access:
'30'
,
expires_at:
nil
}
end
let
(
:subject
)
{
described_class
.
new
(
project
,
user
,
opts
)
}
it
'adds group to project'
do
expect
{
subject
.
execute
(
group
)
}.
to
change
{
project
.
project_group_links
.
count
}.
from
(
0
).
to
(
1
)
end
it
'returns false if group is blank'
do
expect
{
subject
.
execute
(
nil
)
}.
not_to
change
{
project
.
project_group_links
.
count
}
end
end
spec/services/projects/group_links/destroy_service_spec.rb
0 → 100644
浏览文件 @
af1fb493
require
'spec_helper'
describe
Projects
::
GroupLinks
::
DestroyService
,
'#execute'
do
let
(
:group_link
)
{
create
:project_group_link
}
let
(
:project
)
{
group_link
.
project
}
let
(
:user
)
{
create
:user
}
let
(
:subject
)
{
described_class
.
new
(
project
,
user
)
}
it
'removes group from project'
do
expect
{
subject
.
execute
(
group_link
)
}.
to
change
{
project
.
project_group_links
.
count
}.
from
(
1
).
to
(
0
)
end
it
'returns false if group_link is blank'
do
expect
{
subject
.
execute
(
nil
)
}.
not_to
change
{
project
.
project_group_links
.
count
}
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录