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
eb770e7f
Commit
eb770e7f
authored
Jun 07, 2020
by
Fernando
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove old feature flag for policy list
parent
06c42094
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
58 deletions
+2
-58
ee/app/assets/javascripts/license_compliance/components/app.vue
.../assets/javascripts/license_compliance/components/app.vue
+1
-8
ee/spec/frontend/license_compliance/components/app_spec.js
ee/spec/frontend/license_compliance/components/app_spec.js
+1
-50
No files found.
ee/app/assets/javascripts/license_compliance/components/app.vue
View file @
eb770e7f
...
@@ -57,9 +57,6 @@ export default {
...
@@ -57,9 +57,6 @@ export default {
hasEmptyState
()
{
hasEmptyState
()
{
return
Boolean
(
!
this
.
isJobSetUp
||
this
.
isJobFailed
);
return
Boolean
(
!
this
.
isJobSetUp
||
this
.
isJobFailed
);
},
},
hasLicensePolicyList
()
{
return
Boolean
(
this
.
glFeatures
.
licensePolicyList
);
},
licenseCount
()
{
licenseCount
()
{
return
this
.
pageInfo
.
total
;
return
this
.
pageInfo
.
total
;
},
},
...
@@ -134,8 +131,7 @@ export default {
...
@@ -134,8 +131,7 @@ export default {
<template
v-else
>
{{
s__
(
'
Licenses|Specified policies in this project
'
)
}}
</
template
>
<template
v-else
>
{{
s__
(
'
Licenses|Specified policies in this project
'
)
}}
</
template
>
</header>
</header>
<!-- TODO: Remove feature flag -->
<
template
>
<
template
v-if=
"hasLicensePolicyList"
>
<gl-tabs
v-model=
"tabIndex"
content-class=
"pt-0"
>
<gl-tabs
v-model=
"tabIndex"
content-class=
"pt-0"
>
<gl-tab
data-testid=
"licensesTab"
>
<gl-tab
data-testid=
"licensesTab"
>
<template
#title
>
<template
#title
>
...
@@ -157,8 +153,5 @@ export default {
...
@@ -157,8 +153,5 @@ export default {
</gl-tabs>
</gl-tabs>
</template>
</template>
<
template
v-else
>
<detected-licenses-table
class=
"mt-3"
/>
</
template
>
</div>
</div>
</template>
</template>
ee/spec/frontend/license_compliance/components/app_spec.js
View file @
eb770e7f
...
@@ -164,7 +164,7 @@ describe('Project Licenses', () => {
...
@@ -164,7 +164,7 @@ describe('Project Licenses', () => {
});
});
});
});
describe
(
'
when
licensePolicyList feature flag is enabled
'
,
()
=>
{
describe
(
'
when
page is shown
'
,
()
=>
{
beforeEach
(()
=>
{
beforeEach
(()
=>
{
createComponent
({
createComponent
({
state
:
{
state
:
{
...
@@ -175,11 +175,6 @@ describe('Project Licenses', () => {
...
@@ -175,11 +175,6 @@ describe('Project Licenses', () => {
status
:
REPORT_STATUS
.
ok
,
status
:
REPORT_STATUS
.
ok
,
},
},
},
},
options
:
{
provide
:
{
glFeatures
:
{
licensePolicyList
:
true
},
},
},
});
});
});
});
...
@@ -231,9 +226,6 @@ describe('Project Licenses', () => {
...
@@ -231,9 +226,6 @@ describe('Project Licenses', () => {
pageInfo
:
1
,
pageInfo
:
1
,
},
},
options
:
{
options
:
{
provide
:
{
glFeatures
:
{
licensePolicyList
:
true
},
},
mount
:
true
,
mount
:
true
,
},
},
});
});
...
@@ -274,9 +266,6 @@ describe('Project Licenses', () => {
...
@@ -274,9 +266,6 @@ describe('Project Licenses', () => {
pageInfo
,
pageInfo
,
},
},
options
:
{
options
:
{
provide
:
{
glFeatures
:
{
licensePolicyList
:
true
},
},
mount
:
true
,
mount
:
true
,
},
},
});
});
...
@@ -335,42 +324,4 @@ describe('Project Licenses', () => {
...
@@ -335,42 +324,4 @@ describe('Project Licenses', () => {
});
});
});
});
describe
(
'
when licensePolicyList feature flag is disabled
'
,
()
=>
{
beforeEach
(()
=>
{
createComponent
({
state
:
{
initialized
:
true
,
reportInfo
:
{
jobPath
:
'
/
'
,
generatedAt
:
''
,
status
:
REPORT_STATUS
.
ok
,
},
},
options
:
{
provide
:
{
glFeatures
:
{
licensePolicyList
:
false
},
},
},
});
});
it
(
'
only renders the "Detected in project" table
'
,
()
=>
{
expect
(
wrapper
.
find
(
DetectedLicensesTable
).
exists
()).
toBe
(
true
);
expect
(
wrapper
.
find
(
LicenseManagement
).
exists
()).
toBe
(
false
);
});
it
(
'
renders no "Policies" table
'
,
()
=>
{
expect
(
wrapper
.
find
(
GlTabs
).
exists
()).
toBe
(
false
);
expect
(
wrapper
.
find
(
GlTab
).
exists
()).
toBe
(
false
);
});
it
(
'
renders the pipeline info
'
,
()
=>
{
expect
(
wrapper
.
find
(
PipelineInfo
).
exists
()).
toBe
(
true
);
});
it
(
'
renders no tabs
'
,
()
=>
{
expect
(
wrapper
.
find
(
GlTabs
).
exists
()).
toBe
(
false
);
expect
(
wrapper
.
find
(
GlTab
).
exists
()).
toBe
(
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