Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d2cd9d96
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 搜索 >>
提交
d2cd9d96
编写于
8月 18, 2016
作者:
S
Sean McGivern
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Ensure last group owner isn't removed on expiry
上级
396f85e4
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
48 addition
and
13 deletion
+48
-13
app/services/members/authorized_destroy_service.rb
app/services/members/authorized_destroy_service.rb
+2
-0
spec/workers/remove_expired_members_worker_spec.rb
spec/workers/remove_expired_members_worker_spec.rb
+46
-13
未找到文件。
app/services/members/authorized_destroy_service.rb
浏览文件 @
d2cd9d96
...
...
@@ -7,6 +7,8 @@ module Members
end
def
execute
return
false
if
member
.
is_a?
(
GroupMember
)
&&
member
.
source
.
last_owner?
(
member
.
user
)
member
.
destroy
if
member
.
request?
&&
member
.
user
!=
user
...
...
spec/workers/remove_expired_members_worker_spec.rb
浏览文件 @
d2cd9d96
require
'spec_helper'
describe
RemoveExpiredMembersWorker
do
let!
(
:worker
)
{
RemoveExpiredMembersWorker
.
new
}
let!
(
:expired_member
)
{
create
(
:project_member
,
expires_at:
1
.
hour
.
ago
)
}
let!
(
:member_expiring_in_future
)
{
create
(
:project_member
,
expires_at:
10
.
days
.
from_now
)
}
let!
(
:non_expiring_member
)
{
create
(
:project_member
,
expires_at:
nil
)
}
let
(
:worker
)
{
RemoveExpiredMembersWorker
.
new
}
describe
'#perform'
do
it
'removes expired members'
do
expect
{
worker
.
perform
}.
to
change
{
Member
.
count
}.
by
(
-
1
)
expect
(
Member
.
find_by
(
id:
expired_member
.
id
)).
to
be_nil
context
'project members'
do
let!
(
:expired_project_member
)
{
create
(
:project_member
,
expires_at:
1
.
hour
.
ago
,
access_level:
GroupMember
::
DEVELOPER
)
}
let!
(
:project_member_expiring_in_future
)
{
create
(
:project_member
,
expires_at:
10
.
days
.
from_now
,
access_level:
GroupMember
::
DEVELOPER
)
}
let!
(
:non_expiring_project_member
)
{
create
(
:project_member
,
expires_at:
nil
,
access_level:
GroupMember
::
DEVELOPER
)
}
it
'removes expired members'
do
expect
{
worker
.
perform
}.
to
change
{
Member
.
count
}.
by
(
-
1
)
expect
(
Member
.
find_by
(
id:
expired_project_member
.
id
)).
to
be_nil
end
it
'leaves members who expire in the future'
do
worker
.
perform
expect
(
project_member_expiring_in_future
.
reload
).
to
be_present
end
it
'leaves members who do not expire at all'
do
worker
.
perform
expect
(
non_expiring_project_member
.
reload
).
to
be_present
end
end
it
'leaves members who expire in the future'
do
worker
.
perform
expect
(
member_expiring_in_future
.
reload
).
to
be_present
context
'group members'
do
let!
(
:expired_group_member
)
{
create
(
:group_member
,
expires_at:
1
.
hour
.
ago
,
access_level:
GroupMember
::
DEVELOPER
)
}
let!
(
:group_member_expiring_in_future
)
{
create
(
:group_member
,
expires_at:
10
.
days
.
from_now
,
access_level:
GroupMember
::
DEVELOPER
)
}
let!
(
:non_expiring_group_member
)
{
create
(
:group_member
,
expires_at:
nil
,
access_level:
GroupMember
::
DEVELOPER
)
}
it
'removes expired members'
do
expect
{
worker
.
perform
}.
to
change
{
Member
.
count
}.
by
(
-
1
)
expect
(
Member
.
find_by
(
id:
expired_group_member
.
id
)).
to
be_nil
end
it
'leaves members who expire in the future'
do
worker
.
perform
expect
(
group_member_expiring_in_future
.
reload
).
to
be_present
end
it
'leaves members who do not expire at all'
do
worker
.
perform
expect
(
non_expiring_group_member
.
reload
).
to
be_present
end
end
it
'leaves members who do not expire at all'
do
worker
.
perform
expect
(
non_expiring_member
.
reload
).
to
be_present
context
'when the last group owner expires'
do
let!
(
:expired_group_owner
)
{
create
(
:group_member
,
expires_at:
1
.
hour
.
ago
,
access_level:
GroupMember
::
OWNER
)
}
it
'does not delete the owner'
do
worker
.
perform
expect
(
expired_group_owner
.
reload
).
to
be_present
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录