diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 03:09:12 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 03:09:12 +0300 |
| commit | a97acfe57aac7d8206e99e5ffdfe9c5fb5b69544 (patch) | |
| tree | 2133036f5e917d2d795ddd750f5772d53b957c88 /spec | |
| parent | 76623c12c136f43f24c3966ed4b469e2c0b434b7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/frontend/.eslintrc.yml | 6 | ||||
| -rw-r--r-- | spec/frontend/gl_field_errors_spec.js | 2 | ||||
| -rw-r--r-- | spec/frontend/vue_shared/components/issue/issue_assignees_spec.js | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/import_export/safe_model_attributes.yml | 1 |
4 files changed, 8 insertions, 3 deletions
diff --git a/spec/frontend/.eslintrc.yml b/spec/frontend/.eslintrc.yml index e78a38d31f5..1dd8351f692 100644 --- a/spec/frontend/.eslintrc.yml +++ b/spec/frontend/.eslintrc.yml @@ -6,6 +6,12 @@ plugins: extends: - 'plugin:jest/recommended' settings: + # We have to teach eslint-plugin-import what node modules we use + # otherwise there is an error when it tries to resolve them + import/core-modules: + - events + - fs + - path import/resolver: jest: jestConfigFile: 'jest.config.js' diff --git a/spec/frontend/gl_field_errors_spec.js b/spec/frontend/gl_field_errors_spec.js index 4653f519f65..078659bf429 100644 --- a/spec/frontend/gl_field_errors_spec.js +++ b/spec/frontend/gl_field_errors_spec.js @@ -1,5 +1,3 @@ -/* eslint-disable arrow-body-style */ - import $ from 'jquery'; import GlFieldErrors from '~/gl_field_errors'; diff --git a/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js b/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js index b00261ae067..ca75c55df26 100644 --- a/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js +++ b/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js @@ -18,7 +18,7 @@ describe('IssueAssigneesComponent', () => { ...props, }, }); - vm = wrapper.vm; // eslint-disable-line + vm = wrapper.vm; }; const findTooltipText = () => wrapper.find('.js-assignee-tooltip').text(); diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml index 9c4854a30ad..ceed750253d 100644 --- a/spec/lib/gitlab/import_export/safe_model_attributes.yml +++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml @@ -783,6 +783,7 @@ ZoomMeeting: ServiceDeskSetting: - project_id - issue_template_key +- project_key ContainerExpirationPolicy: - created_at - updated_at |