diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-15 09:08:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-15 09:08:54 +0300 |
| commit | a552864a355f31c496e476ad4e57585aeab95a12 (patch) | |
| tree | 4f64140ae93033e7b8e7ee683666d506eca41b68 /spec/javascripts/pipelines | |
| parent | 4998f4e2d82409aaebb4a0fb6f85ad130819da57 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts/pipelines')
3 files changed, 5 insertions, 0 deletions
diff --git a/spec/javascripts/pipelines/graph/graph_component_spec.js b/spec/javascripts/pipelines/graph/graph_component_spec.js index 5effbaabcd1..fa6a5f57410 100644 --- a/spec/javascripts/pipelines/graph/graph_component_spec.js +++ b/spec/javascripts/pipelines/graph/graph_component_spec.js @@ -190,6 +190,7 @@ describe('graph component', () => { describe('on click', () => { it('should emit `onClickTriggered`', () => { spyOn(component, '$emit'); + spyOn(component, 'calculateMarginTop').and.callFake(() => '16px'); component.$el.querySelector('#js-linked-pipeline-34993051').click(); diff --git a/spec/javascripts/pipelines/graph/linked_pipelines_column_spec.js b/spec/javascripts/pipelines/graph/linked_pipelines_column_spec.js index fe7039da9e4..613ab2a906f 100644 --- a/spec/javascripts/pipelines/graph/linked_pipelines_column_spec.js +++ b/spec/javascripts/pipelines/graph/linked_pipelines_column_spec.js @@ -9,6 +9,7 @@ describe('Linked Pipelines Column', () => { columnTitle: 'Upstream', linkedPipelines: mockData.triggered, graphPosition: 'right', + projectId: 19, }; let vm; diff --git a/spec/javascripts/pipelines/linked_pipelines_mock.json b/spec/javascripts/pipelines/linked_pipelines_mock.json index b498903f804..60e214ddc32 100644 --- a/spec/javascripts/pipelines/linked_pipelines_mock.json +++ b/spec/javascripts/pipelines/linked_pipelines_mock.json @@ -341,6 +341,9 @@ "commit_url": "https://gitlab.com/gitlab-org/gitlab-runner/commit/8083eb0a920572214d0dccedd7981f05d535ad46", "commit_path": "/gitlab-org/gitlab-runner/commit/8083eb0a920572214d0dccedd7981f05d535ad46" }, + "project": { + "id": 1794617 + }, "triggered_by": { "id": 12, "user": { |