Commit 0043e4dc authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'Replace-GlDepreactedBadge-in-license_compliance/components/app' into 'master'

Replace GlDeprecatedBadge in license_compliance/components/app

See merge request gitlab-org/gitlab!45891
parents de84323f e219ec33
...@@ -7,7 +7,7 @@ import { ...@@ -7,7 +7,7 @@ import {
GlIcon, GlIcon,
GlTab, GlTab,
GlTabs, GlTabs,
GlDeprecatedBadge as GlBadge, GlBadge,
GlAlert, GlAlert,
} from '@gitlab/ui'; } from '@gitlab/ui';
import { LICENSE_MANAGEMENT } from 'ee/vue_shared/license_compliance/store/constants'; import { LICENSE_MANAGEMENT } from 'ee/vue_shared/license_compliance/store/constants';
...@@ -135,7 +135,7 @@ export default { ...@@ -135,7 +135,7 @@ export default {
<gl-tab data-testid="licensesTab"> <gl-tab data-testid="licensesTab">
<template #title> <template #title>
<span data-testid="licensesTabTitle">{{ s__('Licenses|Detected in Project') }}</span> <span data-testid="licensesTabTitle">{{ s__('Licenses|Detected in Project') }}</span>
<gl-badge pill>{{ licenseCount }}</gl-badge> <gl-badge>{{ licenseCount }}</gl-badge>
</template> </template>
<detected-licenses-table /> <detected-licenses-table />
...@@ -146,7 +146,7 @@ export default { ...@@ -146,7 +146,7 @@ export default {
<span data-qa-selector="policies_tab" data-testid="policiesTabTitle">{{ <span data-qa-selector="policies_tab" data-testid="policiesTabTitle">{{
s__('Licenses|Policies') s__('Licenses|Policies')
}}</span> }}</span>
<gl-badge pill>{{ policyCount }}</gl-badge> <gl-badge>{{ policyCount }}</gl-badge>
</template> </template>
<license-management /> <license-management />
......
---
title: Replaced GlDeprecatedBadge for GlBadge in ee/app/assets/javascripts/license_compliance/components/app.vue
merge_request: 45891
author:
type: changed
...@@ -2,14 +2,7 @@ import { shallowMount, mount } from '@vue/test-utils'; ...@@ -2,14 +2,7 @@ import { shallowMount, mount } from '@vue/test-utils';
import Vue from 'vue'; import Vue from 'vue';
import Vuex from 'vuex'; import Vuex from 'vuex';
import { import { GlEmptyState, GlLoadingIcon, GlTab, GlTabs, GlAlert, GlBadge } from '@gitlab/ui';
GlEmptyState,
GlLoadingIcon,
GlTab,
GlTabs,
GlAlert,
GlDeprecatedBadge as GlBadge,
} from '@gitlab/ui';
import { TEST_HOST } from 'helpers/test_constants'; import { TEST_HOST } from 'helpers/test_constants';
import setWindowLocation from 'helpers/set_window_location_helper'; import setWindowLocation from 'helpers/set_window_location_helper';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment