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
608e5aca
Commit
608e5aca
authored
Jun 19, 2017
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix up specs that depend on triggered_by.
parent
bbce29e2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
...vue_merge_request_widget/components/mr_widget_pipeline.js
+2
-1
spec/javascripts/vue_shared/components/linked_pipelines_mini_list_spec.js
.../vue_shared/components/linked_pipelines_mini_list_spec.js
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.js
View file @
608e5aca
...
@@ -38,7 +38,8 @@ export default {
...
@@ -38,7 +38,8 @@ export default {
return
this
.
mr
.
pipeline
.
triggered
||
[];
return
this
.
mr
.
pipeline
.
triggered
||
[];
},
},
triggeredBy
()
{
triggeredBy
()
{
return
this
.
mr
.
pipeline
.
triggered_by
||
[];
const
response
=
this
.
mr
.
pipeline
.
triggered_by
;
return
response
?
[
response
]
:
[];
},
},
},
},
template
:
`
template
:
`
...
...
spec/javascripts/vue_shared/components/linked_pipelines_mini_list_spec.js
View file @
608e5aca
...
@@ -9,7 +9,7 @@ describe('Linked pipeline mini list', () => {
...
@@ -9,7 +9,7 @@ describe('Linked pipeline mini list', () => {
beforeEach
(()
=>
{
beforeEach
(()
=>
{
this
.
component
=
new
ListComponent
({
this
.
component
=
new
ListComponent
({
propsData
:
{
propsData
:
{
triggered
_by
:
mockData
.
triggered_by
,
triggered
By
:
[
mockData
.
triggered_by
]
,
},
},
}).
$mount
();
}).
$mount
();
});
});
...
...
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