Add latest changes from gitlab-org/gitlab@master

2 files changed, 27 insertions, 49 deletions

diff --git a/spec/frontend/registry/list/components/collapsible_container_spec.js b/spec/frontend/registry/list/components/collapsible_container_spec.js
index 1f7d48e6e2c..cba49e72588 100644
--- a/spec/frontend/registry/list/components/collapsible_container_spec.js
+++ b/spec/frontend/registry/list/components/collapsible_container_spec.js
@@ -140,43 +140,33 @@ describe('collapsible registry container', () => {
   });
 
   describe('tracking', () => {
-    const category = 'mock_page';
+    const testTrackingCall = action => {
+      expect(Tracking.event).toHaveBeenCalledWith(undefined, action, {
+        label: 'registry_repository_delete',
+      });
+    };
+
     beforeEach(() => {
       jest.spyOn(Tracking, 'event');
       wrapper.vm.deleteItem = jest.fn().mockResolvedValue();
       wrapper.vm.fetchRepos = jest.fn();
-      wrapper.setData({
-        tracking: {
-          ...wrapper.vm.tracking,
-          category,
-        },
-      });
     });
 
     it('send an event when delete button is clicked', () => {
       const deleteBtn = findDeleteBtn();
       deleteBtn.trigger('click');
-      expect(Tracking.event).toHaveBeenCalledWith(category, 'click_button', {
-        label: 'registry_repository_delete',
-        category,
-      });
+      testTrackingCall('click_button');
     });
     it('send an event when cancel is pressed on modal', () => {
       const deleteModal = findDeleteModal();
       deleteModal.vm.$emit('cancel');
-      expect(Tracking.event).toHaveBeenCalledWith(category, 'cancel_delete', {
-        label: 'registry_repository_delete',
-        category,
-      });
+      testTrackingCall('cancel_delete');
     });
     it('send an event when confirm is clicked on modal', () => {
       const deleteModal = findDeleteModal();
       deleteModal.vm.$emit('ok');
 
-      expect(Tracking.event).toHaveBeenCalledWith(category, 'confirm_delete', {
-        label: 'registry_repository_delete',
-        category,
-      });
+      testTrackingCall('confirm_delete');
     });
   });
 });
diff --git a/spec/frontend/registry/list/components/table_registry_spec.js b/spec/frontend/registry/list/components/table_registry_spec.js
index 51fd9612758..1d31381c85b 100644
--- a/spec/frontend/registry/list/components/table_registry_spec.js
+++ b/spec/frontend/registry/list/components/table_registry_spec.js
@@ -304,17 +304,14 @@ describe('table registry', () => {
   });
 
   describe('event tracking', () => {
-    const mockPageName = 'mock_page';
+    const testTrackingCall = (action, label = 'registry_tag_delete') => {
+      expect(Tracking.event).toHaveBeenCalledWith(undefined, action, { label, property: 'foo' });
+    };
 
     beforeEach(() => {
       jest.spyOn(Tracking, 'event');
       wrapper.vm.handleSingleDelete = jest.fn();
       wrapper.vm.handleMultipleDelete = jest.fn();
-      document.body.dataset.page = mockPageName;
-    });
-
-    afterEach(() => {
-      document.body.dataset.page = null;
     });
 
     describe('single tag delete', () => {
@@ -325,29 +322,25 @@ describe('table registry', () => {
       it('send an event when delete button is clicked', () => {
         const deleteBtn = findDeleteButtonsRow();
         deleteBtn.at(0).trigger('click');
-        expect(Tracking.event).toHaveBeenCalledWith(mockPageName, 'click_button', {
-          label: 'registry_tag_delete',
-          property: 'foo',
-        });
+
+        testTrackingCall('click_button');
       });
+
       it('send an event when cancel is pressed on modal', () => {
         const deleteModal = findDeleteModal();
         deleteModal.vm.$emit('cancel');
-        expect(Tracking.event).toHaveBeenCalledWith(mockPageName, 'cancel_delete', {
-          label: 'registry_tag_delete',
-          property: 'foo',
-        });
+
+        testTrackingCall('cancel_delete');
       });
+
       it('send an event when confirm is clicked on modal', () => {
         const deleteModal = findDeleteModal();
         deleteModal.vm.$emit('ok');
 
-        expect(Tracking.event).toHaveBeenCalledWith(mockPageName, 'confirm_delete', {
-          label: 'registry_tag_delete',
-          property: 'foo',
-        });
+        testTrackingCall('confirm_delete');
       });
     });
+
     describe('bulk tag delete', () => {
       beforeEach(() => {
         const items = [0, 1, 2];
@@ -357,27 +350,22 @@ describe('table registry', () => {
       it('send an event when delete button is clicked', () => {
         const deleteBtn = findDeleteButton();
         deleteBtn.vm.$emit('click');
-        expect(Tracking.event).toHaveBeenCalledWith(mockPageName, 'click_button', {
-          label: 'bulk_registry_tag_delete',
-          property: 'foo',
-        });
+
+        testTrackingCall('click_button', 'bulk_registry_tag_delete');
       });
+
       it('send an event when cancel is pressed on modal', () => {
         const deleteModal = findDeleteModal();
         deleteModal.vm.$emit('cancel');
-        expect(Tracking.event).toHaveBeenCalledWith(mockPageName, 'cancel_delete', {
-          label: 'bulk_registry_tag_delete',
-          property: 'foo',
-        });
+
+        testTrackingCall('cancel_delete', 'bulk_registry_tag_delete');
       });
+
       it('send an event when confirm is clicked on modal', () => {
         const deleteModal = findDeleteModal();
         deleteModal.vm.$emit('ok');
 
-        expect(Tracking.event).toHaveBeenCalledWith(mockPageName, 'confirm_delete', {
-          label: 'bulk_registry_tag_delete',
-          property: 'foo',
-        });
+        testTrackingCall('confirm_delete', 'bulk_registry_tag_delete');
       });
     });
   });