feat: changes to some angular-eslint rules for v12 (#1050)

JamesHenry · web-flow · commit 4e563409471a · 2021-05-13T12:27:21.000-04:00
* feat: changes to some angular-eslint rules for v12

* test: increase coverage to 100%
diff --git a/src/converters/lintConfigs/rules/ruleConverters/codelyzer/template-accessibility-label-for.ts b/src/converters/lintConfigs/rules/ruleConverters/codelyzer/template-accessibility-label-for.ts
@@ -7,13 +7,24 @@ export const convertTemplateAccessibilityLabelFor: RuleConverter = (tslintRule)
                 ...(tslintRule.ruleArguments.length !== 0 && {
                     ruleArguments: [
                         {
-                            ...(tslintRule.ruleArguments[0]?.controlComponents && { controlComponents: tslintRule.ruleArguments[0]?.controlComponents }),
-                            ...(tslintRule.ruleArguments[0]?.labelAttributes && { labelAttributes: tslintRule.ruleArguments[0]?.labelAttributes }),
-                            ...(tslintRule.ruleArguments[0]?.labelComponents && { labelComponents: tslintRule.ruleArguments[0]?.labelComponents }),
+                            ...(tslintRule.ruleArguments[0]?.controlComponents && {
+                                controlComponents: tslintRule.ruleArguments[0]?.controlComponents,
+                            }),
+                            ...(tslintRule.ruleArguments[0]?.labelComponents && {
+                                labelComponents: tslintRule.ruleArguments[0]?.labelComponents.map(
+                                    (selector: string) => {
+                                        return {
+                                            inputs:
+                                                tslintRule.ruleArguments[0]?.labelAttributes || [],
+                                            selector,
+                                        };
+                                    },
+                                ),
+                            }),
                         },
                     ],
                 }),
-                ruleName: "@angular-eslint/template/accessibility-label-for",
+                ruleName: "@angular-eslint/template/accessibility-label-has-associated-control",
             },
         ],
         plugins: ["@angular-eslint/eslint-plugin-template"],
diff --git a/src/converters/lintConfigs/rules/ruleConverters/codelyzer/template-no-negated-async.ts b/src/converters/lintConfigs/rules/ruleConverters/codelyzer/template-no-negated-async.ts
@@ -3,6 +3,9 @@ import { RuleConverter } from "../../ruleConverter";
 export const convertTemplateNoNegatedAsync: RuleConverter = () => {
     return {
         rules: [
+            {
+                ruleName: "@angular-eslint/template/eqeqeq",
+            },
             {
                 ruleName: "@angular-eslint/template/no-negated-async",
             },
diff --git a/src/converters/lintConfigs/rules/ruleConverters/codelyzer/tests/template-accessibility-label-for.test.ts b/src/converters/lintConfigs/rules/ruleConverters/codelyzer/tests/template-accessibility-label-for.test.ts
@@ -9,7 +9,7 @@ describe(convertTemplateAccessibilityLabelFor, () => {
         expect(result).toEqual({
             rules: [
                 {
-                    ruleName: "@angular-eslint/template/accessibility-label-for",
+                    ruleName: "@angular-eslint/template/accessibility-label-has-associated-control",
                 },
             ],
             plugins: ["@angular-eslint/eslint-plugin-template"],
@@ -18,11 +18,44 @@ describe(convertTemplateAccessibilityLabelFor, () => {
 
     test("conversion with arguments", () => {
         const result = convertTemplateAccessibilityLabelFor({
-            ruleArguments: [{
-                controlComponents: ["app-input", "app-select"],
-                labelAttributes: ["id"],
-                labelComponents: ["app-label"],
-            }],
+            ruleArguments: [
+                {
+                    controlComponents: ["app-input", "app-select"],
+                    labelAttributes: ["id"],
+                    labelComponents: ["app-label"],
+                },
+            ],
+        });
+
+        expect(result).toEqual({
+            rules: [
+                {
+                    ruleArguments: [
+                        {
+                            controlComponents: ["app-input", "app-select"],
+                            labelComponents: [
+                                {
+                                    inputs: ["id"],
+                                    selector: "app-label",
+                                },
+                            ],
+                        },
+                    ],
+                    ruleName: "@angular-eslint/template/accessibility-label-has-associated-control",
+                },
+            ],
+            plugins: ["@angular-eslint/eslint-plugin-template"],
+        });
+    });
+
+    test("conversion with arguments, missing labelAttributes", () => {
+        const result = convertTemplateAccessibilityLabelFor({
+            ruleArguments: [
+                {
+                    controlComponents: ["app-input", "app-select"],
+                    labelComponents: ["app-label"],
+                },
+            ],
         });
 
         expect(result).toEqual({
@@ -31,11 +64,15 @@ describe(convertTemplateAccessibilityLabelFor, () => {
                     ruleArguments: [
                         {
                             controlComponents: ["app-input", "app-select"],
-                            labelAttributes: ["id"],
-                            labelComponents: ["app-label"],
-                        }
+                            labelComponents: [
+                                {
+                                    inputs: [],
+                                    selector: "app-label",
+                                },
+                            ],
+                        },
                     ],
-                    ruleName: "@angular-eslint/template/accessibility-label-for",
+                    ruleName: "@angular-eslint/template/accessibility-label-has-associated-control",
                 },
             ],
             plugins: ["@angular-eslint/eslint-plugin-template"],
diff --git a/src/converters/lintConfigs/rules/ruleConverters/codelyzer/tests/template-no-negated-async.test.ts b/src/converters/lintConfigs/rules/ruleConverters/codelyzer/tests/template-no-negated-async.test.ts
@@ -8,6 +8,9 @@ describe(convertTemplateNoNegatedAsync, () => {
 
         expect(result).toEqual({
             rules: [
+                {
+                    ruleName: "@angular-eslint/template/eqeqeq",
+                },
                 {
                     ruleName: "@angular-eslint/template/no-negated-async",
                 },

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,9 @@ describe(convertTemplateNoNegatedAsync, () => {`
`8`	`8`
`9`	`9`	`expect(result).toEqual({`
`10`	`10`	`rules: [`
	`11`	`+ {`
	`12`	`+ ruleName: "@angular-eslint/template/eqeqeq",`
	`13`	`+ },`
`11`	`14`	`{`
`12`	`15`	`ruleName: "@angular-eslint/template/no-negated-async",`
`13`	`16`	`},`