diff options
author | Bryce Johnson <bryce@gitlab.com> | 2017-05-10 14:47:43 -0400 |
---|---|---|
committer | Bryce Johnson <bryce@gitlab.com> | 2017-05-11 10:21:38 -0400 |
commit | a9ec2427bc641b1cddec7ce9d428a74cc155ad40 (patch) | |
tree | d40aedbe6239074ff8f44d9cd4586794e62abfbe | |
parent | e3fa5275193df70159cba0173dbf99776788c34c (diff) | |
download | gitlab-ce-32103-last-scheduled-pipeline-link-only-showing-ci-status-icon.tar.gz |
Add pipeline id to Last Pipeline cell link.32103-last-scheduled-pipeline-link-only-showing-ci-status-icon
-rw-r--r-- | app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml | 1 | ||||
-rw-r--r-- | spec/features/projects/pipeline_schedules_spec.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml index 1406868488f..075ecee4343 100644 --- a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml +++ b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml @@ -10,6 +10,7 @@ .status-icon-container{ class: "ci-status-icon-#{pipeline_schedule.last_pipeline.status}" } = link_to namespace_project_pipeline_path(@project.namespace, @project, pipeline_schedule.last_pipeline.id) do = ci_icon_for_status(pipeline_schedule.last_pipeline.status) + %span ##{pipeline_schedule.last_pipeline.id} - else None %td.next-run-cell diff --git a/spec/features/projects/pipeline_schedules_spec.rb b/spec/features/projects/pipeline_schedules_spec.rb index cdac4fe2111..fe9f94db574 100644 --- a/spec/features/projects/pipeline_schedules_spec.rb +++ b/spec/features/projects/pipeline_schedules_spec.rb @@ -6,6 +6,7 @@ feature 'Pipeline Schedules', :feature do let!(:project) { create(:project) } let!(:pipeline_schedule) { create(:ci_pipeline_schedule, project: project) } + let!(:pipeline) { create(:ci_pipeline, pipeline_schedule: pipeline_schedule) } let(:scope) { nil } let!(:user) { create(:user) } @@ -32,7 +33,7 @@ feature 'Pipeline Schedules', :feature do page.within('.pipeline-schedule-table-row') do expect(page).to have_content('pipeline schedule') expect(page).to have_link('master') - expect(page).to have_content('None') + expect(page).to have_link("##{pipeline.id}") end end |