diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-23 20:34:42 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-05-23 20:34:42 +0000 |
| commit | 8f1eb7927edeb9f688b2a04ad34d92c5e7b33971 (patch) | |
| tree | 331001ccf7298b4f7d6d0916610aff1431519bb4 | |
| parent | 52527be4387cb978402a330f2e4de96e586a62db (diff) | |
| parent | b3b30c947e4eda1f163436709aad35529284e82d (diff) | |
| download | gitlab-ce-8f1eb7927edeb9f688b2a04ad34d92c5e7b33971.tar.gz | |
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
| -rw-r--r-- | app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/projects/pipeline_schedules_spec.rb | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml index 2cd82e1b661..082a6bcbb2a 100644 --- a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml +++ b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml @@ -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 diff --git a/spec/features/projects/pipeline_schedules_spec.rb b/spec/features/projects/pipeline_schedules_spec.rb index 1211b17b3d8..a521222fc9c 100644 --- a/spec/features/projects/pipeline_schedules_spec.rb +++ b/spec/features/projects/pipeline_schedules_spec.rb @@ -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 |