Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ed86faeb
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 搜索 >>
提交
ed86faeb
编写于
5月 18, 2017
作者:
V
Valery Sizov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix: Deleting an invited member causes 500 error
上级
72119e7f
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
34 addition
and
1 deletion
+34
-1
app/services/members/authorized_destroy_service.rb
app/services/members/authorized_destroy_service.rb
+1
-1
spec/factories/group_members.rb
spec/factories/group_members.rb
+6
-0
spec/factories/project_members.rb
spec/factories/project_members.rb
+6
-0
spec/services/members/authorized_destroy_service_spec.rb
spec/services/members/authorized_destroy_service_spec.rb
+21
-0
未找到文件。
app/services/members/authorized_destroy_service.rb
浏览文件 @
ed86faeb
...
...
@@ -10,7 +10,7 @@ module Members
return
false
if
member
.
is_a?
(
GroupMember
)
&&
member
.
source
.
last_owner?
(
member
.
user
)
Member
.
transaction
do
unassign_issues_and_merge_requests
(
member
)
unassign_issues_and_merge_requests
(
member
)
unless
member
.
invite?
member
.
destroy
end
...
...
spec/factories/group_members.rb
浏览文件 @
ed86faeb
...
...
@@ -10,5 +10,11 @@ FactoryGirl.define do
trait
(
:master
)
{
access_level
GroupMember
::
MASTER
}
trait
(
:owner
)
{
access_level
GroupMember
::
OWNER
}
trait
(
:access_request
)
{
requested_at
Time
.
now
}
trait
(
:invited
)
do
user_id
nil
invite_token
'xxx'
invite_email
'email@email.com'
end
end
end
spec/factories/project_members.rb
浏览文件 @
ed86faeb
...
...
@@ -9,5 +9,11 @@ FactoryGirl.define do
trait
(
:developer
)
{
access_level
ProjectMember
::
DEVELOPER
}
trait
(
:master
)
{
access_level
ProjectMember
::
MASTER
}
trait
(
:access_request
)
{
requested_at
Time
.
now
}
trait
(
:invited
)
do
user_id
nil
invite_token
'xxx'
invite_email
'email@email.com'
end
end
end
spec/services/members/authorized_destroy_service_spec.rb
浏览文件 @
ed86faeb
...
...
@@ -10,6 +10,27 @@ describe Members::AuthorizedDestroyService, services: true do
Issue
.
assigned_to
(
user
).
count
+
MergeRequest
.
assigned_to
(
user
).
count
end
context
'Invited users'
do
# Regression spec for issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/32504
it
'destroys invited project member'
do
project
.
team
<<
[
member_user
,
:developer
]
member
=
create
:project_member
,
:invited
,
project:
project
expect
{
described_class
.
new
(
member
,
member_user
).
execute
}
.
to
change
{
Member
.
count
}.
from
(
2
).
to
(
1
)
end
it
'destroys invited group member'
do
group
.
add_developer
(
member_user
)
member
=
create
:group_member
,
:invited
,
group:
group
expect
{
described_class
.
new
(
member
,
member_user
).
execute
}
.
to
change
{
Member
.
count
}.
from
(
2
).
to
(
1
)
end
end
context
'Group member'
do
it
"unassigns issues and merge requests"
do
group
.
add_developer
(
member_user
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录