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
21236c08
Commit
21236c08
authored
Jun 15, 2020
by
Matthew Nearents
Committed by
Tom Quirk
Jun 19, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed invalid variant
parent
7f3083f0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
ee/app/assets/javascripts/approvals/components/rule_controls.vue
...assets/javascripts/approvals/components/rule_controls.vue
+7
-6
ee/spec/frontend/approvals/components/rule_controls_spec.js
ee/spec/frontend/approvals/components/rule_controls_spec.js
+2
-2
No files found.
ee/app/assets/javascripts/approvals/components/rule_controls.vue
View file @
21236c08
<
script
>
import
{
mapState
,
mapActions
}
from
'
vuex
'
;
import
{
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
export
default
{
components
:
{
Gl
Deprecated
Button
,
GlButton
,
Icon
,
},
props
:
{
...
...
@@ -25,15 +25,16 @@ export default {
<
template
>
<div>
<gl-
deprecated-button
variant=
"none"
@
click=
"requestEditRule(rule)"
>
<gl-
button
@
click=
"requestEditRule(rule)"
>
<span>
{{
__
(
'
Edit
'
)
}}
</span>
</gl-
deprecated-
button>
<gl-
deprecated-
button
</gl-button>
<gl-button
class=
"gl-ml-3 btn btn-inverted"
variant=
"danger"
category=
"primary"
@
click=
"requestDeleteRule(rule)"
>
<icon
name=
"remove"
:aria-label=
"__('Remove')"
/>
</gl-
deprecated-
button>
</gl-button>
</div>
</
template
>
ee/spec/frontend/approvals/components/rule_controls_spec.js
View file @
21236c08
import
{
createLocalVue
,
shallowMount
}
from
'
@vue/test-utils
'
;
import
Vuex
from
'
vuex
'
;
import
{
Gl
Deprecated
Button
}
from
'
@gitlab/ui
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
MREditModule
from
'
ee/approvals/stores/modules/mr_edit
'
;
import
{
createStoreOptions
}
from
'
ee/approvals/stores
'
;
import
RuleControls
from
'
ee/approvals/components/rule_controls.vue
'
;
...
...
@@ -31,7 +31,7 @@ describe('EE Approvals RuleControls', () => {
store
:
new
Vuex
.
Store
(
store
),
});
};
const
findButtons
=
()
=>
wrapper
.
findAll
(
Gl
Deprecated
Button
);
const
findButtons
=
()
=>
wrapper
.
findAll
(
GlButton
);
const
findButton
=
label
=>
findButtons
().
filter
(
button
=>
hasLabel
(
button
,
label
)).
wrappers
[
0
];
const
findEditButton
=
()
=>
findButton
(
'
Edit
'
);
const
findRemoveButton
=
()
=>
findButton
(
'
Remove
'
);
...
...
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