Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6d892244
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 搜索 >>
提交
6d892244
编写于
8月 06, 2016
作者:
A
Adam Niedzielski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add API support for expires_at.
上级
9accb302
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
18 addition
and
5 deletion
+18
-5
lib/api/entities.rb
lib/api/entities.rb
+3
-0
lib/api/project_members.rb
lib/api/project_members.rb
+6
-3
spec/requests/api/project_members_spec.rb
spec/requests/api/project_members_spec.rb
+9
-2
未找到文件。
lib/api/entities.rb
浏览文件 @
6d892244
...
...
@@ -95,6 +95,9 @@ module API
expose
:access_level
do
|
user
,
options
|
options
[
:project
].
project_members
.
find_by
(
user_id:
user
.
id
).
access_level
end
expose
:expires_at
do
|
user
,
options
|
options
[
:project
].
project_members
.
find_by
(
user_id:
user
.
id
).
expires_at
end
end
class
Group
<
Grape
::
Entity
...
...
lib/api/project_members.rb
浏览文件 @
6d892244
...
...
@@ -38,6 +38,7 @@ module API
# id (required) - The ID of a project
# user_id (required) - The ID of a user
# access_level (required) - Project access level
# expires_at (optional) - Date string in the format YEAR-MONTH-DAY
# Example Request:
# POST /projects/:id/members
post
":id/members"
do
...
...
@@ -49,7 +50,8 @@ module API
if
project_member
.
nil?
project_member
=
user_project
.
project_members
.
new
(
user_id:
params
[
:user_id
],
access_level:
params
[
:access_level
]
access_level:
params
[
:access_level
],
expires_at:
params
[
:expires_at
]
)
end
...
...
@@ -67,16 +69,17 @@ module API
# id (required) - The ID of a project
# user_id (required) - The ID of a team member
# access_level (required) - Project access level
# expires_at (optional) - Date string in the format YEAR-MONTH-DAY
# Example Request:
# PUT /projects/:id/members/:user_id
put
":id/members/:user_id"
do
authorize!
:admin_project
,
user_project
required_attributes!
[
:access_level
]
attrs
=
attributes_for_keys
[
:access_level
,
:expires_at
]
project_member
=
user_project
.
project_members
.
find_by
(
user_id:
params
[
:user_id
])
not_found!
(
"User can not be found"
)
if
project_member
.
nil?
if
project_member
.
update_attributes
(
a
ccess_level:
params
[
:access_level
]
)
if
project_member
.
update_attributes
(
a
ttrs
)
@member
=
project_member
.
user
present
@member
,
with:
Entities
::
ProjectMember
,
project:
user_project
else
...
...
spec/requests/api/project_members_spec.rb
浏览文件 @
6d892244
...
...
@@ -54,12 +54,16 @@ describe API::API, api: true do
describe
"POST /projects/:id/members"
do
it
"should add user to project team"
do
expect
do
post
api
(
"/projects/
#{
project
.
id
}
/members"
,
user
),
user_id:
user2
.
id
,
access_level:
ProjectMember
::
DEVELOPER
post
api
(
"/projects/
#{
project
.
id
}
/members"
,
user
),
user_id:
user2
.
id
,
access_level:
ProjectMember
::
DEVELOPER
,
expires_at:
'2016-08-05'
end
.
to
change
{
ProjectMember
.
count
}.
by
(
1
)
expect
(
response
).
to
have_http_status
(
201
)
expect
(
json_response
[
'username'
]).
to
eq
(
user2
.
username
)
expect
(
json_response
[
'access_level'
]).
to
eq
(
ProjectMember
::
DEVELOPER
)
expect
(
json_response
[
'expires_at'
]).
to
eq
(
'2016-08-05'
)
end
it
"should return a 201 status if user is already project member"
do
...
...
@@ -95,10 +99,13 @@ describe API::API, api: true do
before
{
project_member2
}
it
"should update project team member"
do
put
api
(
"/projects/
#{
project
.
id
}
/members/
#{
user3
.
id
}
"
,
user
),
access_level:
ProjectMember
::
MASTER
put
api
(
"/projects/
#{
project
.
id
}
/members/
#{
user3
.
id
}
"
,
user
),
access_level:
ProjectMember
::
MASTER
,
expires_at:
'2016-08-05'
expect
(
response
).
to
have_http_status
(
200
)
expect
(
json_response
[
'username'
]).
to
eq
(
user3
.
username
)
expect
(
json_response
[
'access_level'
]).
to
eq
(
ProjectMember
::
MASTER
)
expect
(
json_response
[
'expires_at'
]).
to
eq
(
'2016-08-05'
)
end
it
"should return a 404 error if user_id is not found"
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录