Add latest changes from gitlab-org/gitlab@master

2 files changed, 122 insertions, 1 deletions

diff --git a/spec/frontend/lib/utils/chart_utils_spec.js b/spec/frontend/lib/utils/chart_utils_spec.js
index 65bb68c5017..3b34b0ef672 100644
--- a/spec/frontend/lib/utils/chart_utils_spec.js
+++ b/spec/frontend/lib/utils/chart_utils_spec.js
@@ -1,4 +1,8 @@
-import { firstAndLastY } from '~/lib/utils/chart_utils';
+import { firstAndLastY, getToolboxOptions } from '~/lib/utils/chart_utils';
+import { __ } from '~/locale';
+import * as iconUtils from '~/lib/utils/icon_utils';
+
+jest.mock('~/lib/utils/icon_utils');
 
 describe('Chart utils', () => {
   describe('firstAndLastY', () => {
@@ -12,4 +16,53 @@ describe('Chart utils', () => {
       expect(firstAndLastY(data)).toEqual([1, 3]);
     });
   });
+
+  describe('getToolboxOptions', () => {
+    describe('when icons are successfully fetched', () => {
+      beforeEach(() => {
+        iconUtils.getSvgIconPathContent.mockImplementation((name) =>
+          Promise.resolve(`${name}-svg-path-mock`),
+        );
+      });
+
+      it('returns toolbox config', async () => {
+        await expect(getToolboxOptions()).resolves.toEqual({
+          toolbox: {
+            feature: {
+              dataZoom: {
+                icon: {
+                  zoom: 'path://marquee-selection-svg-path-mock',
+                  back: 'path://redo-svg-path-mock',
+                },
+              },
+              restore: {
+                icon: 'path://repeat-svg-path-mock',
+              },
+              saveAsImage: {
+                icon: 'path://download-svg-path-mock',
+              },
+            },
+          },
+        });
+      });
+    });
+
+    describe('when icons are not successfully fetched', () => {
+      const error = new Error();
+
+      beforeEach(() => {
+        iconUtils.getSvgIconPathContent.mockRejectedValue(error);
+        jest.spyOn(console, 'warn').mockImplementation();
+      });
+
+      it('returns empty object and calls `console.warn`', async () => {
+        await expect(getToolboxOptions()).resolves.toEqual({});
+        // eslint-disable-next-line no-console
+        expect(console.warn).toHaveBeenCalledWith(
+          __('SVG could not be rendered correctly: '),
+          error,
+        );
+      });
+    });
+  });
 });
diff --git a/spec/frontend/lib/utils/secret_detection_spec.js b/spec/frontend/lib/utils/secret_detection_spec.js
new file mode 100644
index 00000000000..7bde6cc4a8e
--- /dev/null
+++ b/spec/frontend/lib/utils/secret_detection_spec.js
@@ -0,0 +1,68 @@
+import { containsSensitiveToken, confirmSensitiveAction, i18n } from '~/lib/utils/secret_detection';
+import { confirmAction } from '~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal';
+
+jest.mock('~/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal');
+
+const mockConfirmAction = ({ confirmed }) => {
+  confirmAction.mockResolvedValueOnce(confirmed);
+};
+
+describe('containsSensitiveToken', () => {
+  describe('when message does not contain sensitive tokens', () => {
+    const nonSensitiveMessages = [
+      'This is a normal message',
+      '1234567890',
+      '!@#$%^&*()_+',
+      'https://example.com',
+    ];
+
+    it.each(nonSensitiveMessages)('returns false for message: %s', (message) => {
+      expect(containsSensitiveToken(message)).toBe(false);
+    });
+  });
+
+  describe('when message contains sensitive tokens', () => {
+    const sensitiveMessages = [
+      'token: glpat-cgyKc1k_AsnEpmP-5fRL',
+      'token: GlPat-abcdefghijklmnopqrstuvwxyz',
+      'token: feed_token=ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+      'https://example.com/feed?feed_token=123456789_abcdefghij',
+      'glpat-1234567890 and feed_token=ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+    ];
+
+    it.each(sensitiveMessages)('returns true for message: %s', (message) => {
+      expect(containsSensitiveToken(message)).toBe(true);
+    });
+  });
+});
+
+describe('confirmSensitiveAction', () => {
+  afterEach(() => {
+    confirmAction.mockReset();
+  });
+
+  it('should call confirmAction with correct parameters', async () => {
+    const prompt = 'Are you sure you want to delete this item?';
+    const expectedParams = {
+      primaryBtnVariant: 'danger',
+      primaryBtnText: i18n.primaryBtnText,
+    };
+    await confirmSensitiveAction(prompt);
+
+    expect(confirmAction).toHaveBeenCalledWith(prompt, expectedParams);
+  });
+
+  it('should return true when confirmed is true', async () => {
+    mockConfirmAction({ confirmed: true });
+
+    const result = await confirmSensitiveAction();
+    expect(result).toBe(true);
+  });
+
+  it('should return false when confirmed is false', async () => {
+    mockConfirmAction({ confirmed: false });
+
+    const result = await confirmSensitiveAction();
+    expect(result).toBe(false);
+  });
+});