Add latest changes from gitlab-org/gitlab@12-10-stable-ee

2 files changed, 31 insertions, 20 deletions

diff --git a/spec/frontend/registry/explorer/stores/actions_spec.js b/spec/frontend/registry/explorer/stores/actions_spec.js
index b39c79dd1ab..58f61a0e8c2 100644
--- a/spec/frontend/registry/explorer/stores/actions_spec.js
+++ b/spec/frontend/registry/explorer/stores/actions_spec.js
@@ -279,39 +279,32 @@ describe('Actions RegistryExplorer Store', () => {
   });
 
   describe('request delete single image', () => {
-    const deletePath = 'delete/path';
+    const image = {
+      destroy_path: 'delete/path',
+    };
+
     it('successfully performs the delete request', done => {
-      mock.onDelete(deletePath).replyOnce(200);
+      mock.onDelete(image.destroy_path).replyOnce(200);
 
       testAction(
         actions.requestDeleteImage,
-        deletePath,
-        {
-          pagination: {},
-        },
+        image,
+        {},
         [
           { type: types.SET_MAIN_LOADING, payload: true },
+          { type: types.UPDATE_IMAGE, payload: { ...image, deleting: true } },
           { type: types.SET_MAIN_LOADING, payload: false },
         ],
-        [
-          {
-            type: 'setShowGarbageCollectionTip',
-            payload: true,
-          },
-          {
-            type: 'requestImagesList',
-            payload: { pagination: {} },
-          },
-        ],
+        [],
         done,
       );
     });
 
     it('should turn off loading on error', done => {
-      mock.onDelete(deletePath).replyOnce(400);
+      mock.onDelete(image.destroy_path).replyOnce(400);
       testAction(
         actions.requestDeleteImage,
-        deletePath,
+        image,
         {},
         [
           { type: types.SET_MAIN_LOADING, payload: true },
diff --git a/spec/frontend/registry/explorer/stores/mutations_spec.js b/spec/frontend/registry/explorer/stores/mutations_spec.js
index 029fd23f7ce..43b2ba84218 100644
--- a/spec/frontend/registry/explorer/stores/mutations_spec.js
+++ b/spec/frontend/registry/explorer/stores/mutations_spec.js
@@ -28,14 +28,32 @@ describe('Mutations Registry Explorer Store', () => {
 
   describe('SET_IMAGES_LIST_SUCCESS', () => {
     it('should set the images list', () => {
-      const images = [1, 2, 3];
-      const expectedState = { ...mockState, images };
+      const images = [{ name: 'foo' }, { name: 'bar' }];
+      const defaultStatus = { deleting: false, failedDelete: false };
+      const expectedState = {
+        ...mockState,
+        images: [{ name: 'foo', ...defaultStatus }, { name: 'bar', ...defaultStatus }],
+      };
       mutations[types.SET_IMAGES_LIST_SUCCESS](mockState, images);
 
       expect(mockState).toEqual(expectedState);
     });
   });
 
+  describe('UPDATE_IMAGE', () => {
+    it('should update an image', () => {
+      mockState.images = [{ id: 1, name: 'foo' }, { id: 2, name: 'bar' }];
+      const payload = { id: 1, name: 'baz' };
+      const expectedState = {
+        ...mockState,
+        images: [payload, { id: 2, name: 'bar' }],
+      };
+      mutations[types.UPDATE_IMAGE](mockState, payload);
+
+      expect(mockState).toEqual(expectedState);
+    });
+  });
+
   describe('SET_TAGS_LIST_SUCCESS', () => {
     it('should set the tags list', () => {
       const tags = [1, 2, 3];