Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-15 12:08:57 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-15 12:08:57 +0300
commit45a8c43afe8a17de19a92708b380b29b6ae04ce6 (patch)
tree4104e6ac741fbbdeefe9b8b699650a06c14e9056 /spec/frontend/ci/pipeline_editor
parent6bc327a3491069240bd73cc83e17b3078c4148b0 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/ci/pipeline_editor')
-rw-r--r--spec/frontend/ci/pipeline_editor/components/job_assistant_drawer/accordion_items/image_item_spec.js8
-rw-r--r--spec/frontend/ci/pipeline_editor/components/job_assistant_drawer/accordion_items/services_item_spec.js2
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/frontend/ci/pipeline_editor/components/job_assistant_drawer/accordion_items/image_item_spec.js b/spec/frontend/ci/pipeline_editor/components/job_assistant_drawer/accordion_items/image_item_spec.js
index c7c40c3a4b9..f99d7277612 100644
--- a/spec/frontend/ci/pipeline_editor/components/job_assistant_drawer/accordion_items/image_item_spec.js
+++ b/spec/frontend/ci/pipeline_editor/components/job_assistant_drawer/accordion_items/image_item_spec.js
@@ -8,8 +8,8 @@ describe('Image item', () => {
const findImageNameInput = () => wrapper.findByTestId('image-name-input');
const findImageEntrypointInput = () => wrapper.findByTestId('image-entrypoint-input');
- const dummyImageName = 'dummyImageName';
- const dummyImageEntrypoint = 'dummyImageEntrypoint';
+ const dummyImageName = 'a';
+ const dummyImageEntrypoint = ['b', 'c'];
const createComponent = ({ job = JSON.parse(JSON.stringify(JOB_TEMPLATE)) } = {}) => {
wrapper = shallowMountExtended(ImageItem, {
@@ -31,9 +31,9 @@ describe('Image item', () => {
expect(wrapper.emitted('update-job')).toHaveLength(1);
expect(wrapper.emitted('update-job')[0]).toEqual(['image.name', dummyImageName]);
- findImageEntrypointInput().vm.$emit('input', dummyImageEntrypoint);
+ findImageEntrypointInput().vm.$emit('input', dummyImageEntrypoint.join('\n'));
expect(wrapper.emitted('update-job')).toHaveLength(2);
- expect(wrapper.emitted('update-job')[1]).toEqual(['image.entrypoint', [dummyImageEntrypoint]]);
+ expect(wrapper.emitted('update-job')[1]).toEqual(['image.entrypoint', dummyImageEntrypoint]);
});
});
diff --git a/spec/frontend/ci/pipeline_editor/components/job_assistant_drawer/accordion_items/services_item_spec.js b/spec/frontend/ci/pipeline_editor/components/job_assistant_drawer/accordion_items/services_item_spec.js
index 07b3526f5fa..284d639c77f 100644
--- a/spec/frontend/ci/pipeline_editor/components/job_assistant_drawer/accordion_items/services_item_spec.js
+++ b/spec/frontend/ci/pipeline_editor/components/job_assistant_drawer/accordion_items/services_item_spec.js
@@ -34,7 +34,7 @@ describe('Services item', () => {
expect(wrapper.emitted('update-job')).toHaveLength(1);
expect(wrapper.emitted('update-job')[0]).toEqual(['services[0].name', dummyServiceName]);
- findServiceEntrypointInputByIndex(0).vm.$emit('input', dummyServiceEntrypoint.join(','));
+ findServiceEntrypointInputByIndex(0).vm.$emit('input', dummyServiceEntrypoint.join('\n'));
expect(wrapper.emitted('update-job')).toHaveLength(2);
expect(wrapper.emitted('update-job')[1]).toEqual([