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
dfcb05f1
Commit
dfcb05f1
authored
Jul 13, 2018
by
Winnie Hellmann (back on 23rd)
Committed by
Fatih Acet
Jul 13, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add missing sourceBranchLink prop to CI widget
parent
5c780244
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
5 deletions
+28
-5
ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
...avascripts/vue_merge_request_widget/mr_widget_options.vue
+1
-0
ee/changelogs/unreleased/winh-fix-ci-widget-branch.yml
ee/changelogs/unreleased/winh-fix-ci-widget-branch.yml
+5
-0
spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js
spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js
+22
-5
No files found.
ee/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
View file @
dfcb05f1
...
...
@@ -234,6 +234,7 @@ export default {
:pipeline=
"mr.pipeline"
:ci-status=
"mr.ciStatus"
:has-ci=
"mr.hasCI"
:source-branch-link=
"mr.sourceBranchLink"
/>
<deployment
v-for=
"deployment in mr.deployments"
...
...
ee/changelogs/unreleased/winh-fix-ci-widget-branch.yml
0 → 100644
View file @
dfcb05f1
---
title
:
Add missing sourceBranchLink prop to CI widget
merge_request
:
6493
author
:
type
:
fixed
spec/javascripts/vue_mr_widget/ee_mr_widget_options_spec.js
View file @
dfcb05f1
...
...
@@ -49,11 +49,13 @@ describe('ee merge request widget options', () => {
vm
.
$destroy
();
mock
.
restore
();
// Clean security reports state
Component
.
mr
.
sast
=
state
().
sast
;
Component
.
mr
.
sastContainer
=
state
().
sastContainer
;
Component
.
mr
.
dast
=
state
().
dast
;
Component
.
mr
.
dependencyScanning
=
state
().
dependencyScanning
;
if
(
Component
.
mr
)
{
// Clean security reports state
Component
.
mr
.
sast
=
state
().
sast
;
Component
.
mr
.
sastContainer
=
state
().
sastContainer
;
Component
.
mr
.
dast
=
state
().
dast
;
Component
.
mr
.
dependencyScanning
=
state
().
dependencyScanning
;
}
});
describe
(
'
security widget
'
,
()
=>
{
...
...
@@ -879,4 +881,19 @@ describe('ee merge request widget options', () => {
expect
(
vm
.
$el
.
querySelectorAll
(
'
.deploy-heading
'
).
length
).
toBe
(
2
);
});
});
describe
(
'
CI widget
'
,
()
=>
{
it
(
'
renders the branch in the pipeline widget
'
,
()
=>
{
const
sourceBranchLink
=
'
<a href="https://www.zelda.com/">Link</a>
'
;
vm
=
mountComponent
(
Component
,
{
mrData
:
{
...
mockData
,
source_branch_with_namespace_link
:
sourceBranchLink
,
},
});
const
ciWidget
=
vm
.
$el
.
querySelector
(
'
.mr-state-widget .label-branch
'
);
expect
(
ciWidget
).
toContainHtml
(
sourceBranchLink
);
});
});
});
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