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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
c01444a7
Commit
c01444a7
authored
Dec 25, 2018
by
Harry Kiselev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update condition to visibility collaboration status text, #44642.
parent
5dc656fc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
1 deletion
+51
-1
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
...avascripts/vue_merge_request_widget/mr_widget_options.vue
+4
-1
spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
+47
-0
No files found.
app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue
View file @
c01444a7
...
@@ -106,6 +106,9 @@ export default {
...
@@ -106,6 +106,9 @@ export default {
(
!
this
.
mr
.
isNothingToMergeState
&&
!
this
.
mr
.
isMergedState
)
(
!
this
.
mr
.
isNothingToMergeState
&&
!
this
.
mr
.
isMergedState
)
);
);
},
},
shouldRenderCollaborationStatus
()
{
return
this
.
mr
.
allowCollaboration
&&
this
.
mr
.
isOpen
;
},
shouldRenderMergedPipeline
()
{
shouldRenderMergedPipeline
()
{
return
this
.
mr
.
state
===
'
merged
'
&&
!
_
.
isEmpty
(
this
.
mr
.
mergePipeline
);
return
this
.
mr
.
state
===
'
merged
'
&&
!
_
.
isEmpty
(
this
.
mr
.
mergePipeline
);
},
},
...
@@ -315,7 +318,7 @@ export default {
...
@@ -315,7 +318,7 @@ export default {
<div
class=
"mr-widget-section"
>
<div
class=
"mr-widget-section"
>
<component
:is=
"componentName"
:mr=
"mr"
:service=
"service"
/>
<component
:is=
"componentName"
:mr=
"mr"
:service=
"service"
/>
<section
v-if=
"
mr.allowCollaboration
"
class=
"mr-info-list mr-links"
>
<section
v-if=
"
shouldRenderCollaborationStatus
"
class=
"mr-info-list mr-links"
>
{{
s__
(
'
mrWidget|Allows commits from members who can merge to the target branch
'
)
}}
{{
s__
(
'
mrWidget|Allows commits from members who can merge to the target branch
'
)
}}
</section>
</section>
...
...
spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
View file @
c01444a7
...
@@ -132,6 +132,53 @@ describe('mrWidgetOptions', () => {
...
@@ -132,6 +132,53 @@ describe('mrWidgetOptions', () => {
expect
(
vm
.
shouldRenderSourceBranchRemovalStatus
).
toEqual
(
false
);
expect
(
vm
.
shouldRenderSourceBranchRemovalStatus
).
toEqual
(
false
);
});
});
});
});
describe
(
'
shouldRenderCollaborationStatus
'
,
()
=>
{
describe
(
'
when collaboration is allowed
'
,
()
=>
{
beforeEach
(()
=>
{
vm
.
mr
.
allowCollaboration
=
true
;
});
describe
(
'
when merge request is opened
'
,
()
=>
{
beforeEach
(
done
=>
{
vm
.
mr
.
isOpen
=
true
;
vm
.
$nextTick
(
done
);
});
it
(
'
should render collaboration status
'
,
()
=>
{
expect
(
vm
.
$el
.
textContent
).
toContain
(
'
Allows commits from members
'
);
});
});
describe
(
'
when merge request is not opened
'
,
()
=>
{
beforeEach
(
done
=>
{
vm
.
mr
.
isOpen
=
false
;
vm
.
$nextTick
(
done
);
});
it
(
'
should not render collaboration status
'
,
()
=>
{
expect
(
vm
.
$el
.
textContent
).
not
.
toContain
(
'
Allows commits from members
'
);
});
});
});
describe
(
'
when collaboration is not allowed
'
,
()
=>
{
beforeEach
(()
=>
{
vm
.
mr
.
allowCollaboration
=
false
;
});
describe
(
'
when merge request is opened
'
,
()
=>
{
beforeEach
(
done
=>
{
vm
.
mr
.
isOpen
=
true
;
vm
.
$nextTick
(
done
);
});
it
(
'
should not render collaboration status
'
,
()
=>
{
expect
(
vm
.
$el
.
textContent
).
not
.
toContain
(
'
Allows commits from members
'
);
});
});
});
});
});
});
describe
(
'
methods
'
,
()
=>
{
describe
(
'
methods
'
,
()
=>
{
...
...
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