Commit 7b5ad03d authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'remove-gl-new-button-in-selection-summary-component' into 'master'

Remove GlNewButton in select summary component

Closes #214572

See merge request gitlab-org/gitlab!29628
parents 82d4d82d 2ee4bbef
<script> <script>
import { s__, n__ } from '~/locale'; import { s__, n__ } from '~/locale';
import { GlNewButton, GlFormSelect } from '@gitlab/ui'; import { GlButton, GlFormSelect } from '@gitlab/ui';
import toast from '~/vue_shared/plugins/global_toast'; import toast from '~/vue_shared/plugins/global_toast';
import createFlash from '~/flash'; import createFlash from '~/flash';
import dismissVulnerability from '../graphql/dismissVulnerability.graphql'; import dismissVulnerability from '../graphql/dismissVulnerability.graphql';
...@@ -12,7 +12,7 @@ const REASON_FALSE_POSITIVE = s__('Security Reports|False positive'); ...@@ -12,7 +12,7 @@ const REASON_FALSE_POSITIVE = s__('Security Reports|False positive');
export default { export default {
name: 'SelectionSummary', name: 'SelectionSummary',
components: { components: {
GlNewButton, GlButton,
GlFormSelect, GlFormSelect,
}, },
props: { props: {
...@@ -95,7 +95,7 @@ export default { ...@@ -95,7 +95,7 @@ export default {
class="mx-3 w-auto" class="mx-3 w-auto"
:options="$options.dismissalReasons" :options="$options.dismissalReasons"
/> />
<gl-new-button <gl-button
type="submit" type="submit"
class="js-no-auto-disable" class="js-no-auto-disable"
category="secondary" category="secondary"
...@@ -103,7 +103,7 @@ export default { ...@@ -103,7 +103,7 @@ export default {
:disabled="!canDismissVulnerability" :disabled="!canDismissVulnerability"
> >
{{ s__('Security Reports|Dismiss Selected') }} {{ s__('Security Reports|Dismiss Selected') }}
</gl-new-button> </gl-button>
</form> </form>
</div> </div>
</template> </template>
import { mount } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import SelectionSummary from 'ee/security_dashboard/components/selection_summary.vue'; import SelectionSummary from 'ee/security_dashboard/components/selection_summary.vue';
import { GlFormSelect, GlNewButton } from '@gitlab/ui'; import { GlFormSelect, GlButton } from '@gitlab/ui';
import createFlash from '~/flash'; import createFlash from '~/flash';
import toast from '~/vue_shared/plugins/global_toast'; import toast from '~/vue_shared/plugins/global_toast';
...@@ -21,7 +21,7 @@ describe('Selection Summary component', () => { ...@@ -21,7 +21,7 @@ describe('Selection Summary component', () => {
}, },
}; };
const dismissButton = () => wrapper.find(GlNewButton); const dismissButton = () => wrapper.find(GlButton);
const dismissMessage = () => wrapper.find({ ref: 'dismiss-message' }); const dismissMessage = () => wrapper.find({ ref: 'dismiss-message' });
const formSelect = () => wrapper.find(GlFormSelect); const formSelect = () => wrapper.find(GlFormSelect);
......
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