Skip to content

G
gitlab-ce
Commit eca2ef23 authored by Mark Florian's avatar Mark Florian
Browse files
Options

Merge branch 'jivanvl-remove-ci-variables-table-feature-flag' into 'master' 

Remove new_ci_variables_list feature flag

See merge request gitlab-org/gitlab!41412
parents 29280bee b26853f6
Hide whitespace changes
Inline Side-by-side
Showing with 217 additions and 937 deletions
app/assets/javascripts/ci_variable_list/ajax_variable_list.js deleted 100644 → 0
View file @ 29280bee
import { escape } from 'lodash';
import axios from '../lib/utils/axios_utils';
import { s__ } from '../locale';
import { deprecatedCreateFlash as Flash } from '../flash';
import { parseBoolean } from '../lib/utils/common_utils';
import statusCodes from '../lib/utils/http_status';
import VariableList from './ci_variable_list';
function generateErrorBoxContent(errors) {
const errorList = [].concat(errors).map(
errorString => `
<li>
${escape(errorString)}
</li>
`,
);
return `
<p>
${s__('CiVariable|Validation failed')}
</p>
<ul>
${errorList.join('')}
</ul>
`;
}
// Used for the variable list on CI/CD projects/groups settings page
export default class AjaxVariableList {
constructor({
container,
saveButton,
errorBox,
formField = 'variables',
saveEndpoint,
maskableRegex,
}) {
this.container = container;
this.saveButton = saveButton;
this.errorBox = errorBox;
this.saveEndpoint = saveEndpoint;
this.maskableRegex = maskableRegex;
this.variableList = new VariableList({
container: this.container,
formField,
maskableRegex,
});
this.bindEvents();
this.variableList.init();
}
bindEvents() {
this.saveButton.addEventListener('click', this.onSaveClicked.bind(this));
}
onSaveClicked() {
const loadingIcon = this.saveButton.querySelector('.js-ci-variables-save-loading-icon');
loadingIcon.classList.toggle('hide', false);
this.errorBox.classList.toggle('hide', true);
// We use this to prevent a user from changing a key before we have a chance
// to match it up in `updateRowsWithPersistedVariables`
this.variableList.toggleEnableRow(false);
return axios
.patch(
this.saveEndpoint,
{
variables_attributes: this.variableList.getAllData(),
},
{
// We want to be able to process the `res.data` from a 400 error response
// and print the validation messages such as duplicate variable keys
validateStatus: status =>
(status >= statusCodes.OK && status < statusCodes.MULTIPLE_CHOICES) ||
status === statusCodes.BAD_REQUEST,
},
)
.then(res => {
loadingIcon.classList.toggle('hide', true);
this.variableList.toggleEnableRow(true);
if (res.status === statusCodes.OK && res.data) {
this.updateRowsWithPersistedVariables(res.data.variables);
this.variableList.hideValues();
} else if (res.status === statusCodes.BAD_REQUEST) {
// Validation failed
this.errorBox.innerHTML = generateErrorBoxContent(res.data);
this.errorBox.classList.toggle('hide', false);
}
})
.catch(() => {
loadingIcon.classList.toggle('hide', true);
this.variableList.toggleEnableRow(true);
Flash(s__('CiVariable|Error occurred while saving variables'));
});
}
updateRowsWithPersistedVariables(persistedVariables = []) {
const persistedVariableMap = [].concat(persistedVariables).reduce(
(variableMap, variable) => ({
...variableMap,
[variable.key]: variable,
}),
{},
);
this.container.querySelectorAll('.js-row').forEach(row => {
// If we submitted a row that was destroyed, remove it so we don't try
// to destroy it again which would cause a BE error
const destroyInput = row.querySelector('.js-ci-variable-input-destroy');
if (parseBoolean(destroyInput.value)) {
row.remove();
// Update the ID input so any future edits and `_destroy` will apply on the BE
} else {
const key = row.querySelector('.js-ci-variable-input-key').value;
const persistedVariable = persistedVariableMap[key];
if (persistedVariable) {
// eslint-disable-next-line no-param-reassign
row.querySelector('.js-ci-variable-input-id').value = persistedVariable.id;
row.setAttribute('data-is-persisted', 'true');
}
}
});
}
}
app/assets/javascripts/ci_variable_list/components/ci_environments_dropdown.vue
View file @ eca2ef23
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
</script> </script>
<template> <template>
<gl-dropdown :text="value"> <gl-dropdown :text="value">
<gl-search-box-by-type v-model.trim="searchTerm" /> <gl-search-box-by-type v-model.trim="searchTerm" data-testid="ci-environment-search" />
<gl-dropdown-item <gl-dropdown-item
v-for="environment in filteredResults" v-for="environment in filteredResults"
:key="environment" :key="environment"
...@@ -75,7 +75,7 @@ export default { ...@@ -75,7 +75,7 @@ export default {
}}</gl-dropdown-item> }}</gl-dropdown-item>
<template v-if="shouldRenderCreateButton"> <template v-if="shouldRenderCreateButton">
<gl-dropdown-divider /> <gl-dropdown-divider />
<gl-dropdown-item @click="createClicked"> <gl-dropdown-item data-testid="create-wildcard-button" @click="createClicked">
{{ composedCreateButtonLabel }} {{ composedCreateButtonLabel }}
</gl-dropdown-item> </gl-dropdown-item>
</template> </template>
......
app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue
View file @ eca2ef23
...@@ -236,6 +236,7 @@ export default { ...@@ -236,6 +236,7 @@ export default {
:label="__('Environment scope')" :label="__('Environment scope')"
label-for="ci-variable-env" label-for="ci-variable-env"
class="w-50" class="w-50"
data-testid="environment-scope"
> >
<ci-environments-dropdown <ci-environments-dropdown
class="w-100" class="w-100"
...@@ -247,7 +248,11 @@ export default { ...@@ -247,7 +248,11 @@ export default {
</div> </div>
<gl-form-group :label="__('Flags')" label-for="ci-variable-flags"> <gl-form-group :label="__('Flags')" label-for="ci-variable-flags">
<gl-form-checkbox v-model="protected_variable" class="mb-0"> <gl-form-checkbox
v-model="protected_variable"
class="mb-0"
data-testid="ci-variable-protected-checkbox"
>
{{ __('Protect variable') }} {{ __('Protect variable') }}
<gl-link target="_blank" :href="protectedEnvironmentVariablesLink"> <gl-link target="_blank" :href="protectedEnvironmentVariablesLink">
<gl-icon name="question" :size="12" /> <gl-icon name="question" :size="12" />
...@@ -261,6 +266,7 @@ export default { ...@@ -261,6 +266,7 @@ export default {
ref="masked-ci-variable" ref="masked-ci-variable"
v-model="masked" v-model="masked"
data-qa-selector="ci_variable_masked_checkbox" data-qa-selector="ci_variable_masked_checkbox"
data-testid="ci-variable-masked-checkbox"
> >
{{ __('Mask variable') }} {{ __('Mask variable') }}
<gl-link target="_blank" :href="maskedEnvironmentVariablesLink"> <gl-link target="_blank" :href="maskedEnvironmentVariablesLink">
......
app/assets/javascripts/pages/groups/settings/ci_cd/show/index.js
View file @ eca2ef23
import initSettingsPanels from '~/settings_panels'; import initSettingsPanels from '~/settings_panels';
import AjaxVariableList from '~/ci_variable_list/ajax_variable_list';
import initVariableList from '~/ci_variable_list'; import initVariableList from '~/ci_variable_list';
import initFilteredSearch from '~/pages/search/init_filtered_search'; import initFilteredSearch from '~/pages/search/init_filtered_search';
import GroupRunnersFilteredSearchTokenKeys from '~/filtered_search/group_runners_filtered_search_token_keys'; import GroupRunnersFilteredSearchTokenKeys from '~/filtered_search/group_runners_filtered_search_token_keys';
...@@ -17,19 +16,6 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -17,19 +16,6 @@ document.addEventListener('DOMContentLoaded', () => {
useDefaultState: false, useDefaultState: false,
}); });
if (gon.features.newVariablesUi) {
initVariableList();
} else {
const variableListEl = document.querySelector('.js-ci-variable-list-section');
// eslint-disable-next-line no-new
new AjaxVariableList({
container: variableListEl,
saveButton: variableListEl.querySelector('.js-ci-variables-save-button'),
errorBox: variableListEl.querySelector('.js-ci-variable-error-box'),
saveEndpoint: variableListEl.dataset.saveEndpoint,
maskableRegex: variableListEl.dataset.maskableRegex,
});
}
initSharedRunnersForm(); initSharedRunnersForm();
initVariableList();
}); });
app/assets/javascripts/pages/projects/settings/ci_cd/show/index.js
View file @ eca2ef23
import initSettingsPanels from '~/settings_panels'; import initSettingsPanels from '~/settings_panels';
import SecretValues from '~/behaviors/secret_values'; import SecretValues from '~/behaviors/secret_values';
import AjaxVariableList from '~/ci_variable_list/ajax_variable_list';
import registrySettingsApp from '~/registry/settings/registry_settings_bundle'; import registrySettingsApp from '~/registry/settings/registry_settings_bundle';
import initVariableList from '~/ci_variable_list'; import initVariableList from '~/ci_variable_list';
import initDeployFreeze from '~/deploy_freeze'; import initDeployFreeze from '~/deploy_freeze';
...@@ -18,19 +17,7 @@ document.addEventListener('DOMContentLoaded', () => { ...@@ -18,19 +17,7 @@ document.addEventListener('DOMContentLoaded', () => {
runnerTokenSecretValue.init(); runnerTokenSecretValue.init();
} }
if (gon.features.newVariablesUi) { initVariableList();
initVariableList();
} else {
const variableListEl = document.querySelector('.js-ci-variable-list-section');
// eslint-disable-next-line no-new
new AjaxVariableList({
container: variableListEl,
saveButton: variableListEl.querySelector('.js-ci-variables-save-button'),
errorBox: variableListEl.querySelector('.js-ci-variable-error-box'),
saveEndpoint: variableListEl.dataset.saveEndpoint,
maskableRegex: variableListEl.dataset.maskableRegex,
});
}
// hide extra auto devops settings based checkbox state // hide extra auto devops settings based checkbox state
const autoDevOpsExtraSettings = document.querySelector('.js-extra-settings'); const autoDevOpsExtraSettings = document.querySelector('.js-extra-settings');
......
app/controllers/groups/settings/ci_cd_controller.rb
View file @ eca2ef23
...@@ -8,9 +8,6 @@ module Groups ...@@ -8,9 +8,6 @@ module Groups
skip_cross_project_access_check :show skip_cross_project_access_check :show
before_action :authorize_admin_group! before_action :authorize_admin_group!
before_action :authorize_update_max_artifacts_size!, only: [:update] before_action :authorize_update_max_artifacts_size!, only: [:update]
before_action do
push_frontend_feature_flag(:new_variables_ui, @group, default_enabled: true)
end
before_action :define_variables, only: [:show] before_action :define_variables, only: [:show]
feature_category :continuous_integration feature_category :continuous_integration
......
app/controllers/projects/settings/ci_cd_controller.rb
View file @ eca2ef23
...@@ -8,7 +8,6 @@ module Projects ...@@ -8,7 +8,6 @@ module Projects
before_action :authorize_admin_pipeline! before_action :authorize_admin_pipeline!
before_action :define_variables before_action :define_variables
before_action do before_action do
push_frontend_feature_flag(:new_variables_ui, @project, default_enabled: true)
push_frontend_feature_flag(:ajax_new_deploy_token, @project) push_frontend_feature_flag(:ajax_new_deploy_token, @project)
end end
......
app/views/ci/variables/_index.html.haml
View file @ eca2ef23
...@@ -5,42 +5,20 @@ ...@@ -5,42 +5,20 @@
- link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('ci/variables/README', anchor: 'protect-a-custom-variable') } - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('ci/variables/README', anchor: 'protect-a-custom-variable') }
= s_('Environment variables are configured by your administrator to be %{link_start}protected%{link_end} by default').html_safe % { link_start: link_start, link_end: '</a>'.html_safe } = s_('Environment variables are configured by your administrator to be %{link_start}protected%{link_end} by default').html_safe % { link_start: link_start, link_end: '</a>'.html_safe }
- if Feature.enabled?(:new_variables_ui, @project || @group, default_enabled: true) - is_group = !@group.nil?
- is_group = !@group.nil?
#js-ci-project-variables{ data: { endpoint: save_endpoint, #js-ci-project-variables{ data: { endpoint: save_endpoint,
project_id: @project&.id || '', project_id: @project&.id || '',
group: is_group.to_s, group: is_group.to_s,
maskable_regex: ci_variable_maskable_regex, maskable_regex: ci_variable_maskable_regex,
protected_by_default: ci_variable_protected_by_default?.to_s, protected_by_default: ci_variable_protected_by_default?.to_s,
aws_logo_svg_path: image_path('aws_logo.svg'), aws_logo_svg_path: image_path('aws_logo.svg'),
aws_tip_deploy_link: help_page_path('ci/cloud_deployment/index.md', anchor: 'deploy-your-application-to-the-aws-elastic-container-service-ecs'), aws_tip_deploy_link: help_page_path('ci/cloud_deployment/index.md', anchor: 'deploy-your-application-to-the-aws-elastic-container-service-ecs'),
aws_tip_commands_link: help_page_path('ci/cloud_deployment/index.md', anchor: 'run-aws-commands-from-gitlab-cicd'), aws_tip_commands_link: help_page_path('ci/cloud_deployment/index.md', anchor: 'run-aws-commands-from-gitlab-cicd'),
aws_tip_learn_link: help_page_path('ci/cloud_deployment/index.md', anchor: 'aws'), aws_tip_learn_link: help_page_path('ci/cloud_deployment/index.md', anchor: 'aws'),
protected_environment_variables_link: help_page_path('ci/variables/README', anchor: 'protect-a-custom-variable'), protected_environment_variables_link: help_page_path('ci/variables/README', anchor: 'protect-a-custom-variable'),
masked_environment_variables_link: help_page_path('ci/variables/README', anchor: 'mask-a-custom-variable'), masked_environment_variables_link: help_page_path('ci/variables/README', anchor: 'mask-a-custom-variable'),
} } } }
- else
.row
.col-lg-12.js-ci-variable-list-section{ data: { save_endpoint: save_endpoint, maskable_regex: ci_variable_maskable_regex } }
.hide.gl-alert.gl-alert-danger.js-ci-variable-error-box
%ul.ci-variable-list
= render 'ci/variables/variable_header'
- @variables.each.each do |variable|
= render 'ci/variables/variable_row', form_field: 'variables', variable: variable
= render 'ci/variables/variable_row', form_field: 'variables'
.prepend-top-20
%button.btn.btn-success.js-ci-variables-save-button{ type: 'button' }
%span.hide.js-ci-variables-save-loading-icon
.spinner.spinner-light.mr-1
= _('Save variables')
%button.btn.btn-info.btn-inverted.gl-ml-3.js-secret-value-reveal-button{ type: 'button', data: { secret_reveal_status: "#{@variables.size == 0}" } }
- if @variables.size == 0
= n_('Hide value', 'Hide values', @variables.size)
- else
= n_('Reveal value', 'Reveal values', @variables.size)
- if !@group && @project.group - if !@group && @project.group
.settings-header.border-top.prepend-top-20 .settings-header.border-top.prepend-top-20
......
changelogs/unreleased/jivanvl-remove-ci-variables-table-feature-flag.yml 0 → 100644
View file @ eca2ef23
---
title: Remove new_variables_ui feature flag
merge_request: 41412
author:
type: other
config/feature_flags/development/new_variables_ui.yml deleted 100644 → 0
View file @ 29280bee
---
name: new_variables_ui
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25260
rollout_issue_url:
group: group::continuous integration
type: development
default_enabled: true
ee/spec/frontend/ci_variable_list/ci_variable_list_ee_spec.js deleted 100644 → 0
View file @ 29280bee
import $ from 'jquery';
import VariableList from '~/ci_variable_list/ci_variable_list';
describe('VariableList (EE features)', () => {
preloadFixtures('projects/ci_cd_settings.html');
let $wrapper;
let variableList;
describe('with all inputs(key, value, protected, environment)', () => {
beforeEach(() => {
loadFixtures('projects/ci_cd_settings.html');
$wrapper = $('.js-ci-variable-list-section');
variableList = new VariableList({
container: $wrapper,
formField: 'variables',
});
variableList.init();
});
describe('environment dropdown', () => {
function addRowByNewEnvironment(newEnv) {
const $row = $wrapper.find('.js-row:last-child');
// Open the dropdown
$row.find('.js-variable-environment-toggle').click();
// Filter for the new item
$row
.find('.js-variable-environment-dropdown-wrapper .dropdown-input-field')
.val(newEnv)
.trigger('input');
// Create the new item
$row.find('.js-variable-environment-dropdown-wrapper .js-dropdown-create-new-item').click();
}
it('should add another row when editing the last rows environment dropdown', () => {
addRowByNewEnvironment('someenv');
jest.runOnlyPendingTimers();
expect($wrapper.find('.js-row')).toHaveLength(2);
// Check for the correct default in the new row
const $environmentInput = $wrapper
.find('.js-row:last-child')
.find('input[name="variables[variables_attributes][][environment_scope]"]');
expect($environmentInput.val()).toBe('*');
});
it('should update dropdown with new environment values and remove values when row is removed', () => {
addRowByNewEnvironment('someenv');
const $row = $wrapper.find('.js-row:last-child');
$row.find('.js-variable-environment-toggle').click();
jest.runOnlyPendingTimers();
const $dropdownItemsBeforeRemove = $row.find(
'.js-variable-environment-dropdown-wrapper .dropdown-content a',
);
expect($dropdownItemsBeforeRemove).toHaveLength(2);
expect($dropdownItemsBeforeRemove[0].textContent.trim()).toBe('someenv');
expect($dropdownItemsBeforeRemove[1].textContent.trim()).toBe('* (All environments)');
$wrapper.find('.js-row-remove-button').trigger('click');
expect($wrapper.find('.js-row')).toHaveLength(0);
jest.runOnlyPendingTimers();
const $dropdownItemsAfterRemove = $row.find(
'.js-variable-environment-dropdown-wrapper .dropdown-content a',
);
expect($dropdownItemsAfterRemove).toHaveLength(1);
expect($dropdownItemsAfterRemove[0].textContent.trim()).toBe('* (All environments)');
});
});
});
});
locale/gitlab.pot
View file @ eca2ef23
...@@ -5321,9 +5321,6 @@ msgstr "" ...@@ -5321,9 +5321,6 @@ msgstr ""
msgid "CiVariable|Create wildcard" msgid "CiVariable|Create wildcard"
msgstr "" msgstr ""
msgid "CiVariable|Error occurred while saving variables"
msgstr ""
msgid "CiVariable|Masked" msgid "CiVariable|Masked"
msgstr "" msgstr ""
...@@ -5342,9 +5339,6 @@ msgstr "" ...@@ -5342,9 +5339,6 @@ msgstr ""
msgid "CiVariable|Toggle protected" msgid "CiVariable|Toggle protected"
msgstr "" msgstr ""
msgid "CiVariable|Validation failed"
msgstr ""
msgid "Classification Label (optional)" msgid "Classification Label (optional)"
msgstr "" msgstr ""
...@@ -23050,9 +23044,6 @@ msgstr "" ...@@ -23050,9 +23044,6 @@ msgstr ""
msgid "Save space and find tags in the Container Registry more easily. Enable the cleanup policy to remove stale tags and keep only the ones you need." msgid "Save space and find tags in the Container Registry more easily. Enable the cleanup policy to remove stale tags and keep only the ones you need."
msgstr "" msgstr ""
msgid "Save variables"
msgstr ""
msgid "Saved scan settings and target site settings which are reusable." msgid "Saved scan settings and target site settings which are reusable."
msgstr "" msgstr ""
......
spec/features/group_variables_spec.rb
View file @ eca2ef23
...@@ -11,7 +11,7 @@ RSpec.describe 'Group variables', :js do ...@@ -11,7 +11,7 @@ RSpec.describe 'Group variables', :js do
before do before do
group.add_owner(user) group.add_owner(user)
gitlab_sign_in(user) gitlab_sign_in(user)
stub_feature_flags(new_variables_ui: false) wait_for_requests
visit page_path visit page_path
end end
......
spec/features/project_group_variables_spec.rb
View file @ eca2ef23
...@@ -24,7 +24,6 @@ RSpec.describe 'Project group variables', :js do ...@@ -24,7 +24,6 @@ RSpec.describe 'Project group variables', :js do
sign_in(user) sign_in(user)
project.add_maintainer(user) project.add_maintainer(user)
group.add_owner(user) group.add_owner(user)
stub_feature_flags(new_variables_ui: false)
end end
it 'project in group shows inherited vars from ancestor group' do it 'project in group shows inherited vars from ancestor group' do
...@@ -53,9 +52,13 @@ RSpec.describe 'Project group variables', :js do ...@@ -53,9 +52,13 @@ RSpec.describe 'Project group variables', :js do
it 'project origin keys link to ancestor groups ci_cd settings' do it 'project origin keys link to ancestor groups ci_cd settings' do
visit project_path visit project_path
find('.group-origin-link').click find('.group-origin-link').click
page.within('.js-ci-variable-list-section .js-row:nth-child(2)') do
expect(find('.js-ci-variable-input-key').value).to eq(key1) wait_for_requests
page.within('.ci-variable-table') do
expect(find('.js-ci-variable-row:nth-child(1) [data-label="Key"]').text).to eq(key1)
end end
end end
end end
spec/features/project_variables_spec.rb
View file @ eca2ef23
...@@ -12,32 +12,29 @@ RSpec.describe 'Project variables', :js do ...@@ -12,32 +12,29 @@ RSpec.describe 'Project variables', :js do
sign_in(user) sign_in(user)
project.add_maintainer(user) project.add_maintainer(user)
project.variables << variable project.variables << variable
stub_feature_flags(new_variables_ui: false)
visit page_path visit page_path
end end
it_behaves_like 'variable list' it_behaves_like 'variable list'
it 'adds new variable with a special environment scope' do it 'adds a new variable with an environment scope' do
page.within('.js-ci-variable-list-section .js-row:last-child') do click_button('Add Variable')
find('.js-ci-variable-input-key').set('somekey')
find('.js-ci-variable-input-value').set('somevalue')
find('.js-variable-environment-toggle').click page.within('#add-ci-variable') do
find('.js-variable-environment-dropdown-wrapper .dropdown-input-field').set('review/*') find('[data-qa-selector="ci_variable_key_field"] input').set('akey')
find('.js-variable-environment-dropdown-wrapper .js-dropdown-create-new-item').click find('#ci-variable-value').set('akey_value')
find('[data-testid="environment-scope"]').click
find_button('clear').click
find('[data-testid="ci-environment-search"]').set('review/*')
find('[data-testid="create-wildcard-button"]').click
expect(find('input[name="variables[variables_attributes][][environment_scope]"]', visible: false).value).to eq('review/*') click_button('Add variable')
end end
click_button('Save variables')
wait_for_requests wait_for_requests
visit page_path page.within('.ci-variable-table') do
expect(find('.js-ci-variable-row:first-child [data-label="Environments"]').text).to eq('review/*')
page.within('.js-ci-variable-list-section .js-row:nth-child(2)') do
expect(find('.js-ci-variable-input-key').value).to eq('somekey')
expect(page).to have_content('review/*')
end end
end end
end end
spec/features/projects/settings/registry_settings_spec.rb
View file @ eca2ef23
...@@ -18,7 +18,6 @@ RSpec.describe 'Project > Settings > CI/CD > Container registry tag expiration p ...@@ -18,7 +18,6 @@ RSpec.describe 'Project > Settings > CI/CD > Container registry tag expiration p
sign_in(user) sign_in(user)
stub_container_registry_config(enabled: container_registry_enabled) stub_container_registry_config(enabled: container_registry_enabled)
stub_feature_flags(new_variables_ui: false)
end end
context 'as owner' do context 'as owner' do
......
spec/frontend/ci_variable_list/ci_variable_list/ajax_variable_list_spec.js deleted 100644 → 0
View file @ 29280bee
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);
});
});
});
spec/frontend/ci_variable_list/ci_variable_list/ci_variable_list_spec.js
View file @ eca2ef23
import $ from 'jquery'; import $ from 'jquery';
import waitForPromises from 'helpers/wait_for_promises';
import VariableList from '~/ci_variable_list/ci_variable_list'; import VariableList from '~/ci_variable_list/ci_variable_list';
const HIDE_CLASS = 'hide'; const HIDE_CLASS = 'hide';
...@@ -7,7 +6,6 @@ const HIDE_CLASS = 'hide'; ...@@ -7,7 +6,6 @@ const HIDE_CLASS = 'hide';
describe('VariableList', () => { describe('VariableList', () => {
preloadFixtures('pipeline_schedules/edit.html'); preloadFixtures('pipeline_schedules/edit.html');
preloadFixtures('pipeline_schedules/edit_with_variables.html'); preloadFixtures('pipeline_schedules/edit_with_variables.html');
preloadFixtures('projects/ci_cd_settings.html');
let $wrapper; let $wrapper;
let variableList; let variableList;
...@@ -113,92 +111,6 @@ describe('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', () => { describe('toggleEnableRow method', () => {
beforeEach(() => { beforeEach(() => {
loadFixtures('pipeline_schedules/edit_with_variables.html'); loadFixtures('pipeline_schedules/edit_with_variables.html');
...@@ -247,36 +159,4 @@ describe('VariableList', () => { ...@@ -247,36 +159,4 @@ describe('VariableList', () => {
expect($wrapper.find('.js-ci-variable-input-key:not([disabled])').length).toBe(3); 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);
});
});
}); });
spec/frontend/fixtures/groups.rb
View file @ eca2ef23
...@@ -15,7 +15,6 @@ RSpec.describe 'Groups (JavaScript fixtures)', type: :controller do ...@@ -15,7 +15,6 @@ RSpec.describe 'Groups (JavaScript fixtures)', type: :controller do
end end
before do before do
stub_feature_flags(new_variables_ui: false)
group.add_maintainer(admin) group.add_maintainer(admin)
sign_in(admin) sign_in(admin)
end end
...@@ -27,12 +26,4 @@ RSpec.describe 'Groups (JavaScript fixtures)', type: :controller do ...@@ -27,12 +26,4 @@ RSpec.describe 'Groups (JavaScript fixtures)', type: :controller do
expect(response).to be_successful expect(response).to be_successful
end end
end end
describe Groups::Settings::CiCdController, '(JavaScript fixtures)', type: :controller do
it 'groups/ci_cd_settings.html' do
get :show, params: { group_id: group }
expect(response).to be_successful
end
end
end end
spec/frontend/fixtures/projects.rb
View file @ eca2ef23
...@@ -20,7 +20,6 @@ RSpec.describe 'Projects (JavaScript fixtures)', type: :controller do ...@@ -20,7 +20,6 @@ RSpec.describe 'Projects (JavaScript fixtures)', type: :controller do
end end
before do before do
stub_feature_flags(new_variables_ui: false)
project.add_maintainer(admin) project.add_maintainer(admin)
sign_in(admin) sign_in(admin)
allow(SecureRandom).to receive(:hex).and_return('securerandomhex:thereisnospoon') allow(SecureRandom).to receive(:hex).and_return('securerandomhex:thereisnospoon')
...@@ -58,27 +57,4 @@ RSpec.describe 'Projects (JavaScript fixtures)', type: :controller do ...@@ -58,27 +57,4 @@ RSpec.describe 'Projects (JavaScript fixtures)', type: :controller do
expect(response).to be_successful expect(response).to be_successful
end end
end end
describe Projects::Settings::CiCdController, '(JavaScript fixtures)', type: :controller do
it 'projects/ci_cd_settings.html' do
get :show, params: {
namespace_id: project.namespace.to_param,
project_id: project
}
expect(response).to be_successful
end
it 'projects/ci_cd_settings_with_variables.html' do
create(:ci_variable, project: project_variable_populated)
create(:ci_variable, project: project_variable_populated)
get :show, params: {
namespace_id: project_variable_populated.namespace.to_param,
project_id: project_variable_populated
}
expect(response).to be_successful
end
end
end end
spec/support/shared_examples/features/variable_list_shared_examples.rb
View file @ eca2ef23
# frozen_string_literal: true # frozen_string_literal: true
RSpec.shared_examples 'variable list' do RSpec.shared_examples 'variable list' do
it 'shows list of variables' do it 'shows a list of variables' do
page.within('.js-ci-variable-list-section') do page.within('.ci-variable-table') do
expect(first('.js-ci-variable-input-key').value).to eq(variable.key) expect(find('.js-ci-variable-row:nth-child(1) td[data-label="Key"]').text).to eq(variable.key)
end end
end end
it 'adds new CI variable' do it 'adds a new CI variable' do
page.within('.js-ci-variable-list-section .js-row:last-child') do click_button('Add Variable')
find('.js-ci-variable-input-key').set('key')
find('.js-ci-variable-input-value').set('key_value') fill_variable('key', 'key_value') do
click_button('Add variable')
end end
click_button('Save variables')
wait_for_requests wait_for_requests
visit page_path page.within('.ci-variable-table') do
expect(find('.js-ci-variable-row:nth-child(1) td[data-label="Key"]').text).to eq('key')
# We check the first row because it re-sorts to alphabetical order on refresh
page.within('.js-ci-variable-list-section .js-row:nth-child(2)') do
expect(find('.js-ci-variable-input-key').value).to eq('key')
expect(find('.js-ci-variable-input-value', visible: false).value).to eq('key_value')
end end
end end
it 'adds a new protected variable' do it 'adds a new protected variable' do
page.within('.js-ci-variable-list-section .js-row:last-child') do click_button('Add Variable')
find('.js-ci-variable-input-key').set('key')
find('.js-ci-variable-input-value').set('key_value')
expect(find('.js-ci-variable-input-protected', visible: false).value).to eq('true') fill_variable('key', 'key_value') do
click_button('Add variable')
end end
click_button('Save variables')
wait_for_requests wait_for_requests
visit page_path page.within('.ci-variable-table') do
expect(find('.js-ci-variable-row:nth-child(1) td[data-label="Key"]').text).to eq('key')
# We check the first row because it re-sorts to alphabetical order on refresh expect(find('.js-ci-variable-row:nth-child(1) td[data-label="Protected"] svg[data-testid="mobile-issue-close-icon"]')).to be_present
page.within('.js-ci-variable-list-section .js-row:nth-child(2)') do
expect(find('.js-ci-variable-input-key').value).to eq('key')
expect(find('.js-ci-variable-input-value', visible: false).value).to eq('key_value')
expect(find('.js-ci-variable-input-protected', visible: false).value).to eq('true')
end end
end end
it 'defaults to unmasked' do it 'defaults to unmasked' do
page.within('.js-ci-variable-list-section .js-row:last-child') do click_button('Add Variable')
find('.js-ci-variable-input-key').set('key')
find('.js-ci-variable-input-value').set('key_value')
expect(find('.js-ci-variable-input-masked', visible: false).value).to eq('false') fill_variable('key', 'key_value') do
click_button('Add variable')
end end
click_button('Save variables')
wait_for_requests wait_for_requests
visit page_path page.within('.ci-variable-table') do
expect(find('.js-ci-variable-row:nth-child(1) td[data-label="Key"]').text).to eq('key')
# We check the first row because it re-sorts to alphabetical order on refresh expect(find('.js-ci-variable-row:nth-child(1) td[data-label="Masked"] svg[data-testid="close-icon"]')).to be_present
page.within('.js-ci-variable-list-section .js-row:nth-child(2)') do
expect(find('.js-ci-variable-input-key').value).to eq('key')
expect(find('.js-ci-variable-input-value', visible: false).value).to eq('key_value')
expect(find('.js-ci-variable-input-masked', visible: false).value).to eq('false')
end
end
context 'defaults to the application setting' do
context 'application setting is true' do
before do
stub_application_setting(protected_ci_variables: true)
visit page_path
end
it 'defaults to protected' do
page.within('.js-ci-variable-list-section .js-row:last-child') do
find('.js-ci-variable-input-key').set('key')
end
values = all('.js-ci-variable-input-protected', visible: false).map(&:value)
expect(values).to eq %w(false true true)
end
it 'shows a message regarding the changed default' do
expect(page).to have_content 'Environment variables are configured by your administrator to be protected by default'
end
end
context 'application setting is false' do
before do
stub_application_setting(protected_ci_variables: false)
visit page_path
end
it 'defaults to unprotected' do
page.within('.js-ci-variable-list-section .js-row:last-child') do
find('.js-ci-variable-input-key').set('key')
end
values = all('.js-ci-variable-input-protected', visible: false).map(&:value)
expect(values).to eq %w(false false false)
end
it 'does not show a message regarding the default' do
expect(page).not_to have_content 'Environment variables are configured by your administrator to be protected by default'
end
end end
end end
it 'reveals and hides variables' do it 'reveals and hides variables' do
page.within('.js-ci-variable-list-section') do page.within('.ci-variable-table') do
expect(first('.js-ci-variable-input-key').value).to eq(variable.key) expect(first('.js-ci-variable-row td[data-label="Key"]').text).to eq(variable.key)
expect(first('.js-ci-variable-input-value', visible: false).value).to eq(variable.value)
expect(page).to have_content('*' * 17) expect(page).to have_content('*' * 17)
click_button('Reveal value') click_button('Reveal value')
expect(first('.js-ci-variable-input-key').value).to eq(variable.key) expect(first('.js-ci-variable-row td[data-label="Key"]').text).to eq(variable.key)
expect(first('.js-ci-variable-input-value').value).to eq(variable.value) expect(first('.js-ci-variable-row td[data-label="Value"]').text).to eq(variable.value)
expect(page).not_to have_content('*' * 17) expect(page).not_to have_content('*' * 17)
click_button('Hide value') click_button('Hide value')
expect(first('.js-ci-variable-input-key').value).to eq(variable.key) expect(first('.js-ci-variable-row td[data-label="Key"]').text).to eq(variable.key)
expect(first('.js-ci-variable-input-value', visible: false).value).to eq(variable.value)
expect(page).to have_content('*' * 17) expect(page).to have_content('*' * 17)
end end
end end
it 'deletes variable' do it 'deletes a variable' do
page.within('.js-ci-variable-list-section') do expect(page).to have_selector('.js-ci-variable-row', count: 1)
expect(page).to have_selector('.js-row', count: 2)
first('.js-row-remove-button').click page.within('.ci-variable-table') do
click_button('Edit')
click_button('Save variables')
wait_for_requests
expect(page).to have_selector('.js-row', count: 1)
end end
end
it 'edits variable' do page.within('#add-ci-variable') do
page.within('.js-ci-variable-list-section') do click_button('Delete variable')
click_button('Reveal value') end
page.within('.js-row:nth-child(2)') do
find('.js-ci-variable-input-key').set('new_key')
find('.js-ci-variable-input-value').set('new_value')
end
click_button('Save variables') wait_for_requests
wait_for_requests
visit page_path expect(first('.js-ci-variable-row').text).to eq('There are no variables yet.')
end
page.within('.js-row:nth-child(2)') do it 'edits a variable' do
expect(find('.js-ci-variable-input-key').value).to eq('new_key') page.within('.ci-variable-table') do
expect(find('.js-ci-variable-input-value', visible: false).value).to eq('new_value') click_button('Edit')
end
end end
end
it 'edits variable to be protected' do page.within('#add-ci-variable') do
# Create the unprotected variable find('[data-qa-selector="ci_variable_key_field"] input').set('new_key')
page.within('.js-ci-variable-list-section .js-row:last-child') do
find('.js-ci-variable-input-key').set('unprotected_key')
find('.js-ci-variable-input-value').set('unprotected_value')
find('.ci-variable-protected-item .js-project-feature-toggle').click
expect(find('.js-ci-variable-input-protected', visible: false).value).to eq('false') click_button('Update variable')
end end
click_button('Save variables')
wait_for_requests wait_for_requests
visit page_path expect(first('.js-ci-variable-row td[data-label="Key"]').text).to eq('new_key')
end
it 'edits a variable to be unmasked' do
page.within('.ci-variable-table') do
click_button('Edit')
end
# We check the first row because it re-sorts to alphabetical order on refresh page.within('#add-ci-variable') do
page.within('.js-ci-variable-list-section .js-row:nth-child(3)') do find('[data-testid="ci-variable-protected-checkbox"]').click
find('.ci-variable-protected-item .js-project-feature-toggle').click find('[data-testid="ci-variable-masked-checkbox"]').click
expect(find('.js-ci-variable-input-protected', visible: false).value).to eq('true') click_button('Update variable')
end end
click_button('Save variables')
wait_for_requests wait_for_requests
visit page_path page.within('.ci-variable-table') do
expect(find('.js-ci-variable-row:nth-child(1) td[data-label="Masked"] svg[data-testid="close-icon"]')).to be_present
# We check the first row because it re-sorts to alphabetical order on refresh
page.within('.js-ci-variable-list-section .js-row:nth-child(3)') do
expect(find('.js-ci-variable-input-key').value).to eq('unprotected_key')
expect(find('.js-ci-variable-input-value', visible: false).value).to eq('unprotected_value')
expect(find('.js-ci-variable-input-protected', visible: false).value).to eq('true')
end end
end end
it 'edits variable to be unprotected' do it 'edits a variable to be masked' do
# Create the protected variable page.within('.ci-variable-table') do
page.within('.js-ci-variable-list-section .js-row:last-child') do click_button('Edit')
find('.js-ci-variable-input-key').set('protected_key') end
find('.js-ci-variable-input-value').set('protected_value')
page.within('#add-ci-variable') do
find('[data-testid="ci-variable-masked-checkbox"]').click
expect(find('.js-ci-variable-input-protected', visible: false).value).to eq('true') click_button('Update variable')
end end
click_button('Save variables')
wait_for_requests wait_for_requests
visit page_path page.within('.ci-variable-table') do
click_button('Edit')
end
page.within('.js-ci-variable-list-section .js-row:nth-child(2)') do page.within('#add-ci-variable') do
find('.ci-variable-protected-item .js-project-feature-toggle').click find('[data-testid="ci-variable-masked-checkbox"]').click
expect(find('.js-ci-variable-input-protected', visible: false).value).to eq('false') click_button('Update variable')
end end
click_button('Save variables') page.within('.ci-variable-table') do
wait_for_requests expect(find('.js-ci-variable-row:nth-child(1) td[data-label="Masked"] svg[data-testid="mobile-issue-close-icon"]')).to be_present
end
end
visit page_path it 'shows a validation error box about duplicate keys' do
click_button('Add Variable')
page.within('.js-ci-variable-list-section .js-row:nth-child(2)') do fill_variable('key', 'key_value') do
expect(find('.js-ci-variable-input-key').value).to eq('protected_key') click_button('Add variable')
expect(find('.js-ci-variable-input-value', visible: false).value).to eq('protected_value')
expect(find('.js-ci-variable-input-protected', visible: false).value).to eq('false')
end end
end
it 'edits variable to be unmasked' do wait_for_requests
page.within('.js-ci-variable-list-section .js-row:last-child') do
find('.js-ci-variable-input-key').set('unmasked_key')
find('.js-ci-variable-input-value').set('unmasked_value')
expect(find('.js-ci-variable-input-masked', visible: false).value).to eq('false')
find('.ci-variable-masked-item .js-project-feature-toggle').click click_button('Add Variable')
expect(find('.js-ci-variable-input-masked', visible: false).value).to eq('true') fill_variable('key', 'key_value') do
click_button('Add variable')
end end
click_button('Save variables')
wait_for_requests wait_for_requests
visit page_path expect(find('.flash-container')).to be_present
expect(find('.flash-text').text).to have_content('Variables key (key) has already been taken')
end
page.within('.js-ci-variable-list-section .js-row:nth-child(2)') do it 'prevents a variable to be added if no values are provided when a variable is set to masked' do
expect(find('.js-ci-variable-input-masked', visible: false).value).to eq('true') click_button('Add Variable')
find('.ci-variable-masked-item .js-project-feature-toggle').click page.within('#add-ci-variable') do
find('[data-qa-selector="ci_variable_key_field"] input').set('empty_mask_key')
find('[data-testid="ci-variable-protected-checkbox"]').click
find('[data-testid="ci-variable-masked-checkbox"]').click
expect(find('.js-ci-variable-input-masked', visible: false).value).to eq('false') expect(find_button('Add variable', disabled: true)).to be_present
end end
end
click_button('Save variables') it 'shows validation error box about unmaskable values' do
wait_for_requests click_button('Add Variable')
visit page_path
page.within('.js-ci-variable-list-section .js-row:nth-child(2)') do fill_variable('empty_mask_key', '???', protected: true, masked: true) do
expect(find('.js-ci-variable-input-masked', visible: false).value).to eq('false') expect(page).to have_content('This variable can not be masked')
expect(find_button('Add variable', disabled: true)).to be_present
end end
end end
it 'edits variable to be masked' do it 'handles multiple edits and a deletion' do
page.within('.js-ci-variable-list-section .js-row:last-child') do # Create two variables
find('.js-ci-variable-input-key').set('masked_key') click_button('Add Variable')
find('.js-ci-variable-input-value').set('masked_value')
expect(find('.js-ci-variable-input-masked', visible: false).value).to eq('false')
find('.ci-variable-masked-item .js-project-feature-toggle').click fill_variable('akey', 'akeyvalue') do
click_button('Add variable')
expect(find('.js-ci-variable-input-masked', visible: false).value).to eq('true')
end end
click_button('Save variables')
wait_for_requests wait_for_requests
visit page_path click_button('Add Variable')
page.within('.js-ci-variable-list-section .js-row:nth-child(2)') do fill_variable('zkey', 'zkeyvalue') do
expect(find('.js-ci-variable-input-masked', visible: false).value).to eq('true') click_button('Add variable')
end end
end
it 'handles multiple edits and deletion in the middle' do
page.within('.js-ci-variable-list-section') do
# Create 2 variables
page.within('.js-row:last-child') do
find('.js-ci-variable-input-key').set('akey')
find('.js-ci-variable-input-value').set('akeyvalue')
end
page.within('.js-row:last-child') do
find('.js-ci-variable-input-key').set('zkey')
find('.js-ci-variable-input-value').set('zkeyvalue')
end
click_button('Save variables') wait_for_requests
wait_for_requests
expect(page).to have_selector('.js-row', count: 4) expect(page).to have_selector('.js-ci-variable-row', count: 3)
# Remove the `akey` variable # Remove the `akey` variable
page.within('.js-row:nth-child(3)') do page.within('.ci-variable-table') do
first('.js-row-remove-button').click page.within('.js-ci-variable-row:first-child') do
click_button('Edit')
end end
end
# Add another variable page.within('#add-ci-variable') do
page.within('.js-row:last-child') do click_button('Delete variable')
find('.js-ci-variable-input-key').set('ckey') end
find('.js-ci-variable-input-value').set('ckeyvalue')
end
click_button('Save variables') wait_for_requests
wait_for_requests
visit page_path # Add another variable
click_button('Add Variable')
# Expect to find 3 variables(4 rows) in alphbetical order fill_variable('ckey', 'ckeyvalue') do
expect(page).to have_selector('.js-row', count: 4) click_button('Add variable')
row_keys = all('.js-ci-variable-input-key')
expect(row_keys[0].value).to eq('ckey')
expect(row_keys[1].value).to eq('test_key')
expect(row_keys[2].value).to eq('zkey')
expect(row_keys[3].value).to eq('')
end end
wait_for_requests
# expect to find 3 rows of variables in alphabetical order
expect(page).to have_selector('.js-ci-variable-row', count: 3)
rows = all('.js-ci-variable-row')
expect(rows[0].find('td[data-label="Key"]').text).to eq('ckey')
expect(rows[1].find('td[data-label="Key"]').text).to eq('test_key')
expect(rows[2].find('td[data-label="Key"]').text).to eq('zkey')
end end
it 'shows validation error box about duplicate keys' do context 'defaults to the application setting' do
page.within('.js-ci-variable-list-section .js-row:last-child') do context 'application setting is true' do
find('.js-ci-variable-input-key').set('samekey') before do
find('.js-ci-variable-input-value').set('value123') stub_application_setting(protected_ci_variables: true)
end
page.within('.js-ci-variable-list-section .js-row:last-child') do
find('.js-ci-variable-input-key').set('samekey')
find('.js-ci-variable-input-value').set('value456')
end
click_button('Save variables') visit page_path
wait_for_requests end
expect(all('.js-ci-variable-list-section .js-ci-variable-error-box ul li').count).to eq(1) it 'defaults to protected' do
click_button('Add Variable')
# We check the first row because it re-sorts to alphabetical order on refresh page.within('#add-ci-variable') do
page.within('.js-ci-variable-list-section') do expect(find('[data-testid="ci-variable-protected-checkbox"]')).to be_checked
expect(find('.js-ci-variable-error-box')).to have_content(/Validation failed Variables have duplicate values \(.+\)/) end
end end
end
it 'shows validation error box about masking empty values' do it 'shows a message regarding the changed default' do
page.within('.js-ci-variable-list-section .js-row:last-child') do expect(page).to have_content 'Environment variables are configured by your administrator to be protected by default'
find('.js-ci-variable-input-key').set('empty_value') end
find('.js-ci-variable-input-value').set('')
find('.ci-variable-masked-item .js-project-feature-toggle').click
end end
click_button('Save variables') context 'application setting is false' do
wait_for_requests before do
stub_application_setting(protected_ci_variables: false)
page.within('.js-ci-variable-list-section') do visit page_path
expect(all('.js-ci-variable-error-box ul li').count).to eq(1) end
expect(find('.js-ci-variable-error-box')).to have_content(/Validation failed Variables value is invalid/)
end
end
it 'shows validation error box about unmaskable values' do it 'defaults to unprotected' do
page.within('.js-ci-variable-list-section .js-row:last-child') do click_button('Add Variable')
find('.js-ci-variable-input-key').set('unmaskable_value')
find('.js-ci-variable-input-value').set('???') page.within('#add-ci-variable') do
find('.ci-variable-masked-item .js-project-feature-toggle').click expect(find('[data-testid="ci-variable-protected-checkbox"]')).not_to be_checked
end
end
it 'does not show a message regarding the default' do
expect(page).not_to have_content 'Environment variables are configured by your administrator to be protected by default'
end
end end
end
click_button('Save variables') def fill_variable(key, value, protected: false, masked: false)
wait_for_requests page.within('#add-ci-variable') do
find('[data-qa-selector="ci_variable_key_field"] input').set(key)
find('[data-qa-selector="ci_variable_value_field"]').set(value) if value.present?
find('[data-testid="ci-variable-protected-checkbox"]').click if protected
find('[data-testid="ci-variable-masked-checkbox"]').click if masked
page.within('.js-ci-variable-list-section') do yield
expect(all('.js-ci-variable-error-box ul li').count).to eq(1)
expect(find('.js-ci-variable-error-box')).to have_content(/Validation failed Variables value is invalid/)
end end
end end
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7