Skip to content
Snippets Groups Projects
Commit 11596b59 authored by Vitaly Slobodin's avatar Vitaly Slobodin :crystal_ball:
Browse files

Merge branch '363773-security-dashboard-loader' into 'master'

Migrates skeleton loader in security dashboard table row

See merge request !89248
parents 0fbae92d 9ee70482
No related branches found
No related tags found
1 merge request!89248Migrates skeleton loader in security dashboard table row
Pipeline #582768670 passed
<script>
import {
GlButton,
GlFormCheckbox,
GlDeprecatedSkeletonLoading as GlSkeletonLoading,
GlSprintf,
GlIcon,
} from '@gitlab/ui';
import { GlButton, GlFormCheckbox, GlSkeletonLoader, GlSprintf, GlIcon } from '@gitlab/ui';
import { mapActions, mapState } from 'vuex';
import { VULNERABILITY_MODAL_ID } from 'ee/vue_shared/security_reports/components/constants';
import SeverityBadge from 'ee/vue_shared/security_reports/components/severity_badge.vue';
......@@ -20,7 +14,7 @@ export default {
components: {
GlButton,
GlFormCheckbox,
GlSkeletonLoading,
GlSkeletonLoader,
GlSprintf,
GlIcon,
SeverityBadge,
......@@ -141,7 +135,7 @@ export default {
class="table-mobile-content gl-white-space-normal"
data-qa-selector="vulnerability_info_content"
>
<gl-skeleton-loading v-if="isLoading" class="mt-2 js-skeleton-loader" :lines="2" />
<gl-skeleton-loader v-if="isLoading" :lines="2" />
<template v-else>
<gl-button
ref="vulnerability-title"
......
import { GlFormCheckbox } from '@gitlab/ui';
import { GlFormCheckbox, GlSkeletonLoader } from '@gitlab/ui';
import { mount, shallowMount } from '@vue/test-utils';
import Vue from 'vue';
import Vuex from 'vuex';
......@@ -37,7 +37,7 @@ describe('Security Dashboard Table Row', () => {
wrapper = null;
});
const findLoader = () => wrapper.find('.js-skeleton-loader');
const findLoader = () => wrapper.findComponent(GlSkeletonLoader);
const findContent = (i) => wrapper.findAll('.table-mobile-content').at(i);
const findAllIssueCreated = () => wrapper.findAll('[data-testid="issues-icon"]');
const hasSelectedClass = () => wrapper.classes('gl-bg-blue-50');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment