Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

1 files changed, 30 insertions, 0 deletions

diff --git a/spec/frontend/constants_spec.js b/spec/frontend/constants_spec.js
new file mode 100644
index 00000000000..b596b62f72c
--- /dev/null
+++ b/spec/frontend/constants_spec.js
@@ -0,0 +1,30 @@
+import * as constants from '~/constants';
+
+describe('Global JS constants', () => {
+  describe('getModifierKey()', () => {
+    afterEach(() => {
+      delete window.gl;
+    });
+
+    it.each`
+      isMac    | removeSuffix | expectedKey
+      ${true}  | ${false}     | ${'⌘'}
+      ${false} | ${false}     | ${'Ctrl+'}
+      ${true}  | ${true}      | ${'⌘'}
+      ${false} | ${true}      | ${'Ctrl'}
+    `(
+      'returns correct keystroke when isMac=$isMac and removeSuffix=$removeSuffix',
+      ({ isMac, removeSuffix, expectedKey }) => {
+        Object.assign(window, {
+          gl: {
+            client: {
+              isMac,
+            },
+          },
+        });
+
+        expect(constants.getModifierKey(removeSuffix)).toBe(expectedKey);
+      },
+    );
+  });
+});