Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 323 deletions

diff --git a/spec/frontend/ci_variable_list/ci_variable_list/ajax_variable_list_spec.js b/spec/frontend/ci_variable_list/ci_variable_list/ajax_variable_list_spec.js
deleted file mode 100644
index 93b185bd242..00000000000
--- a/spec/frontend/ci_variable_list/ci_variable_list/ajax_variable_list_spec.js
+++ /dev/null
@@ -1,203 +0,0 @@
-import $ from 'jquery';
-import MockAdapter from 'axios-mock-adapter';
-import axios from '~/lib/utils/axios_utils';
-import AjaxFormVariableList from '~/ci_variable_list/ajax_variable_list';
-
-const VARIABLE_PATCH_ENDPOINT = 'http://test.host/frontend-fixtures/builds-project/-/variables';
-const HIDE_CLASS = 'hide';
-
-describe('AjaxFormVariableList', () => {
-  preloadFixtures('projects/ci_cd_settings.html');
-  preloadFixtures('projects/ci_cd_settings_with_variables.html');
-
-  let container;
-  let saveButton;
-  let errorBox;
-
-  let mock;
-  let ajaxVariableList;
-
-  beforeEach(() => {
-    loadFixtures('projects/ci_cd_settings.html');
-    container = document.querySelector('.js-ci-variable-list-section');
-
-    mock = new MockAdapter(axios);
-
-    const ajaxVariableListEl = document.querySelector('.js-ci-variable-list-section');
-    saveButton = ajaxVariableListEl.querySelector('.js-ci-variables-save-button');
-    errorBox = container.querySelector('.js-ci-variable-error-box');
-    ajaxVariableList = new AjaxFormVariableList({
-      container,
-      formField: 'variables',
-      saveButton,
-      errorBox,
-      saveEndpoint: container.dataset.saveEndpoint,
-      maskableRegex: container.dataset.maskableRegex,
-    });
-
-    jest.spyOn(ajaxVariableList, 'updateRowsWithPersistedVariables');
-    jest.spyOn(ajaxVariableList.variableList, 'toggleEnableRow');
-  });
-
-  afterEach(() => {
-    mock.restore();
-  });
-
-  describe('onSaveClicked', () => {
-    it('shows loading spinner while waiting for the request', () => {
-      const loadingIcon = saveButton.querySelector('.js-ci-variables-save-loading-icon');
-
-      mock.onPatch(VARIABLE_PATCH_ENDPOINT).reply(() => {
-        expect(loadingIcon.classList.contains(HIDE_CLASS)).toEqual(false);
-
-        return [200, {}];
-      });
-
-      expect(loadingIcon.classList.contains(HIDE_CLASS)).toEqual(true);
-
-      return ajaxVariableList.onSaveClicked().then(() => {
-        expect(loadingIcon.classList.contains(HIDE_CLASS)).toEqual(true);
-      });
-    });
-
-    it('calls `updateRowsWithPersistedVariables` with the persisted variables', () => {
-      const variablesResponse = [{ id: 1, key: 'foo', value: 'bar' }];
-      mock.onPatch(VARIABLE_PATCH_ENDPOINT).reply(200, {
-        variables: variablesResponse,
-      });
-
-      return ajaxVariableList.onSaveClicked().then(() => {
-        expect(ajaxVariableList.updateRowsWithPersistedVariables).toHaveBeenCalledWith(
-          variablesResponse,
-        );
-      });
-    });
-
-    it('hides any previous error box', () => {
-      mock.onPatch(VARIABLE_PATCH_ENDPOINT).reply(200);
-
-      expect(errorBox.classList.contains(HIDE_CLASS)).toEqual(true);
-
-      return ajaxVariableList.onSaveClicked().then(() => {
-        expect(errorBox.classList.contains(HIDE_CLASS)).toEqual(true);
-      });
-    });
-
-    it('disables remove buttons while waiting for the request', () => {
-      mock.onPatch(VARIABLE_PATCH_ENDPOINT).reply(() => {
-        expect(ajaxVariableList.variableList.toggleEnableRow).toHaveBeenCalledWith(false);
-
-        return [200, {}];
-      });
-
-      return ajaxVariableList.onSaveClicked().then(() => {
-        expect(ajaxVariableList.variableList.toggleEnableRow).toHaveBeenCalledWith(true);
-      });
-    });
-
-    it('hides secret values', () => {
-      mock.onPatch(VARIABLE_PATCH_ENDPOINT).reply(200, {});
-
-      const row = container.querySelector('.js-row');
-      const valueInput = row.querySelector('.js-ci-variable-input-value');
-      const valuePlaceholder = row.querySelector('.js-secret-value-placeholder');
-
-      valueInput.value = 'bar';
-      $(valueInput).trigger('input');
-
-      expect(valuePlaceholder.classList.contains(HIDE_CLASS)).toBe(true);
-      expect(valueInput.classList.contains(HIDE_CLASS)).toBe(false);
-
-      return ajaxVariableList.onSaveClicked().then(() => {
-        expect(valuePlaceholder.classList.contains(HIDE_CLASS)).toBe(false);
-        expect(valueInput.classList.contains(HIDE_CLASS)).toBe(true);
-      });
-    });
-
-    it('shows error box with validation errors', () => {
-      const validationError = 'some validation error';
-      mock.onPatch(VARIABLE_PATCH_ENDPOINT).reply(400, [validationError]);
-
-      expect(errorBox.classList.contains(HIDE_CLASS)).toEqual(true);
-
-      return ajaxVariableList.onSaveClicked().then(() => {
-        expect(errorBox.classList.contains(HIDE_CLASS)).toEqual(false);
-        expect(errorBox.textContent.trim().replace(/\n+\s+/m, ' ')).toEqual(
-          `Validation failed ${validationError}`,
-        );
-      });
-    });
-
-    it('shows flash message when request fails', () => {
-      mock.onPatch(VARIABLE_PATCH_ENDPOINT).reply(500);
-
-      expect(errorBox.classList.contains(HIDE_CLASS)).toEqual(true);
-
-      return ajaxVariableList.onSaveClicked().then(() => {
-        expect(errorBox.classList.contains(HIDE_CLASS)).toEqual(true);
-      });
-    });
-  });
-
-  describe('updateRowsWithPersistedVariables', () => {
-    beforeEach(() => {
-      loadFixtures('projects/ci_cd_settings_with_variables.html');
-      container = document.querySelector('.js-ci-variable-list-section');
-
-      const ajaxVariableListEl = document.querySelector('.js-ci-variable-list-section');
-      saveButton = ajaxVariableListEl.querySelector('.js-ci-variables-save-button');
-      errorBox = container.querySelector('.js-ci-variable-error-box');
-      ajaxVariableList = new AjaxFormVariableList({
-        container,
-        formField: 'variables',
-        saveButton,
-        errorBox,
-        saveEndpoint: container.dataset.saveEndpoint,
-      });
-    });
-
-    it('removes variable that was removed', () => {
-      expect(container.querySelectorAll('.js-row').length).toBe(3);
-
-      container.querySelector('.js-row-remove-button').click();
-
-      expect(container.querySelectorAll('.js-row').length).toBe(3);
-
-      ajaxVariableList.updateRowsWithPersistedVariables([]);
-
-      expect(container.querySelectorAll('.js-row').length).toBe(2);
-    });
-
-    it('updates new variable row with persisted ID', () => {
-      const row = container.querySelector('.js-row:last-child');
-      const idInput = row.querySelector('.js-ci-variable-input-id');
-      const keyInput = row.querySelector('.js-ci-variable-input-key');
-      const valueInput = row.querySelector('.js-ci-variable-input-value');
-
-      keyInput.value = 'foo';
-      $(keyInput).trigger('input');
-      valueInput.value = 'bar';
-      $(valueInput).trigger('input');
-
-      expect(idInput.value).toEqual('');
-
-      ajaxVariableList.updateRowsWithPersistedVariables([
-        {
-          id: 3,
-          key: 'foo',
-          value: 'bar',
-        },
-      ]);
-
-      expect(idInput.value).toEqual('3');
-      expect(row.dataset.isPersisted).toEqual('true');
-    });
-  });
-
-  describe('maskableRegex', () => {
-    it('takes in the regex provided by the data attribute', () => {
-      expect(container.dataset.maskableRegex).toBe('^[a-zA-Z0-9_+=/@:.-]{8,}$');
-      expect(ajaxVariableList.maskableRegex).toBe(container.dataset.maskableRegex);
-    });
-  });
-});
diff --git a/spec/frontend/ci_variable_list/ci_variable_list/ci_variable_list_spec.js b/spec/frontend/ci_variable_list/ci_variable_list/ci_variable_list_spec.js
index 9508203e5c2..4a2e56c570d 100644
--- a/spec/frontend/ci_variable_list/ci_variable_list/ci_variable_list_spec.js
+++ b/spec/frontend/ci_variable_list/ci_variable_list/ci_variable_list_spec.js
@@ -1,5 +1,4 @@
 import $ from 'jquery';
