Merge branch '32509-next-run-in-pipeline-schedules-shows-past-time' into 'master'
Use #real_next_run in pipelines table Closes #32509 See merge request !11660
This commit is contained in:
commit
8f1eb7927e
2 changed files with 3 additions and 2 deletions
|
@ -15,7 +15,7 @@
|
|||
None
|
||||
%td.next-run-cell
|
||||
- if pipeline_schedule.active?
|
||||
= time_ago_with_tooltip(pipeline_schedule.next_run_at)
|
||||
= time_ago_with_tooltip(pipeline_schedule.real_next_run)
|
||||
- else
|
||||
Inactive
|
||||
%td
|
||||
|
|
|
@ -5,7 +5,7 @@ feature 'Pipeline Schedules', :feature do
|
|||
include WaitForAjax
|
||||
|
||||
let!(:project) { create(:project) }
|
||||
let!(:pipeline_schedule) { create(:ci_pipeline_schedule, project: project) }
|
||||
let!(:pipeline_schedule) { create(:ci_pipeline_schedule, :nightly, project: project ) }
|
||||
let!(:pipeline) { create(:ci_pipeline, pipeline_schedule: pipeline_schedule) }
|
||||
let(:scope) { nil }
|
||||
let!(:user) { create(:user) }
|
||||
|
@ -32,6 +32,7 @@ feature 'Pipeline Schedules', :feature do
|
|||
it 'displays the required information description' do
|
||||
page.within('.pipeline-schedule-table-row') do
|
||||
expect(page).to have_content('pipeline schedule')
|
||||
expect(page).to have_content(pipeline_schedule.real_next_run.strftime('%b %d, %Y'))
|
||||
expect(page).to have_link('master')
|
||||
expect(page).to have_link("##{pipeline.id}")
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue