diff options
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | spec/javascripts/.eslintrc.yml | 6 | ||||
| -rw-r--r-- | spec/javascripts/close_reopen_report_toggle_spec.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/lib/utils/poll_spec.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/right_sidebar_spec.js | 2 | ||||
| -rw-r--r-- | yarn.lock | 6 |
6 files changed, 15 insertions, 5 deletions
diff --git a/package.json b/package.json index 2f176f643e0..f22d684970a 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "eslint-plugin-filenames": "^1.3.2", "eslint-plugin-html": "4.0.5", "eslint-plugin-import": "^2.14.0", - "eslint-plugin-jasmine": "^2.1.0", + "eslint-plugin-jasmine": "^2.10.1", "eslint-plugin-promise": "^4.0.1", "eslint-plugin-vue": "^5.0.0-beta.3", "gettext-extractor": "^3.3.2", diff --git a/spec/javascripts/.eslintrc.yml b/spec/javascripts/.eslintrc.yml index 5525c9f5bd0..9b2c84ce9f5 100644 --- a/spec/javascripts/.eslintrc.yml +++ b/spec/javascripts/.eslintrc.yml @@ -35,3 +35,9 @@ rules: - error - ignore: - 'fixtures/blob' + # Temporarily disabled to facilitate an upgrade to eslint-plugin-jasmine + jasmine/new-line-before-expect: off + jasmine/new-line-between-declarations: off + jasmine/no-promise-without-done-fail: off + jasmine/prefer-jasmine-matcher: off + jasmine/prefer-toHaveBeenCalledWith: off diff --git a/spec/javascripts/close_reopen_report_toggle_spec.js b/spec/javascripts/close_reopen_report_toggle_spec.js index 925e959c85a..412abe2cbf8 100644 --- a/spec/javascripts/close_reopen_report_toggle_spec.js +++ b/spec/javascripts/close_reopen_report_toggle_spec.js @@ -1,3 +1,5 @@ +/* eslint-disable jasmine/no-unsafe-spy */ + import CloseReopenReportToggle from '~/close_reopen_report_toggle'; import DropLab from '~/droplab/drop_lab'; diff --git a/spec/javascripts/lib/utils/poll_spec.js b/spec/javascripts/lib/utils/poll_spec.js index 523f4997bc0..b28a052902e 100644 --- a/spec/javascripts/lib/utils/poll_spec.js +++ b/spec/javascripts/lib/utils/poll_spec.js @@ -1,3 +1,5 @@ +/* eslint-disable jasmine/no-unsafe-spy */ + import Poll from '~/lib/utils/poll'; import { successCodes } from '~/lib/utils/http_status'; diff --git a/spec/javascripts/right_sidebar_spec.js b/spec/javascripts/right_sidebar_spec.js index 6d49536a712..c7190ea9960 100644 --- a/spec/javascripts/right_sidebar_spec.js +++ b/spec/javascripts/right_sidebar_spec.js @@ -1,4 +1,4 @@ -/* eslint-disable no-var, one-var, one-var-declaration-per-line, no-return-assign, vars-on-top, max-len */ +/* eslint-disable no-var, one-var, one-var-declaration-per-line, no-return-assign, vars-on-top, jasmine/no-unsafe-spy, max-len */ import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; diff --git a/yarn.lock b/yarn.lock index 34e1752cb2c..3d30a5febbb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2727,9 +2727,9 @@ eslint-plugin-import@^2.14.0: read-pkg-up "^2.0.0" resolve "^1.6.0" -eslint-plugin-jasmine@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-2.2.0.tgz#7135879383c39a667c721d302b9f20f0389543de" +eslint-plugin-jasmine@^2.10.1: + version "2.10.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jasmine/-/eslint-plugin-jasmine-2.10.1.tgz#5733b709e751f4bc40e31e1c16989bd2cdfbec97" eslint-plugin-promise@^4.0.1: version "4.0.1" |