Add latest changes from gitlab-org/gitlab@master

2 files changed, 59 insertions, 1 deletions

diff --git a/spec/frontend/runner/components/helpers/masked_value_spec.js b/spec/frontend/runner/components/helpers/masked_value_spec.js
new file mode 100644
index 00000000000..f87315057ec
--- /dev/null
+++ b/spec/frontend/runner/components/helpers/masked_value_spec.js
@@ -0,0 +1,51 @@
+import { GlButton } from '@gitlab/ui';
+import { shallowMount } from '@vue/test-utils';
+import MaskedValue from '~/runner/components/helpers/masked_value.vue';
+
+const mockSecret = '01234567890';
+const mockMasked = '***********';
+
+describe('MaskedValue', () => {
+  let wrapper;
+
+  const findButton = () => wrapper.findComponent(GlButton);
+
+  const createComponent = ({ props = {} } = {}) => {
+    wrapper = shallowMount(MaskedValue, {
+      propsData: {
+        value: mockSecret,
+        ...props,
+      },
+    });
+  };
+
+  beforeEach(() => {
+    createComponent();
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  it('Displays masked value by default', () => {
+    expect(wrapper.text()).toBe(mockMasked);
+  });
+
+  describe('When the icon is clicked', () => {
+    beforeEach(() => {
+      findButton().vm.$emit('click');
+    });
+
+    it('Displays the actual value', () => {
+      expect(wrapper.text()).toBe(mockSecret);
+      expect(wrapper.text()).not.toBe(mockMasked);
+    });
+
+    it('When user clicks again, displays masked value', async () => {
+      await findButton().vm.$emit('click');
+
+      expect(wrapper.text()).toBe(mockMasked);
+      expect(wrapper.text()).not.toBe(mockSecret);
+    });
+  });
+});
diff --git a/spec/frontend/runner/components/runner_manual_setup_help_spec.js b/spec/frontend/runner/components/runner_manual_setup_help_spec.js
index add595d784e..effef0e7ebf 100644
--- a/spec/frontend/runner/components/runner_manual_setup_help_spec.js
+++ b/spec/frontend/runner/components/runner_manual_setup_help_spec.js
@@ -3,6 +3,7 @@ import { shallowMount } from '@vue/test-utils';
 import { nextTick } from 'vue';
 import { TEST_HOST } from 'helpers/test_constants';
 import { extendedWrapper } from 'helpers/vue_test_utils_helper';
+import MaskedValue from '~/runner/components/helpers/masked_value.vue';
 import RunnerManualSetupHelp from '~/runner/components/runner_manual_setup_help.vue';
 import RunnerRegistrationTokenReset from '~/runner/components/runner_registration_token_reset.vue';
 import { INSTANCE_TYPE, GROUP_TYPE, PROJECT_TYPE } from '~/runner/constants';
@@ -37,6 +38,7 @@ describe('RunnerManualSetupHelp', () => {
           ...props,
         },
         stubs: {
+          MaskedValue,
           GlSprintf,
         },
       }),
@@ -93,7 +95,11 @@ describe('RunnerManualSetupHelp', () => {
     expect(findRunnerInstructions().exists()).toBe(true);
   });
 
-  it('Displays the registration token', () => {
+  it('Displays the registration token', async () => {
+    findRegistrationToken().find('[data-testid="toggle-masked"]').vm.$emit('click');
+
+    await nextTick();
+
     expect(findRegistrationToken().text()).toBe(mockRegistrationToken);
     expect(findClipboardButtons().at(1).props('text')).toBe(mockRegistrationToken);
   });
@@ -105,6 +111,7 @@ describe('RunnerManualSetupHelp', () => {
   it('Replaces the runner reset button', async () => {
     const mockNewRegistrationToken = 'NEW_MOCK_REGISTRATION_TOKEN';
 
+    findRegistrationToken().find('[data-testid="toggle-masked"]').vm.$emit('click');
     findRunnerRegistrationTokenReset().vm.$emit('tokenReset', mockNewRegistrationToken);
 
     await nextTick();