Commit 8f1eb792 authored by Kamil Trzciński's avatar Kamil Trzciński

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
parents 52527be4 b3b30c94
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
None None
%td.next-run-cell %td.next-run-cell
- if pipeline_schedule.active? - if pipeline_schedule.active?
= time_ago_with_tooltip(pipeline_schedule.next_run_at) = time_ago_with_tooltip(pipeline_schedule.real_next_run)
- else - else
Inactive Inactive
%td %td
......
...@@ -5,7 +5,7 @@ feature 'Pipeline Schedules', :feature do ...@@ -5,7 +5,7 @@ feature 'Pipeline Schedules', :feature do
include WaitForAjax include WaitForAjax
let!(:project) { create(:project) } 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!(:pipeline) { create(:ci_pipeline, pipeline_schedule: pipeline_schedule) }
let(:scope) { nil } let(:scope) { nil }
let!(:user) { create(:user) } let!(:user) { create(:user) }
...@@ -32,6 +32,7 @@ feature 'Pipeline Schedules', :feature do ...@@ -32,6 +32,7 @@ feature 'Pipeline Schedules', :feature do
it 'displays the required information description' do it 'displays the required information description' do
page.within('.pipeline-schedule-table-row') do page.within('.pipeline-schedule-table-row') do
expect(page).to have_content('pipeline schedule') 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('master')
expect(page).to have_link("##{pipeline.id}") expect(page).to have_link("##{pipeline.id}")
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment