Skip to content
Snippets Groups Projects
Verified Commit 914d48e3 authored by Lorenz van Herwaarden's avatar Lorenz van Herwaarden Committed by GitLab
Browse files

Merge branch '507281-policies-update-typo' into 'master'

Correct typo in utils method for policy licenses

See merge request !174420



Merged-by: Lorenz van Herwaarden's avatarLorenz van Herwaarden <lvanherwaarden@gitlab.com>
Approved-by: Lorenz van Herwaarden's avatarLorenz van Herwaarden <lvanherwaarden@gitlab.com>
Co-authored-by: default avatarArtur Fedorov <afedorov@gitlab.com>
parents 69bf430e 2f2a56a7
No related branches found
No related tags found
1 merge request!174420Correct typo in utils method for policy licenses
Pipeline #1569527477 passed
......@@ -37,7 +37,12 @@ export const buildFiltersFromRule = (rule) => {
return filters;
};
export const buildFiltersFromLicenceRule = (rule) => {
/**
* Build allow or deny list from a policy rule
* @param rule
* @returns {{[ALLOW_DENY]: boolean, [STATUS]: boolean}}
*/
export const buildFiltersFromLicenseRule = (rule) => {
let { licenses = {} } = rule || {};
licenses = licenses ?? {};
......
......@@ -2,7 +2,7 @@
import { GlSprintf } from '@gitlab/ui';
import { s__ } from '~/locale';
import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import { buildFiltersFromLicenceRule } from 'ee/security_orchestration/components/policy_editor/scan_result/lib';
import { buildFiltersFromLicenseRule } from 'ee/security_orchestration/components/policy_editor/scan_result/lib';
import BranchExceptionSelector from '../../branch_exception_selector.vue';
import ScanFilterSelector from '../../scan_filter_selector.vue';
import { SCAN_RESULT_BRANCH_TYPE_OPTIONS, BRANCH_EXCEPTIONS_KEY } from '../../constants';
......@@ -61,7 +61,7 @@ export default {
const isDenied = DENIED in licenses;
return {
selectedFilters: buildFiltersFromLicenceRule(this.initRule),
selectedFilters: buildFiltersFromLicenseRule(this.initRule),
excludeListType: isDenied ? DENIED : ALLOWED,
};
},
......
import {
buildFiltersFromRule,
buildFiltersFromLicenceRule,
buildFiltersFromLicenseRule,
} from 'ee/security_orchestration/components/policy_editor/scan_result/lib';
import {
AGE,
......@@ -157,7 +157,7 @@ describe('buildFiltersFromRule', () => {
});
});
describe('buildFiltersFromLicenceRule', () => {
describe('buildFiltersFromLicenseRule', () => {
it.each`
rule | expectedResult
${undefined} | ${false}
......@@ -169,7 +169,7 @@ describe('buildFiltersFromLicenceRule', () => {
${{ licenses: { denied: [] } }} | ${true}
${{ licenses: { invalid: [] } }} | ${false}
`('sets ALLOW_DENY list filter', ({ rule, expectedResult }) => {
const filters = buildFiltersFromLicenceRule(rule);
const filters = buildFiltersFromLicenseRule(rule);
expect(filters[STATUS]).toBe(true);
expect(filters[ALLOW_DENY]).toBe(expectedResult);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment