diff options
author | Phil Hughes <me@iamphill.com> | 2019-03-27 11:14:33 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-03-27 11:14:33 +0000 |
commit | 8c8fac87870f8bc9b3b359ea0a681a509f7e11ff (patch) | |
tree | 2e7faf3c0ea762603ce0d007d79bea64910dea10 | |
parent | 0610bb091766d3bb935fc10898dd66bc6f76b1c5 (diff) | |
parent | 1cb82c4de9001a0682fb6e4970cc2b5a270e2555 (diff) | |
download | gitlab-ce-8c8fac87870f8bc9b3b359ea0a681a509f7e11ff.tar.gz |
Merge branch '59502-fix-breadcrumb-artifacts' into 'master'
Fixes link in artifacts breadcrumb
Closes #59502
See merge request gitlab-org/gitlab-ce!26592
-rw-r--r-- | app/views/projects/artifacts/browse.html.haml | 2 | ||||
-rw-r--r-- | changelogs/unreleased/59502-fix-breadcrumb-artifacts.yml | 5 | ||||
-rw-r--r-- | spec/features/projects/artifacts/user_browses_artifacts_spec.rb | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/app/views/projects/artifacts/browse.html.haml b/app/views/projects/artifacts/browse.html.haml index 09295940529..6a7cb1499c5 100644 --- a/app/views/projects/artifacts/browse.html.haml +++ b/app/views/projects/artifacts/browse.html.haml @@ -4,7 +4,7 @@ = render "projects/jobs/header" - add_to_breadcrumbs(s_('CICD|Jobs'), project_jobs_path(@project)) -- add_to_breadcrumbs("##{@build.id}", project_jobs_path(@project)) +- add_to_breadcrumbs("##{@build.id}", project_job_path(@project, @build)) .tree-holder .nav-block diff --git a/changelogs/unreleased/59502-fix-breadcrumb-artifacts.yml b/changelogs/unreleased/59502-fix-breadcrumb-artifacts.yml new file mode 100644 index 00000000000..da65c3bc870 --- /dev/null +++ b/changelogs/unreleased/59502-fix-breadcrumb-artifacts.yml @@ -0,0 +1,5 @@ +--- +title: Fixes job link in artifacts page breadcrumb +merge_request: 26592 +author: +type: fixed diff --git a/spec/features/projects/artifacts/user_browses_artifacts_spec.rb b/spec/features/projects/artifacts/user_browses_artifacts_spec.rb index 5f630c9ffa4..a1fcd4024c0 100644 --- a/spec/features/projects/artifacts/user_browses_artifacts_spec.rb +++ b/spec/features/projects/artifacts/user_browses_artifacts_spec.rb @@ -19,6 +19,12 @@ describe "User browses artifacts" do visit(browse_project_job_artifacts_path(project, job)) end + it "renders a link to the job in the breadcrumbs" do + page.within('.js-breadcrumbs-list') do + expect(page).to have_link("##{job.id}", href: project_job_path(project, job)) + end + end + it "shows artifacts" do expect(page).not_to have_selector(".build-sidebar") |