Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8926b37d
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 搜索 >>
提交
8926b37d
编写于
4月 25, 2019
作者:
S
syasonik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Prefer safe_load and deep_symbolize_keys
上级
4a5c48c4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
11 addition
and
12 deletion
+11
-12
lib/gitlab/metrics/dashboard/processor.rb
lib/gitlab/metrics/dashboard/processor.rb
+6
-7
lib/gitlab/metrics/dashboard/service.rb
lib/gitlab/metrics/dashboard/service.rb
+2
-2
spec/controllers/projects/environments_controller_spec.rb
spec/controllers/projects/environments_controller_spec.rb
+1
-1
spec/lib/gitlab/metrics/dashboard/service_spec.rb
spec/lib/gitlab/metrics/dashboard/service_spec.rb
+2
-2
未找到文件。
lib/gitlab/metrics/dashboard/processor.rb
浏览文件 @
8926b37d
...
...
@@ -21,13 +21,12 @@ module Gitlab
# Returns a new dashboard hash with the results of
# running transforms on the dashboard.
def
process
(
dashboard
)
dashboard
=
dashboard
.
deep_symbolize_keys
stage_params
=
[
@project
,
@environment
]
sequence
.
each
{
|
stage
|
stage
.
new
(
*
stage_params
).
transform!
(
dashboard
)
}
dashboard
def
process
(
raw_dashboard
)
raw_dashboard
.
deep_symbolize_keys
.
tap
do
|
dashboard
|
sequence
.
each
do
|
stage
|
stage
.
new
(
@project
,
@environment
).
transform!
(
dashboard
)
end
end
end
private
...
...
lib/gitlab/metrics/dashboard/service.rb
浏览文件 @
8926b37d
...
...
@@ -23,7 +23,7 @@ module Gitlab
# Returns the base metrics shipped with every GitLab service.
def
system_dashboard
YAML
.
load_file
(
SYSTEM_DASHBOARD_PATH
)
YAML
.
safe_load
(
File
.
read
(
SYSTEM_DASHBOARD_PATH
)
)
end
def
cache_key
...
...
@@ -32,7 +32,7 @@ module Gitlab
# Returns a new dashboard Hash, supplemented with DB info
def
process_dashboard
(
dashboard
)
Processor
.
new
(
project
,
params
[
:environment
]).
process
(
dashboard
)
Gitlab
::
Metrics
::
Dashboard
::
Processor
.
new
(
project
,
params
[
:environment
]).
process
(
dashboard
)
end
end
end
...
...
spec/controllers/projects/environments_controller_spec.rb
浏览文件 @
8926b37d
...
...
@@ -485,7 +485,7 @@ describe Projects::EnvironmentsController do
context
'when the dashboard could not be provided'
do
before
do
allow
(
YAML
).
to
receive
(
:
load_file
).
and_return
({})
allow
(
YAML
).
to
receive
(
:
safe_load
).
and_return
({})
end
it
'returns an error response'
do
...
...
spec/lib/gitlab/metrics/dashboard/service_spec.rb
浏览文件 @
8926b37d
...
...
@@ -19,7 +19,7 @@ describe Gitlab::Metrics::Dashboard::Service, :use_clean_rails_memory_store_cach
end
it
'caches the dashboard for subsequent calls'
do
expect
(
YAML
).
to
receive
(
:
load_file
).
once
.
and_call_original
expect
(
YAML
).
to
receive
(
:
safe_load
).
once
.
and_call_original
described_class
.
new
(
project
,
environment
).
get_dashboard
described_class
.
new
(
project
,
environment
).
get_dashboard
...
...
@@ -27,7 +27,7 @@ describe Gitlab::Metrics::Dashboard::Service, :use_clean_rails_memory_store_cach
context
'when the dashboard is configured incorrectly'
do
before
do
allow
(
YAML
).
to
receive
(
:
load_file
).
and_return
({})
allow
(
YAML
).
to
receive
(
:
safe_load
).
and_return
({})
end
it
'returns an appropriate message and status code'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录