kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Looks for correct key to pass to commit prop. Adds rspec test.

Browse source
This commit is contained in:
Filipa Lacerda 2017-02-08 17:48:41 +00:00
parent e0d93a5a1f
commit 38bcc1e0e7
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/vue_shared/components/pipelines_table_row.js.es6
View file

@ -111,7 +111,7 @@ require('./commit');
* If provided, returns the commit ref.
* Needed to render the commit component column.
*
* Matched `url` prop sent in the API to `path` prop needed
* Matches `path` prop sent in the API to `ref_url` prop needed
* in the commit component.
*
* @returns {Object|Undefined}
@ -119,8 +119,8 @@ require('./commit');
commitRef() {
if (this.pipeline.ref) {
return Object.keys(this.pipeline.ref).reduce((accumulator, prop) => {
if (prop === 'url') {
accumulator.path = this.pipeline.ref[prop];
if (prop === 'path') {
accumulator.ref_url = this.pipeline.ref[prop];
} else {
accumulator[prop] = this.pipeline.ref[prop];
}

4
changelogs/unreleased/27880-pipelines-table-not-showing-commit-branch.yml Normal file
View file

@ -0,0 +1,4 @@
---
title: Fixes Pipelines table is not showing branch name for commit
merge_request:
author:

4
spec/features/projects/pipelines/pipelines_spec.rb
View file

@ -35,6 +35,10 @@ describe 'Pipelines', :feature, :js do
it 'contains pipeline commit short SHA' do
expect(page).to have_content(pipeline.short_sha)
end
it 'contains branch name' do
expect(page).to have_content(pipeline.ref)
end
end
end