Change ref property to commitRef
This commit is contained in:
parent
a155620042
commit
76abe0eded
|
|
@ -451,7 +451,7 @@
|
|||
<div v-if="!isFolder && hasLastDeploymentKey" class="js-commit-component">
|
||||
<commit-component
|
||||
:tag="commitTag"
|
||||
:ref="commitRef"
|
||||
:commitRef="commitRef"
|
||||
:commit_url="commitUrl"
|
||||
:short_sha="commitShortSha"
|
||||
:title="commitTitle"
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
* name
|
||||
* ref_url
|
||||
*/
|
||||
ref: {
|
||||
commitRef: {
|
||||
type: Object,
|
||||
required: false,
|
||||
default: () => ({}),
|
||||
|
|
@ -79,8 +79,8 @@
|
|||
*
|
||||
* @returns {Boolean}
|
||||
*/
|
||||
hasRef() {
|
||||
return this.ref && this.ref.name && this.ref.ref_url;
|
||||
hasCommitRef() {
|
||||
return this.commitRef && this.commitRef.name && this.commitRef.ref_url;
|
||||
},
|
||||
|
||||
/**
|
||||
|
|
@ -131,15 +131,15 @@
|
|||
template: `
|
||||
<div class="branch-commit">
|
||||
|
||||
<div v-if="hasRef" class="icon-container">
|
||||
<div v-if="hasCommitRef" class="icon-container">
|
||||
<i v-if="tag" class="fa fa-tag"></i>
|
||||
<i v-if="!tag" class="fa fa-code-fork"></i>
|
||||
</div>
|
||||
|
||||
<a v-if="hasRef"
|
||||
<a v-if="hasCommitRef"
|
||||
class="monospace branch-name"
|
||||
:href="ref.ref_url">
|
||||
{{ref.name}}
|
||||
:href="commitRef.ref_url">
|
||||
{{commitRef.name}}
|
||||
</a>
|
||||
|
||||
<div class="icon-container commit-icon commit-icon-container"></div>
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ describe('Commit component', () => {
|
|||
el: document.querySelector('.test-commit-container'),
|
||||
propsData: {
|
||||
tag: false,
|
||||
ref: {
|
||||
commitRef: {
|
||||
name: 'master',
|
||||
ref_url: 'http://localhost/namespace2/gitlabhq/tree/master',
|
||||
},
|
||||
|
|
@ -34,7 +34,7 @@ describe('Commit component', () => {
|
|||
|
||||
props = {
|
||||
tag: true,
|
||||
ref: {
|
||||
commitRef: {
|
||||
name: 'master',
|
||||
ref_url: 'http://localhost/namespace2/gitlabhq/tree/master',
|
||||
},
|
||||
|
|
@ -59,11 +59,11 @@ describe('Commit component', () => {
|
|||
});
|
||||
|
||||
it('should render a link to the ref url', () => {
|
||||
expect(component.$el.querySelector('.branch-name').getAttribute('href')).toEqual(props.ref.ref_url);
|
||||
expect(component.$el.querySelector('.branch-name').getAttribute('href')).toEqual(props.commitRef.ref_url);
|
||||
});
|
||||
|
||||
it('should render the ref name', () => {
|
||||
expect(component.$el.querySelector('.branch-name').textContent).toContain(props.ref.name);
|
||||
expect(component.$el.querySelector('.branch-name').textContent).toContain(props.commitRef.name);
|
||||
});
|
||||
|
||||
it('should render the commit short sha with a link to the commit url', () => {
|
||||
|
|
@ -103,7 +103,7 @@ describe('Commit component', () => {
|
|||
fixture.set('<div class="test-commit-container"></div>');
|
||||
props = {
|
||||
tag: false,
|
||||
ref: {
|
||||
commitRef: {
|
||||
name: 'master',
|
||||
ref_url: 'http://localhost/namespace2/gitlabhq/tree/master',
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue