Skip to content
代码片段 群组 项目
未验证 提交 11e4784d 编辑于 作者: Alexander Turinske's avatar Alexander Turinske 提交者: GitLab
浏览文件

Merge branch '439346-yaml-editor-extra-characters' into 'master'

Fix adding extra characters for pipeline execution policy

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143068



Merged-by: default avatarAlexander Turinske <aturinske@gitlab.com>
Approved-by: default avatarMartin Čavoj <mcavoj@gitlab.com>
Approved-by: default avatarAlexander Turinske <aturinske@gitlab.com>
Reviewed-by: default avatarMartin Čavoj <mcavoj@gitlab.com>
Co-authored-by: default avatarArtur Fedorov <afedorov@gitlab.com>
No related branches found
No related tags found
无相关合并请求
...@@ -9,10 +9,7 @@ import { THOUSAND } from '~/lib/utils/constants'; ...@@ -9,10 +9,7 @@ import { THOUSAND } from '~/lib/utils/constants';
import CodeBlockSourceSelector from 'ee/security_orchestration/components/policy_editor/scan_execution/action/code_block_source_selector.vue'; import CodeBlockSourceSelector from 'ee/security_orchestration/components/policy_editor/scan_execution/action/code_block_source_selector.vue';
import PolicyPopover from 'ee/security_orchestration/components/policy_popover.vue'; import PolicyPopover from 'ee/security_orchestration/components/policy_popover.vue';
import { parseCustomFileConfiguration } from 'ee/security_orchestration/components/policy_editor/utils'; import { parseCustomFileConfiguration } from 'ee/security_orchestration/components/policy_editor/utils';
import { import { buildCustomCodeAction } from 'ee/security_orchestration/components/policy_editor/scan_execution/lib';
buildCustomCodeAction,
toYaml,
} from 'ee/security_orchestration/components/policy_editor/scan_execution/lib';
import SectionLayout from '../../section_layout.vue'; import SectionLayout from '../../section_layout.vue';
import { ACTION_AND_LABEL } from '../../constants'; import { ACTION_AND_LABEL } from '../../constants';
import { import {
...@@ -140,10 +137,9 @@ export default { ...@@ -140,10 +137,9 @@ export default {
}, },
updateYaml(val) { updateYaml(val) {
this.yamlEditorValue = val; this.yamlEditorValue = val;
const yaml = toYaml(val);
this.triggerChanged({ this.triggerChanged({
ci_configuration: yaml, ci_configuration: val,
}); });
}, },
setSelectedRef(ref) { setSelectedRef(ref) {
......
...@@ -2,10 +2,7 @@ import { GlSprintf } from '@gitlab/ui'; ...@@ -2,10 +2,7 @@ import { GlSprintf } from '@gitlab/ui';
import { shallowMount } from '@vue/test-utils'; import { shallowMount } from '@vue/test-utils';
import waitForPromises from 'helpers/wait_for_promises'; import waitForPromises from 'helpers/wait_for_promises';
import Api from 'ee/api'; import Api from 'ee/api';
import { import { buildCustomCodeAction } from 'ee/security_orchestration/components/policy_editor/scan_execution/lib';
buildCustomCodeAction,
toYaml,
} from 'ee/security_orchestration/components/policy_editor/scan_execution/lib';
import CodeBlockSourceSelector from 'ee/security_orchestration/components/policy_editor/scan_execution/action/code_block_source_selector.vue'; import CodeBlockSourceSelector from 'ee/security_orchestration/components/policy_editor/scan_execution/action/code_block_source_selector.vue';
import CodeBlockAction from 'ee/security_orchestration/components/policy_editor/scan_execution/action/code_block_action.vue'; import CodeBlockAction from 'ee/security_orchestration/components/policy_editor/scan_execution/action/code_block_action.vue';
import CodeBlockFilePath from 'ee/security_orchestration/components/policy_editor/scan_execution/action/code_block_file_path.vue'; import CodeBlockFilePath from 'ee/security_orchestration/components/policy_editor/scan_execution/action/code_block_file_path.vue';
...@@ -75,7 +72,7 @@ describe('CodeBlockAction', () => { ...@@ -75,7 +72,7 @@ describe('CodeBlockAction', () => {
await findYamlEditor().vm.$emit('input', fileContents); await findYamlEditor().vm.$emit('input', fileContents);
expect(findCodeBlockImport().props('hasExistingCode')).toBe(true); expect(findCodeBlockImport().props('hasExistingCode')).toBe(true);
expect(wrapper.emitted('changed')).toEqual([ expect(wrapper.emitted('changed')).toEqual([
[{ ...buildCustomCodeAction(), ci_configuration: toYaml(fileContents) }], [{ ...buildCustomCodeAction(), ci_configuration: fileContents }],
]); ]);
}); });
...@@ -86,7 +83,7 @@ describe('CodeBlockAction', () => { ...@@ -86,7 +83,7 @@ describe('CodeBlockAction', () => {
expect(findYamlEditor().props('value')).toBe(fileContents); expect(findYamlEditor().props('value')).toBe(fileContents);
expect(findCodeBlockImport().props('hasExistingCode')).toBe(true); expect(findCodeBlockImport().props('hasExistingCode')).toBe(true);
expect(wrapper.emitted('changed')).toEqual([ expect(wrapper.emitted('changed')).toEqual([
[{ ...buildCustomCodeAction(), ci_configuration: toYaml(fileContents) }], [{ ...buildCustomCodeAction(), ci_configuration: fileContents }],
]); ]);
}); });
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册