summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-04-11 07:41:02 +0000
committerPhil Hughes <me@iamphill.com>2019-04-11 07:41:02 +0000
commitcd770031736419c142990d7474a98b835ac97a92 (patch)
tree2a5d358aa6c0745684132a25f556933323929bb8
parentc2443d0aa5262f036bc40b13cca92864fd5a98c1 (diff)
parentc5094f361ffdb86c7c33c3e367b33d878efbead8 (diff)
downloadgitlab-ce-cd770031736419c142990d7474a98b835ac97a92.tar.gz
Merge branch 'winh-eslint-jest' into 'master'
Enable eslint-plugin-jest for Jest Closes #59636 See merge request gitlab-org/gitlab-ce!26715
-rw-r--r--spec/frontend/.eslintrc.yml7
1 files changed, 2 insertions, 5 deletions
diff --git a/spec/frontend/.eslintrc.yml b/spec/frontend/.eslintrc.yml
index ff18f0e4a2d..e78a38d31f5 100644
--- a/spec/frontend/.eslintrc.yml
+++ b/spec/frontend/.eslintrc.yml
@@ -3,6 +3,8 @@ env:
jest/globals: true
plugins:
- jest
+extends:
+ - 'plugin:jest/recommended'
settings:
import/resolver:
jest:
@@ -12,8 +14,3 @@ globals:
loadFixtures: false
preloadFixtures: false
setFixtures: false
-rules:
- jest/no-identical-title: error
- jest/no-focused-tests: error
- jest/valid-describe: error
- jest/no-jasmine-globals: error