Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f74b33cf
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,体验更适合开发者的 AI 搜索 >>
提交
f74b33cf
编写于
8月 01, 2019
作者:
I
Igor
提交者:
Robert Speicher
8月 01, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add can_merge option to autocomplete response
It's used only if merge_request_iid param is provided
上级
5b38fced
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
62 addition
and
1 deletion
+62
-1
app/controllers/autocomplete_controller.rb
app/controllers/autocomplete_controller.rb
+1
-1
app/serializers/user_serializer.rb
app/serializers/user_serializer.rb
+17
-0
spec/controllers/autocomplete_controller_spec.rb
spec/controllers/autocomplete_controller_spec.rb
+14
-0
spec/serializers/user_serializer_spec.rb
spec/serializers/user_serializer_spec.rb
+30
-0
未找到文件。
app/controllers/autocomplete_controller.rb
浏览文件 @
f74b33cf
...
...
@@ -16,7 +16,7 @@ class AutocompleteController < ApplicationController
.
new
(
params:
params
,
current_user:
current_user
,
project:
project
,
group:
group
)
.
execute
render
json:
UserSerializer
.
new
.
represent
(
users
)
render
json:
UserSerializer
.
new
(
params
).
represent
(
users
,
project:
project
)
end
def
user
...
...
app/serializers/user_serializer.rb
浏览文件 @
f74b33cf
...
...
@@ -2,4 +2,21 @@
class
UserSerializer
<
BaseSerializer
entity
UserEntity
def
represent
(
resource
,
opts
=
{},
entity
=
nil
)
if
params
[
:merge_request_iid
]
merge_request
=
opts
[
:project
].
merge_requests
.
find_by_iid!
(
params
[
:merge_request_iid
])
preload_max_member_access
(
merge_request
.
project
,
Array
(
resource
))
super
(
resource
,
opts
.
merge
(
merge_request:
merge_request
),
MergeRequestAssigneeEntity
)
else
super
end
end
private
def
preload_max_member_access
(
project
,
users
)
project
.
team
.
max_member_access_for_user_ids
(
users
.
map
(
&
:id
))
end
end
spec/controllers/autocomplete_controller_spec.rb
浏览文件 @
f74b33cf
...
...
@@ -222,6 +222,20 @@ describe AutocompleteController do
expect
(
response_user_ids
).
to
contain_exactly
(
non_member
.
id
)
end
end
context
'merge_request_iid parameter included'
do
before
do
sign_in
(
user
)
end
it
'includes can_merge option to users'
do
merge_request
=
create
(
:merge_request
,
source_project:
project
)
get
(
:users
,
params:
{
merge_request_iid:
merge_request
.
iid
,
project_id:
project
.
id
})
expect
(
json_response
.
first
).
to
have_key
(
'can_merge'
)
end
end
end
context
'GET projects'
do
...
...
spec/serializers/user_serializer_spec.rb
0 → 100644
浏览文件 @
f74b33cf
# frozen_string_literal: true
require
'spec_helper'
describe
UserSerializer
do
let
(
:user1
)
{
create
(
:user
)
}
let
(
:user2
)
{
create
(
:user
)
}
context
'serializer with merge request context'
do
let
(
:merge_request
)
{
create
(
:merge_request
)
}
let
(
:project
)
{
merge_request
.
project
}
let
(
:serializer
)
{
described_class
.
new
(
merge_request_iid:
merge_request
.
iid
)
}
before
do
allow
(
project
).
to
(
receive_message_chain
(
:merge_requests
,
:find_by_iid!
)
.
with
(
merge_request
.
iid
).
and_return
(
merge_request
)
)
project
.
add_maintainer
(
user1
)
end
it
'returns a user with can_merge option'
do
serialized_user1
,
serialized_user2
=
serializer
.
represent
([
user1
,
user2
],
project:
project
).
as_json
expect
(
serialized_user1
).
to
include
(
"id"
=>
user1
.
id
,
"can_merge"
=>
true
)
expect
(
serialized_user2
).
to
include
(
"id"
=>
user2
.
id
,
"can_merge"
=>
false
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录