Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f83927eb
Commit
f83927eb
authored
Dec 02, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change prop name to keep consistency with other props.
parent
21d88cda
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
app/assets/javascripts/vue_common_component/commit.js.es6
app/assets/javascripts/vue_common_component/commit.js.es6
+4
-4
spec/javascripts/vue_common_components/commit_spec.js.es6
spec/javascripts/vue_common_components/commit_spec.js.es6
+5
-5
No files found.
app/assets/javascripts/vue_common_component/commit.js.es6
View file @
f83927eb
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
* name
* name
* ref_url
* ref_url
*/
*/
commit
R
ef: {
commit
_r
ef: {
type: Object,
type: Object,
required: false,
required: false,
default: () => ({}),
default: () => ({}),
...
@@ -80,7 +80,7 @@
...
@@ -80,7 +80,7 @@
* @returns {Boolean}
* @returns {Boolean}
*/
*/
hasCommitRef() {
hasCommitRef() {
return this.commit
Ref && this.commitRef.name && this.commitR
ef.ref_url;
return this.commit
_ref && this.commit_ref.name && this.commit_r
ef.ref_url;
},
},
/**
/**
...
@@ -138,8 +138,8 @@
...
@@ -138,8 +138,8 @@
<a v-if="hasCommitRef"
<a v-if="hasCommitRef"
class="monospace branch-name"
class="monospace branch-name"
:href="commit
R
ef.ref_url">
:href="commit
_r
ef.ref_url">
{{commit
R
ef.name}}
{{commit
_r
ef.name}}
</a>
</a>
<div class="icon-container commit-icon commit-icon-container"></div>
<div class="icon-container commit-icon commit-icon-container"></div>
...
...
spec/javascripts/vue_common_components/commit_spec.js.es6
View file @
f83927eb
...
@@ -10,7 +10,7 @@ describe('Commit component', () => {
...
@@ -10,7 +10,7 @@ describe('Commit component', () => {
el: document.querySelector('.test-commit-container'),
el: document.querySelector('.test-commit-container'),
propsData: {
propsData: {
tag: false,
tag: false,
commit
R
ef: {
commit
_r
ef: {
name: 'master',
name: 'master',
ref_url: 'http://localhost/namespace2/gitlabhq/tree/master',
ref_url: 'http://localhost/namespace2/gitlabhq/tree/master',
},
},
...
@@ -34,7 +34,7 @@ describe('Commit component', () => {
...
@@ -34,7 +34,7 @@ describe('Commit component', () => {
props = {
props = {
tag: true,
tag: true,
commit
R
ef: {
commit
_r
ef: {
name: 'master',
name: 'master',
ref_url: 'http://localhost/namespace2/gitlabhq/tree/master',
ref_url: 'http://localhost/namespace2/gitlabhq/tree/master',
},
},
...
@@ -59,11 +59,11 @@ describe('Commit component', () => {
...
@@ -59,11 +59,11 @@ describe('Commit component', () => {
});
});
it('should render a link to the ref url', () => {
it('should render a link to the ref url', () => {
expect(component.$el.querySelector('.branch-name').getAttribute('href')).toEqual(props.commit
R
ef.ref_url);
expect(component.$el.querySelector('.branch-name').getAttribute('href')).toEqual(props.commit
_r
ef.ref_url);
});
});
it('should render the ref name', () => {
it('should render the ref name', () => {
expect(component.$el.querySelector('.branch-name').textContent).toContain(props.commit
R
ef.name);
expect(component.$el.querySelector('.branch-name').textContent).toContain(props.commit
_r
ef.name);
});
});
it('should render the commit short sha with a link to the commit url', () => {
it('should render the commit short sha with a link to the commit url', () => {
...
@@ -103,7 +103,7 @@ describe('Commit component', () => {
...
@@ -103,7 +103,7 @@ describe('Commit component', () => {
fixture.set('<div class="test-commit-container"></div>');
fixture.set('<div class="test-commit-container"></div>');
props = {
props = {
tag: false,
tag: false,
commit
R
ef: {
commit
_r
ef: {
name: 'master',
name: 'master',
ref_url: 'http://localhost/namespace2/gitlabhq/tree/master',
ref_url: 'http://localhost/namespace2/gitlabhq/tree/master',
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment