From fcf547a1ec5167f8924de8acc3c2fa579a20bb7f Mon Sep 17 00:00:00 2001 From: timdeschryver <28659384+timdeschryver@users.noreply.github.com> Date: Sat, 24 Apr 2021 21:06:44 +0200 Subject: [PATCH 1/2] chore: fix linting problems --- .eslintrc.json | 9 +-------- angular.json | 14 +++----------- apps/example-app/.eslintrc.json | 4 ++++ projects/jest-utils/.eslintrc.json | 4 ++-- projects/jest-utils/tests/create-mock.spec.ts | 4 ++-- projects/testing-library/.eslintrc.json | 4 ++-- .../testing-library/src/lib/testing-library.ts | 1 + .../testing-library/tests/auto-cleanup.spec.ts | 4 ++-- projects/testing-library/tests/config.spec.ts | 2 +- projects/testing-library/tests/debug.spec.ts | 6 +++--- .../testing-library/tests/detect-changes.spec.ts | 2 +- projects/testing-library/tests/find-by.spec.ts | 2 +- projects/testing-library/tests/fire-event.spec.ts | 2 +- projects/testing-library/tests/navigate.spec.ts | 2 +- .../tests/providers/component-provider.spec.ts | 2 +- .../tests/providers/module-provider.spec.ts | 2 +- .../testing-library/tests/render-template.spec.ts | 4 +--- projects/testing-library/tests/render.spec.ts | 4 ++-- projects/testing-library/tests/rerender.spec.ts | 6 +++--- .../tests/wait-for-element-to-be-removed.spec.ts | 2 +- projects/testing-library/tests/wait-for.spec.ts | 2 +- 21 files changed, 35 insertions(+), 47 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index b740f815..cde0f6cf 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -49,7 +49,7 @@ ], "@typescript-eslint/no-unused-expressions": "error", "@typescript-eslint/prefer-function-type": "error", - "@typescript-eslint/quotes": ["error", "single"], + "@typescript-eslint/quotes": "off", "@typescript-eslint/type-annotation-spacing": "error", "@typescript-eslint/no-explicit-any": "off", "arrow-body-style": "error", @@ -105,13 +105,6 @@ ] } }, - { - "files": ["*.spec.ts"], - "extends": ["plugin:testing-library/angular", "plugin:jest-dom/recommended"], - "rules": { - "testing-library/prefer-explicit-assert": "error" - } - }, { "files": ["*.html"], "rules": {} diff --git a/angular.json b/angular.json index 46f51c32..376b9ca6 100644 --- a/angular.json +++ b/angular.json @@ -71,7 +71,7 @@ "lint": { "builder": "@nrwl/linter:eslint", "options": { - "lintFilePatterns": ["apps/example-app/src/**/*.ts", "apps/example-app/src/**/*.html"] + "lintFilePatterns": ["apps/example-app/**/*.ts", "apps/example-app/**/*.html"] } }, "test": { @@ -106,11 +106,7 @@ "lint": { "builder": "@nrwl/linter:eslint", "options": { - "lintFilePatterns": [ - "projects/testing-library/src/**/*.ts", - "projects/testing-library/src/**/*.html", - "projects/testing-library/src/**/*.html" - ] + "lintFilePatterns": ["projects/testing-library/**/*.ts", "projects/testing-library/**/*.html"] } }, "build": { @@ -159,11 +155,7 @@ "lint": { "builder": "@nrwl/linter:eslint", "options": { - "lintFilePatterns": [ - "projects/jest-utils/src/**/*.ts", - "projects/jest-utils/src/**/*.html", - "projects/jest-utils/src/**/*.html" - ] + "lintFilePatterns": ["projects/jest-utils/**/*.ts", "projects/jest-utils/**/*.html"] } }, "build": { diff --git a/apps/example-app/.eslintrc.json b/apps/example-app/.eslintrc.json index 2e1ae78b..38181327 100644 --- a/apps/example-app/.eslintrc.json +++ b/apps/example-app/.eslintrc.json @@ -28,6 +28,10 @@ }, "plugins": ["@angular-eslint/eslint-plugin", "@typescript-eslint"] }, + { + "files": ["*.spec.ts"], + "extends": ["plugin:testing-library/angular", "plugin:jest-dom/recommended"] + }, { "files": ["*.html"], "extends": ["plugin:@nrwl/nx/angular-template"], diff --git a/projects/jest-utils/.eslintrc.json b/projects/jest-utils/.eslintrc.json index 4687290e..90906e5b 100644 --- a/projects/jest-utils/.eslintrc.json +++ b/projects/jest-utils/.eslintrc.json @@ -13,7 +13,7 @@ "error", { "type": "attribute", - "prefix": "lib", + "prefix": "atl", "style": "camelCase" } ], @@ -21,7 +21,7 @@ "error", { "type": "element", - "prefix": "lib", + "prefix": "atl", "style": "kebab-case" } ] diff --git a/projects/jest-utils/tests/create-mock.spec.ts b/projects/jest-utils/tests/create-mock.spec.ts index 9494f8cb..6e313a22 100644 --- a/projects/jest-utils/tests/create-mock.spec.ts +++ b/projects/jest-utils/tests/create-mock.spec.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; import { TestBed } from '@angular/core/testing'; +import { fireEvent, render } from '@testing-library/angular'; import { createMock, provideMock, Mock } from '../src/public_api'; -import { render, fireEvent } from '../../testing-library/src/public_api'; class FixtureService { constructor(private foo: string, public bar: string) {} @@ -13,7 +13,7 @@ class FixtureService { } @Component({ - selector: 'fixture', + selector: 'atl-fixture', template: ` `, }) export class FixtureComponent { diff --git a/projects/testing-library/.eslintrc.json b/projects/testing-library/.eslintrc.json index f3960e87..a76c4ce4 100644 --- a/projects/testing-library/.eslintrc.json +++ b/projects/testing-library/.eslintrc.json @@ -13,7 +13,7 @@ "error", { "type": "attribute", - "prefix": "lib", + "prefix": ["atl"], "style": "camelCase" } ], @@ -21,7 +21,7 @@ "error", { "type": "element", - "prefix": "lib", + "prefix": ["atl"], "style": "kebab-case" } ] diff --git a/projects/testing-library/src/lib/testing-library.ts b/projects/testing-library/src/lib/testing-library.ts index fe3a22ca..b02c905d 100644 --- a/projects/testing-library/src/lib/testing-library.ts +++ b/projects/testing-library/src/lib/testing-library.ts @@ -358,6 +358,7 @@ if (typeof afterEach === 'function' && !process.env.ATL_SKIP_AUTO_CLEANUP) { }); } +// TODO: rename to `atl-wrapper-component` // eslint-disable-next-line @angular-eslint/component-selector @Component({ selector: 'wrapper-component', template: '' }) class WrapperComponent {} diff --git a/projects/testing-library/tests/auto-cleanup.spec.ts b/projects/testing-library/tests/auto-cleanup.spec.ts index 13f0de8c..a22b646c 100644 --- a/projects/testing-library/tests/auto-cleanup.spec.ts +++ b/projects/testing-library/tests/auto-cleanup.spec.ts @@ -2,8 +2,8 @@ import { Component, Input } from '@angular/core'; import { render } from '../src/public_api'; @Component({ - selector: 'fixture', - template: ` Hello {{ name }}! `, + selector: 'atl-fixture', + template: `Hello {{ name }}!`, }) class FixtureComponent { @Input() name: string; diff --git a/projects/testing-library/tests/config.spec.ts b/projects/testing-library/tests/config.spec.ts index 06a79915..ccd004f5 100644 --- a/projects/testing-library/tests/config.spec.ts +++ b/projects/testing-library/tests/config.spec.ts @@ -4,7 +4,7 @@ import { render, configure } from '../src/public_api'; import { ReactiveFormsModule, FormBuilder } from '@angular/forms'; @Component({ - selector: 'app-fixture', + selector: 'atl-fixture', template: `