summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil TrzciƄski <ayufan@ayufan.eu>2017-05-12 12:45:07 +0000
committerkushalpandya <kushal@gitlab.com>2017-05-19 14:17:17 +0530
commitf4b251e57056e8b090038f20462cc197408cd533 (patch)
tree719d273ca4e268d25af7c23c29593ee0bc80c5fe
parentd516c85d15c84cc64c44ec4a0f74ea83977906ef (diff)
downloadgitlab-ce-f4b251e57056e8b090038f20462cc197408cd533.tar.gz
Merge branch '32103-last-scheduled-pipeline-link-only-showing-ci-status-icon' into 'master'
Adds pipeline id to 'Last Pipeline' link in pipeline schedules Closes #32103 See merge request !11258
-rw-r--r--app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml1
-rw-r--r--spec/features/projects/pipeline_schedules_spec.rb3
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 c47248353e5..03a30bfb996 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