Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ac7ad422
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,发现更多精彩内容 >>
提交
ac7ad422
编写于
6月 26, 2017
作者:
S
Shinya Maeda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
IMprove access_matchers
上级
043f1b82
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
26 deletion
+24
-26
spec/controllers/projects/pipeline_schedules_controller_spec.rb
...ontrollers/projects/pipeline_schedules_controller_spec.rb
+2
-1
spec/support/matchers/access_matchers_for_controller.rb
spec/support/matchers/access_matchers_for_controller.rb
+22
-25
未找到文件。
spec/controllers/projects/pipeline_schedules_controller_spec.rb
浏览文件 @
ac7ad422
...
...
@@ -127,7 +127,8 @@ describe Projects::PipelineSchedulesController do
describe
'PUT update'
do
let
(
:action
)
do
proc
do
|
user
|
put
:update
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
id:
pipeline_schedule
.
id
put
:update
,
namespace_id:
project
.
namespace
.
to_param
,
project_id:
project
,
id:
pipeline_schedule
.
id
,
schedule:
{
description:
'a'
}
end
end
...
...
spec/support/matchers/access_matchers_for_controller.rb
浏览文件 @
ac7ad422
...
...
@@ -5,8 +5,8 @@ module AccessMatchersForController
extend
RSpec
::
Matchers
::
DSL
include
Warden
::
Test
::
Helpers
EXPECTED_STATUS_CODE_ALLOWED
=
[
200
,
302
].
freeze
EXPECTED_STATUS_CODE_DENIED
=
[
404
].
freeze
EXPECTED_STATUS_CODE_ALLOWED
=
[
200
,
201
,
302
].
freeze
EXPECTED_STATUS_CODE_DENIED
=
[
40
1
,
40
4
].
freeze
def
emulate_user
(
role
,
membership
=
nil
)
case
role
...
...
@@ -19,18 +19,13 @@ module AccessMatchersForController
when
:external
user
=
create
(
:user
,
external:
true
)
sign_in
(
user
)
when
:visitor
# rubocop:disable Lint/EmptyWhen
# no-op
when
:visitor
user
=
nil
when
User
user
=
role
sign_in
(
user
)
when
*
Gitlab
::
Access
.
sym_options_with_owner
.
keys
# owner, master, developer, reporter, guest
raise
ArgumentError
,
"cannot emulate
#{
role
}
without membership parent"
unless
membership
if
role
==
:owner
&&
membership
.
owner
user
=
membership
.
owner
else
user
=
create
(
:user
)
membership
.
public_send
(
:"add_
#{
role
}
"
,
user
)
end
user
=
cerate_user_by_membership
(
role
,
membership
)
sign_in
(
user
)
else
raise
ArgumentError
,
"cannot emulate user
#{
role
}
"
...
...
@@ -39,6 +34,18 @@ module AccessMatchersForController
user
end
def
cerate_user_by_membership
(
role
,
membership
=
nil
)
raise
ArgumentError
,
"cannot emulate
#{
role
}
without membership parent"
unless
membership
if
role
==
:owner
&&
membership
.
owner
user
=
membership
.
owner
else
user
=
create
(
:user
)
membership
.
public_send
(
:"add_
#{
role
}
"
,
user
)
end
user
end
def
description_for
(
role
,
type
,
expected
,
result
)
"be
#{
type
}
for
#{
role
}
."
\
" Expected:
#{
expected
.
join
(
','
)
}
Got:
#{
result
}
"
...
...
@@ -47,12 +54,7 @@ module AccessMatchersForController
matcher
:be_allowed_for
do
|
role
|
match
do
|
action
|
user
=
emulate_user
(
role
,
@membership
)
begin
action
.
call
(
user
)
rescue
# Ignore internal exceptions which will be caused in the controller
# In such cases, response.status will be 200.
end
action
.
call
(
user
)
EXPECTED_STATUS_CODE_ALLOWED
.
include?
(
response
.
status
)
end
...
...
@@ -68,12 +70,7 @@ module AccessMatchersForController
matcher
:be_denied_for
do
|
role
|
match
do
|
action
|
user
=
emulate_user
(
role
,
@membership
)
begin
action
.
call
(
user
)
rescue
# Ignore internal exceptions which will be caused in the controller
# In such cases, response.status will be 200.
end
action
.
call
(
user
)
EXPECTED_STATUS_CODE_DENIED
.
include?
(
response
.
status
)
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录