From ee664acb356f8123f4f6b00b73c1e1cf0866c7fb Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 20 Oct 2022 09:40:42 +0000
Subject: Add latest changes from gitlab-org/gitlab@15-5-stable-ee

---
 .../package_registry/pages/details_spec.js         | 42 ++++++++++++++++------
 1 file changed, 31 insertions(+), 11 deletions(-)

(limited to 'spec/frontend/packages_and_registries/package_registry/pages/details_spec.js')

diff --git a/spec/frontend/packages_and_registries/package_registry/pages/details_spec.js b/spec/frontend/packages_and_registries/package_registry/pages/details_spec.js
index 83158d1cc5e..a32e76a132e 100644
--- a/spec/frontend/packages_and_registries/package_registry/pages/details_spec.js
+++ b/spec/frontend/packages_and_registries/package_registry/pages/details_spec.js
@@ -1,4 +1,4 @@
-import { GlEmptyState, GlBadge, GlTabs, GlTab } from '@gitlab/ui';
+import { GlEmptyState, GlBadge, GlTabs, GlTab, GlSprintf } from '@gitlab/ui';
 import Vue, { nextTick } from 'vue';
 
 import VueApollo from 'vue-apollo';
@@ -6,7 +6,7 @@ import createMockApollo from 'helpers/mock_apollo_helper';
 import { useMockLocationHelper } from 'helpers/mock_window_location_helper';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import waitForPromises from 'helpers/wait_for_promises';
-import createFlash from '~/flash';
+import { createAlert } from '~/flash';
 
 import AdditionalMetadata from '~/packages_and_registries/package_registry/components/details/additional_metadata.vue';
 import PackagesApp from '~/packages_and_registries/package_registry/pages/details.vue';
@@ -86,11 +86,17 @@ describe('PackagesApp', () => {
         PackageTitle,
         DeletePackage,
         GlModal: {
-          template: '<div></div>',
+          template: `
+            <div>
+              <slot name="modal-title"></slot>
+              <p><slot></slot></p>
+            </div>
+          `,
           methods: {
             show: jest.fn(),
           },
         },
+        GlSprintf,
         GlTabs,
         GlTab,
       },
@@ -149,7 +155,7 @@ describe('PackagesApp', () => {
 
     await waitForPromises();
 
-    expect(createFlash).toHaveBeenCalledWith(
+    expect(createAlert).toHaveBeenCalledWith(
       expect.objectContaining({
         message: FETCH_PACKAGE_DETAILS_ERROR_MESSAGE,
       }),
@@ -245,7 +251,9 @@ describe('PackagesApp', () => {
 
       await findDeleteButton().trigger('click');
 
-      expect(findDeleteModal().exists()).toBe(true);
+      expect(findDeleteModal().find('p').text()).toBe(
+        'You are about to delete version 1.0.0 of @gitlab-org/package-15. Are you sure?',
+      );
     });
 
     describe('successful request', () => {
@@ -359,6 +367,12 @@ describe('PackagesApp', () => {
 
         expect(showDeletePackageSpy).toHaveBeenCalled();
         expect(showDeleteFileSpy).not.toHaveBeenCalled();
+
+        await waitForPromises();
+
+        expect(findDeleteModal().find('p').text()).toBe(
+          'Deleting the last package asset will remove version 1.0.0 of @gitlab-org/package-15. Are you sure?',
+        );
       });
 
       it('confirming on the modal sets the loading state', async () => {
@@ -383,7 +397,7 @@ describe('PackagesApp', () => {
 
         await doDeleteFile();
 
-        expect(createFlash).toHaveBeenCalledWith(
+        expect(createAlert).toHaveBeenCalledWith(
           expect.objectContaining({
             message: DELETE_PACKAGE_FILE_SUCCESS_MESSAGE,
           }),
@@ -399,7 +413,7 @@ describe('PackagesApp', () => {
 
           await doDeleteFile();
 
-          expect(createFlash).toHaveBeenCalledWith(
+          expect(createAlert).toHaveBeenCalledWith(
             expect.objectContaining({
               message: DELETE_PACKAGE_FILE_ERROR_MESSAGE,
             }),
@@ -416,7 +430,7 @@ describe('PackagesApp', () => {
 
           await doDeleteFile();
 
-          expect(createFlash).toHaveBeenCalledWith(
+          expect(createAlert).toHaveBeenCalledWith(
             expect.objectContaining({
               message: DELETE_PACKAGE_FILE_ERROR_MESSAGE,
             }),
@@ -468,7 +482,7 @@ describe('PackagesApp', () => {
 
         await doDeleteFiles();
 
-        expect(createFlash).toHaveBeenCalledWith(
+        expect(createAlert).toHaveBeenCalledWith(
           expect.objectContaining({
             message: DELETE_PACKAGE_FILES_SUCCESS_MESSAGE,
           }),
@@ -484,7 +498,7 @@ describe('PackagesApp', () => {
 
           await doDeleteFiles();
 
-          expect(createFlash).toHaveBeenCalledWith(
+          expect(createAlert).toHaveBeenCalledWith(
             expect.objectContaining({
               message: DELETE_PACKAGE_FILES_ERROR_MESSAGE,
             }),
@@ -501,7 +515,7 @@ describe('PackagesApp', () => {
 
           await doDeleteFiles();
 
-          expect(createFlash).toHaveBeenCalledWith(
+          expect(createAlert).toHaveBeenCalledWith(
             expect.objectContaining({
               message: DELETE_PACKAGE_FILES_ERROR_MESSAGE,
             }),
@@ -533,6 +547,12 @@ describe('PackagesApp', () => {
         findPackageFiles().vm.$emit('delete-files', packageFiles());
 
         expect(showDeletePackageSpy).toHaveBeenCalled();
+
+        await waitForPromises();
+
+        expect(findDeleteModal().find('p').text()).toBe(
+          'Deleting all package assets will remove version 1.0.0 of @gitlab-org/package-15. Are you sure?',
+        );
       });
     });
   });
-- 
cgit v1.2.1