Commit 904e1559 authored by Scott Hampton's avatar Scott Hampton

Merge branch 'hook-up-editor-lite-lint' into 'master'

Hook up editor lite to CI lint view

See merge request gitlab-org/gitlab!45313
parents 043c95a0 795f8835
<script> <script>
import { GlButton, GlFormCheckbox, GlIcon, GlLink, GlAlert } from '@gitlab/ui'; import { GlButton, GlFormCheckbox, GlIcon, GlLink, GlAlert } from '@gitlab/ui';
import EditorLite from '~/vue_shared/components/editor_lite.vue';
import CiLintResults from './ci_lint_results.vue'; import CiLintResults from './ci_lint_results.vue';
import lintCIMutation from '../graphql/mutations/lint_ci.mutation.graphql'; import lintCIMutation from '../graphql/mutations/lint_ci.mutation.graphql';
...@@ -11,6 +12,7 @@ export default { ...@@ -11,6 +12,7 @@ export default {
GlLink, GlLink,
GlAlert, GlAlert,
CiLintResults, CiLintResults,
EditorLite,
}, },
props: { props: {
endpoint: { endpoint: {
...@@ -62,6 +64,9 @@ export default { ...@@ -62,6 +64,9 @@ export default {
this.isErrorDismissed = false; this.isErrorDismissed = false;
} }
}, },
clear() {
this.content = '';
},
}, },
}; };
</script> </script>
...@@ -76,22 +81,31 @@ export default { ...@@ -76,22 +81,31 @@ export default {
@dismiss="isErrorDismissed = true" @dismiss="isErrorDismissed = true"
>{{ apiError }}</gl-alert >{{ apiError }}</gl-alert
> >
<div class="file-holder gl-mb-3">
<textarea v-model="content" cols="175" rows="20"></textarea> <div class="js-file-title file-title clearfix">
{{ __('Contents of .gitlab-ci.yml') }}
</div>
<editor-lite v-model="content" file-name="*.yml" />
</div>
</div> </div>
<div class="col-sm-12 gl-display-flex gl-justify-content-space-between"> <div class="col-sm-12 gl-display-flex gl-justify-content-space-between">
<div class="gl-display-flex gl-align-items-center"> <div class="gl-display-flex gl-align-items-center">
<gl-button class="gl-mr-4" category="primary" variant="success" @click="lint">{{ <gl-button
__('Validate') class="gl-mr-4"
}}</gl-button> category="primary"
variant="success"
data-testid="ci-lint-validate"
@click="lint"
>{{ __('Validate') }}</gl-button
>
<gl-form-checkbox v-model="dryRun" <gl-form-checkbox v-model="dryRun"
>{{ __('Simulate a pipeline created for the default branch') }} >{{ __('Simulate a pipeline created for the default branch') }}
<gl-link :href="helpPagePath" target="_blank" <gl-link :href="helpPagePath" target="_blank"
><gl-icon class="gl-text-blue-600" name="question-o"/></gl-link ><gl-icon class="gl-text-blue-600" name="question-o"/></gl-link
></gl-form-checkbox> ></gl-form-checkbox>
</div> </div>
<gl-button>{{ __('Clear') }}</gl-button> <gl-button data-testid="ci-lint-clear" @click="clear">{{ __('Clear') }}</gl-button>
</div> </div>
<ci-lint-results <ci-lint-results
......
import { shallowMount } from '@vue/test-utils';
import EditorLite from '~/vue_shared/components/editor_lite.vue';
import CiLint from '~/ci_lint/components/ci_lint.vue';
import lintCIMutation from '~/ci_lint/graphql/mutations/lint_ci.mutation.graphql';
describe('CI Lint', () => {
let wrapper;
const endpoint = '/namespace/project/-/ci/lint';
const content =
"test_job:\n stage: build\n script: echo 'Building'\n only:\n - web\n - chat\n - pushes\n allow_failure: true ";
const createComponent = () => {
wrapper = shallowMount(CiLint, {
data() {
return {
content,
};
},
propsData: {
endpoint,
helpPagePath: '/help/ci/lint#pipeline-simulation',
},
mocks: {
$apollo: {
mutate: jest.fn(),
},
},
});
};
const findEditor = () => wrapper.find(EditorLite);
const findValidateBtn = () => wrapper.find('[data-testid="ci-lint-validate"]');
const findClearBtn = () => wrapper.find('[data-testid="ci-lint-clear"]');
beforeEach(() => {
createComponent();
});
afterEach(() => {
wrapper.destroy();
});
it('displays the editor', () => {
expect(findEditor().exists()).toBe(true);
});
it('validate action calls mutation correctly', () => {
findValidateBtn().vm.$emit('click');
expect(wrapper.vm.$apollo.mutate).toHaveBeenCalledWith({
mutation: lintCIMutation,
variables: { content, dry: false, endpoint },
});
});
it('validate action calls mutation with dry run', async () => {
const dryRunEnabled = true;
await wrapper.setData({ dryRun: dryRunEnabled });
findValidateBtn().vm.$emit('click');
expect(wrapper.vm.$apollo.mutate).toHaveBeenCalledWith({
mutation: lintCIMutation,
variables: { content, dry: dryRunEnabled, endpoint },
});
});
it('content is cleared on clear action', async () => {
expect(findEditor().props('value')).toBe(content);
await findClearBtn().vm.$emit('click');
expect(findEditor().props('value')).toBe('');
});
});
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