Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
0c75e23f
Commit
0c75e23f
authored
Aug 04, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
93e96c3f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
1 deletion
+24
-1
app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml
.../projects/pipeline_schedules/_pipeline_schedule.html.haml
+1
-1
spec/features/projects/pipeline_schedules_spec.rb
spec/features/projects/pipeline_schedules_spec.rb
+23
-0
No files found.
app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml
View file @
0c75e23f
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
-
else
-
else
=
s_
(
"PipelineSchedules|None"
)
=
s_
(
"PipelineSchedules|None"
)
%td
.next-run-cell
%td
.next-run-cell
-
if
pipeline_schedule
.
active?
-
if
pipeline_schedule
.
active?
&&
pipeline_schedule
.
next_run_at
=
time_ago_with_tooltip
(
pipeline_schedule
.
real_next_run
)
=
time_ago_with_tooltip
(
pipeline_schedule
.
real_next_run
)
-
else
-
else
=
s_
(
"PipelineSchedules|Inactive"
)
=
s_
(
"PipelineSchedules|Inactive"
)
...
...
spec/features/projects/pipeline_schedules_spec.rb
View file @
0c75e23f
...
@@ -219,6 +219,29 @@ feature 'Pipeline Schedules', :js do
...
@@ -219,6 +219,29 @@ feature 'Pipeline Schedules', :js do
end
end
end
end
end
end
context
'when active is true and next_run_at is NULL'
do
background
do
create
(
:ci_pipeline_schedule
,
project:
project
,
owner:
user
).
tap
do
|
pipeline_schedule
|
pipeline_schedule
.
update_attribute
(
:cron
,
nil
)
# Consequently next_run_at will be nil
pipeline_schedule
.
reload
expect
(
pipeline_schedule
.
active
).
to
be_truthy
expect
(
pipeline_schedule
.
next_run_at
).
to
be_nil
end
visit_pipelines_schedules
find
(
".content-list .pipeline-schedule-table-row:nth-child(1) .btn-group a[title='Edit']"
).
click
end
scenario
'user edit and recover the problematic pipeline schedule'
do
expect
(
find
(
"#schedule_cron"
).
value
).
to
eq
(
''
)
fill_in
'schedule_cron'
,
with:
'* 1 2 3 4'
click_button
'Save pipeline schedule'
page
.
within
(
'.pipeline-schedule-table-row:nth-child(1)'
)
do
expect
(
page
).
to
have_css
(
".next-run-cell time"
)
end
end
end
end
end
context
'logged in as non-member'
do
context
'logged in as non-member'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment