Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
760fd675
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 搜索 >>
提交
760fd675
编写于
10月 09, 2018
作者:
W
Winnie Hellmann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add feature flags for scheduled jobs in environments list
上级
6a5e7e7a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
67 addition
and
3 deletion
+67
-3
app/assets/javascripts/environments/components/environment_actions.vue
...vascripts/environments/components/environment_actions.vue
+1
-1
spec/features/projects/environments/environments_spec.rb
spec/features/projects/environments/environments_spec.rb
+66
-2
未找到文件。
app/assets/javascripts/environments/components/environment_actions.vue
浏览文件 @
760fd675
...
...
@@ -70,7 +70,7 @@ export default {
:aria-label=
"title"
:disabled=
"isLoading"
type=
"button"
class=
"dropdown btn btn-default dropdown-new js-
dropdown-play-icon-container
"
class=
"dropdown btn btn-default dropdown-new js-
environment-actions-dropdown
"
data-container=
"body"
data-toggle=
"dropdown"
>
...
...
spec/features/projects/environments/environments_spec.rb
浏览文件 @
760fd675
...
...
@@ -162,7 +162,7 @@ describe 'Environments page', :js do
end
it
'shows a play button'
do
find
(
'.js-
dropdown-play-icon-container
'
).
click
find
(
'.js-
environment-actions-dropdown
'
).
click
expect
(
page
).
to
have_content
(
action
.
name
.
humanize
)
end
...
...
@@ -170,7 +170,7 @@ describe 'Environments page', :js do
it
'allows to play a manual action'
,
:js
do
expect
(
action
).
to
be_manual
find
(
'.js-
dropdown-play-icon-container
'
).
click
find
(
'.js-
environment-actions-dropdown
'
).
click
expect
(
page
).
to
have_content
(
action
.
name
.
humanize
)
expect
{
find
(
'.js-manual-action-link'
).
click
}
...
...
@@ -260,6 +260,70 @@ describe 'Environments page', :js do
end
end
end
context
'when there is a delayed job'
do
let!
(
:pipeline
)
{
create
(
:ci_pipeline
,
project:
project
)
}
let!
(
:build
)
{
create
(
:ci_build
,
pipeline:
pipeline
)
}
let!
(
:delayed_job
)
do
create
(
:ci_build
,
:scheduled
,
pipeline:
pipeline
,
name:
'delayed job'
,
stage:
'test'
,
commands:
'test'
)
end
let!
(
:deployment
)
do
create
(
:deployment
,
environment:
environment
,
deployable:
build
,
sha:
project
.
commit
.
id
)
end
before
do
visit_environments
(
project
)
end
it
'has a dropdown for actionable jobs'
do
expect
(
page
).
to
have_selector
(
'.dropdown-new.btn.btn-default .ic-play'
)
end
it
"has link to the delayed job's action"
do
find
(
'.js-environment-actions-dropdown'
).
click
time_diff
=
[
0
,
delayed_job
.
scheduled_at
-
Time
.
now
].
max
expect
(
page
).
to
have_button
(
'Delayed job'
)
expect
(
page
).
to
have_content
(
Time
.
at
(
time_diff
).
utc
.
strftime
(
"%H:%M:%S"
))
end
context
'when delayed job is expired already'
do
let!
(
:delayed_job
)
do
create
(
:ci_build
,
:expired_scheduled
,
pipeline:
pipeline
,
name:
'delayed job'
,
stage:
'test'
,
commands:
'test'
)
end
it
"shows 00:00:00 as the remaining time"
do
find
(
'.js-environment-actions-dropdown'
).
click
expect
(
page
).
to
have_content
(
"00:00:00"
)
end
end
context
'when user played a delayed job immediately'
do
before
do
find
(
'.js-environment-actions-dropdown'
).
click
page
.
accept_confirm
{
click_button
(
'Delayed job'
)
}
wait_for_requests
end
it
'enqueues the delayed job'
,
:js
do
expect
(
delayed_job
.
reload
).
to
be_pending
end
end
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录