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
60e014c0
Commit
60e014c0
authored
Jul 01, 2020
by
Fernando
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean up unit tests
* Clean up descriptions
parent
3d5d9c19
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
30 deletions
+24
-30
ee/app/assets/javascripts/vue_shared/license_compliance/license_management.vue
...ipts/vue_shared/license_compliance/license_management.vue
+1
-2
ee/spec/frontend/vue_shared/license_compliance/license_management_spec.js
.../vue_shared/license_compliance/license_management_spec.js
+23
-28
No files found.
ee/app/assets/javascripts/vue_shared/license_compliance/license_management.vue
View file @
60e014c0
...
...
@@ -3,7 +3,6 @@ import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import
{
mapState
,
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
{
GlButton
,
GlLoadingIcon
,
GlIcon
,
GlPopover
}
from
'
@gitlab/ui
'
;
import
{
s__
}
from
'
~/locale
'
;
import
glFeatureFlagsMixin
from
'
~/vue_shared/mixins/gl_feature_flags_mixin
'
;
import
{
LICENSE_MANAGEMENT
}
from
'
ee/vue_shared/license_compliance/store/constants
'
;
import
AddLicenseForm
from
'
./components/add_license_form.vue
'
;
import
AdminLicenseManagementRow
from
'
./components/admin_license_management_row.vue
'
;
...
...
@@ -126,7 +125,7 @@ export default {
<span
class=
"text-secondary"
>
{{
s__
(
'
Licenses|Acceptable license to be used in the project
'
)
}}
</span
>
<
h5>
{{
__
(
'
Denied
'
)
}}
</h5
>
<
div
class=
"h5"
>
{{
__
(
'
Denied
'
)
}}
</div
>
<span
class=
"text-secondary"
>
{{
s__
(
...
...
ee/spec/frontend/vue_shared/license_compliance/license_management_spec.js
View file @
60e014c0
...
...
@@ -197,32 +197,23 @@ describe('License Management', () => {
});
});
describe
(
'
when licenseComplianceDeniesMr feature flag enabled
'
,
()
=>
{
it
(
'
should not show the developer only tooltip
'
,
()
=>
{
createComponent
({
state
:
{
isLoadingManagedLicenses
:
false
},
isAdmin
:
true
,
provide
:
{
glFeatures
:
{
licenseComplianceDeniesMr
:
true
},
},
});
expect
(
findIcon
().
exists
()).
toBe
(
false
);
expect
(
findPopover
().
exists
()).
toBe
(
false
);
});
});
describe
.
each
([
true
,
false
])(
'
when licenseComplianceDeniesMr feature flag is %p
'
,
({
licenseComplianceDeniesMr
})
=>
{
it
(
'
should not show the developer only tooltip
'
,
()
=>
{
createComponent
({
state
:
{
isLoadingManagedLicenses
:
false
},
isAdmin
:
false
,
provide
:
{
glFeatures
:
{
licenseComplianceDeniesMr
},
},
});
describe
(
'
when licenseComplianceDeniesMr feature flag disabled
'
,
()
=>
{
it
(
'
should not show the developer only tooltip
'
,
()
=>
{
createComponent
({
state
:
{
isLoadingManagedLicenses
:
false
},
isAdmin
:
true
,
expect
(
findIcon
().
exists
()).
toBe
(
false
);
expect
(
findPopover
().
exists
()).
toBe
(
false
);
});
expect
(
findIcon
().
exists
()).
toBe
(
false
);
expect
(
findPopover
().
exists
()).
toBe
(
false
);
});
});
},
);
});
describe
(
'
when developer
'
,
()
=>
{
...
...
@@ -262,10 +253,14 @@ describe('License Management', () => {
});
});
describe
.
each
([
true
,
false
])(
'
when licenseComplianceDeniesMr feature flag is %p
'
,
licenseComplianceDeniesMr
=>
{
it
(
'
should show the developer only tooltip
'
,
()
=>
{
describe
.
each
`
licenseComplianceDeniesMr | should
${
true
}
|
${
'
should
'
}
${
false
}
|
${
'
shouls not
'
}
`
(
'
when licenseComplianceDeniesMr feature flag is $licenseComplianceDeniesMr
'
,
({
licenseComplianceDeniesMr
,
should
})
=>
{
it
(
`
${
should
}
show the developer only tooltip`
,
()
=>
{
createComponent
({
state
:
{
isLoadingManagedLicenses
:
false
},
isAdmin
:
false
,
...
...
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