-import waitForPromises from 'helpers/wait_for_promises';
 import VariableList from '~/ci_variable_list/ci_variable_list';
 
 const HIDE_CLASS = 'hide';
@@ -7,7 +6,6 @@ const HIDE_CLASS = 'hide';
 describe('VariableList', () => {
   preloadFixtures('pipeline_schedules/edit.html');
   preloadFixtures('pipeline_schedules/edit_with_variables.html');
-  preloadFixtures('projects/ci_cd_settings.html');
 
   let $wrapper;
   let variableList;
@@ -113,92 +111,6 @@ describe('VariableList', () => {
     });
   });
 
-  describe('with all inputs(key, value, protected)', () => {
-    beforeEach(() => {
-      loadFixtures('projects/ci_cd_settings.html');
-      $wrapper = $('.js-ci-variable-list-section');
-
-      $wrapper.find('.js-ci-variable-input-protected').attr('data-default', 'false');
-
-      variableList = new VariableList({
-        container: $wrapper,
-        formField: 'variables',
-      });
-      variableList.init();
-    });
-
-    it('should not add another row when editing the last rows protected checkbox', () => {
-      const $row = $wrapper.find('.js-row:last-child');
-      $row.find('.ci-variable-protected-item .js-project-feature-toggle').click();
-
-      return waitForPromises().then(() => {
-        expect($wrapper.find('.js-row').length).toBe(1);
-      });
-    });
-
-    it('should not add another row when editing the last rows masked checkbox', () => {
-      jest.spyOn(variableList, 'checkIfRowTouched');
-      const $row = $wrapper.find('.js-row:last-child');
-      $row.find('.ci-variable-masked-item .js-project-feature-toggle').click();
-
-      return waitForPromises().then(() => {
-        // This validates that we are checking after the event listener has run
-        expect(variableList.checkIfRowTouched).toHaveBeenCalled();
-        expect($wrapper.find('.js-row').length).toBe(1);
-      });
-    });
-
-    describe('validateMaskability', () => {
-      let $row;
-
-      const maskingErrorElement = '.js-row:last-child .masking-validation-error';
-      const clickToggle = () =>
-        $row.find('.ci-variable-masked-item .js-project-feature-toggle').click();
-
-      beforeEach(() => {
-        $row = $wrapper.find('.js-row:last-child');
-      });
-
-      it('has a regex provided via a data attribute', () => {
-        clickToggle();
-
-        expect($wrapper.attr('data-maskable-regex')).toBe('^[a-zA-Z0-9_+=/@:.-]{8,}$');
-      });
-
-      it('allows values that are 8 characters long', () => {
-        $row.find('.js-ci-variable-input-value').val('looooong');
-
-        clickToggle();
-
-        expect($wrapper.find(maskingErrorElement)).toHaveClass('hide');
-      });
-
-      it('rejects values that are shorter than 8 characters', () => {
-        $row.find('.js-ci-variable-input-value').val('short');
-
-        clickToggle();
-
-        expect($wrapper.find(maskingErrorElement)).toBeVisible();
-      });
-
-      it('allows values with base 64 characters', () => {
-        $row.find('.js-ci-variable-input-value').val('abcABC123_+=/-');
-
-        clickToggle();
-
-        expect($wrapper.find(maskingErrorElement)).toHaveClass('hide');
-      });
-
-      it('rejects values with other special characters', () => {
-        $row.find('.js-ci-variable-input-value').val('1234567$');
-
-        clickToggle();
-
-        expect($wrapper.find(maskingErrorElement)).toBeVisible();
-      });
-    });
-  });
-
   describe('toggleEnableRow method', () => {
     beforeEach(() => {
       loadFixtures('pipeline_schedules/edit_with_variables.html');
@@ -247,36 +159,4 @@ describe('VariableList', () => {
       expect($wrapper.find('.js-ci-variable-input-key:not([disabled])').length).toBe(3);
     });
   });
-
-  describe('hideValues', () => {
-    beforeEach(() => {
-      loadFixtures('projects/ci_cd_settings.html');
-      $wrapper = $('.js-ci-variable-list-section');
-
-      variableList = new VariableList({
-        container: $wrapper,
-        formField: 'variables',
-      });
-      variableList.init();
-    });
-
-    it('should hide value input and show placeholder stars', () => {
-      const $row = $wrapper.find('.js-row');
-      const $inputValue = $row.find('.js-ci-variable-input-value');
-      const $placeholder = $row.find('.js-secret-value-placeholder');
-
-      $row
-        .find('.js-ci-variable-input-value')
-        .val('foo')
-        .trigger('input');
-
-      expect($placeholder.hasClass(HIDE_CLASS)).toBe(true);
-      expect($inputValue.hasClass(HIDE_CLASS)).toBe(false);
-
-      variableList.hideValues();
-
-      expect($placeholder.hasClass(HIDE_CLASS)).toBe(false);
-      expect($inputValue.hasClass(HIDE_CLASS)).toBe(true);
-    });
-  });
 });