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
bbce29e2
Commit
bbce29e2
authored
Jun 19, 2017
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix up propsData refs to triggered_by.
parent
1ef5f91c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
spec/javascripts/pipelines/graph/graph_component_spec.js
spec/javascripts/pipelines/graph/graph_component_spec.js
+2
-2
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.
spec/javascripts/pipelines/graph/graph_component_spec.js
View file @
bbce29e2
...
...
@@ -7,7 +7,7 @@ const GraphComponent = Vue.extend(graphComponent);
const
pipelineJSON
=
Object
.
assign
(
graphJSON
,
{
triggered
:
linkedPipelineJSON
.
triggered
,
triggered
B
y
:
linkedPipelineJSON
.
triggered_by
,
triggered
_b
y
:
linkedPipelineJSON
.
triggered_by
,
});
const
defaultPropsData
=
{
...
...
@@ -97,7 +97,7 @@ describe('graph component', function () {
describe
(
'
when linked pipelines are not present
'
,
function
()
{
beforeEach
(
function
()
{
const
pipeline
=
Object
.
assign
(
graphJSON
,
{
triggered
:
[],
triggered
B
y
:
[]
});
const
pipeline
=
Object
.
assign
(
graphJSON
,
{
triggered
:
[],
triggered
_b
y
:
[]
});
this
.
component
=
new
GraphComponent
({
propsData
:
{
pipeline
,
isLoading
:
false
},
}).
$mount
();
...
...
spec/javascripts/vue_shared/components/linked_pipelines_mini_list_spec.js
View file @
bbce29e2
...
...
@@ -9,7 +9,7 @@ describe('Linked pipeline mini list', () => {
beforeEach
(()
=>
{
this
.
component
=
new
ListComponent
({
propsData
:
{
triggered
B
y
:
mockData
.
triggered_by
,
triggered
_b
y
:
mockData
.
triggered_by
,
},
}).
$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