diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 09:08:52 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 09:08:52 +0300 |
| commit | fa478f189009649b115136957e2da30d760fe391 (patch) | |
| tree | 32933cd0a238da9c942ad2d02c0c56d55cdf03d2 /spec | |
| parent | cfbaef3f1c28cdb9b15615215b87167181cb210f (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 |
3 files changed, 3 insertions, 7 deletions
diff --git a/spec/frontend/.eslintrc.yml b/spec/frontend/.eslintrc.yml index 1dd8351f692..e78a38d31f5 100644 --- a/spec/frontend/.eslintrc.yml +++ b/spec/frontend/.eslintrc.yml @@ -6,12 +6,6 @@ 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 078659bf429..4653f519f65 100644 --- a/spec/frontend/gl_field_errors_spec.js +++ b/spec/frontend/gl_field_errors_spec.js @@ -1,3 +1,5 @@ +/* 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 ca75c55df26..b00261ae067 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; + vm = wrapper.vm; // eslint-disable-line }; const findTooltipText = () => wrapper.find('.js-assignee-tooltip').text(); |