From d57021e1cc82d68b9ed1c3e4b17a5065df0d4f6a Mon Sep 17 00:00:00 2001 From: LB Johnston Date: Wed, 1 Jun 2022 18:53:05 +1000 Subject: [PATCH] clean up eslint for test files - disable general rules to make writing tests simpler --- .eslintrc.js | 3 +++ client/src/components/StreamField/blocks/FieldBlock.test.js | 2 -- client/src/components/StreamField/blocks/ListBlock.test.js | 2 -- client/src/components/StreamField/blocks/StreamBlock.test.js | 2 -- client/src/components/StreamField/blocks/StructBlock.test.js | 2 -- .../contrib/typed_table_block/typed_table_block.test.js | 2 -- client/src/utils/text.test.js | 1 - 7 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 206c3184d2..c1722a8782 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -116,9 +116,12 @@ module.exports = { ], rules: { '@typescript-eslint/no-empty-function': 'off', + '@typescript-eslint/no-unused-vars': 'off', '@typescript-eslint/no-var-requires': 'off', + 'global-require': 'off', 'import/first': 'off', 'import/no-extraneous-dependencies': 'off', + 'no-unused-expressions': 'off', 'react/function-component-definition': 'off', 'react/jsx-props-no-spreading': 'off', }, diff --git a/client/src/components/StreamField/blocks/FieldBlock.test.js b/client/src/components/StreamField/blocks/FieldBlock.test.js index 65fbb9efb1..b7ac878649 100644 --- a/client/src/components/StreamField/blocks/FieldBlock.test.js +++ b/client/src/components/StreamField/blocks/FieldBlock.test.js @@ -1,5 +1,3 @@ -/* eslint-disable @typescript-eslint/no-unused-vars */ - import $ from 'jquery'; import { FieldBlockDefinition } from './FieldBlock'; diff --git a/client/src/components/StreamField/blocks/ListBlock.test.js b/client/src/components/StreamField/blocks/ListBlock.test.js index cdaa03142e..e17d87dbde 100644 --- a/client/src/components/StreamField/blocks/ListBlock.test.js +++ b/client/src/components/StreamField/blocks/ListBlock.test.js @@ -1,5 +1,3 @@ -/* eslint-disable @typescript-eslint/no-unused-vars */ - import $ from 'jquery'; import { FieldBlock, FieldBlockDefinition } from './FieldBlock'; import { ListBlockDefinition, ListBlockValidationError } from './ListBlock'; diff --git a/client/src/components/StreamField/blocks/StreamBlock.test.js b/client/src/components/StreamField/blocks/StreamBlock.test.js index 9fffb3e8ee..887e112db4 100644 --- a/client/src/components/StreamField/blocks/StreamBlock.test.js +++ b/client/src/components/StreamField/blocks/StreamBlock.test.js @@ -1,5 +1,3 @@ -/* eslint-disable @typescript-eslint/no-unused-vars */ - import $ from 'jquery'; import { FieldBlockDefinition } from './FieldBlock'; import { diff --git a/client/src/components/StreamField/blocks/StructBlock.test.js b/client/src/components/StreamField/blocks/StructBlock.test.js index 20908ad094..e3f6b4b309 100644 --- a/client/src/components/StreamField/blocks/StructBlock.test.js +++ b/client/src/components/StreamField/blocks/StructBlock.test.js @@ -1,5 +1,3 @@ -/* eslint-disable @typescript-eslint/no-unused-vars */ - import $ from 'jquery'; import { FieldBlockDefinition } from './FieldBlock'; import { diff --git a/client/src/entrypoints/contrib/typed_table_block/typed_table_block.test.js b/client/src/entrypoints/contrib/typed_table_block/typed_table_block.test.js index e1a115d6ba..38d1c98b7d 100644 --- a/client/src/entrypoints/contrib/typed_table_block/typed_table_block.test.js +++ b/client/src/entrypoints/contrib/typed_table_block/typed_table_block.test.js @@ -1,5 +1,3 @@ -/* eslint-disable @typescript-eslint/no-unused-vars */ - import '../../admin/telepath/telepath'; import $ from 'jquery'; import { TypedTableBlockDefinition } from './typed_table_block'; diff --git a/client/src/utils/text.test.js b/client/src/utils/text.test.js index c28e53fc2e..eade4ba3f1 100644 --- a/client/src/utils/text.test.js +++ b/client/src/utils/text.test.js @@ -10,7 +10,6 @@ describe('escapeHtml', () => { }); describe('cleanForSlug', () => { - // eslint-disable-next-line no-unused-expressions, global-require require('../../../wagtail/admin/static_src/wagtailadmin/js/vendor/urlify') .default;