Fixed issues from rebase

Author: rbitting

lib/util/ruleFactory.ts

@@ -89,8 +89,8 @@ export function hasAccessibleLabel(
     const allowTextContentChild = !!config.allowTextContentChild;
 
     if (allowFieldParent && hasFieldParent(context)) return true;
-    if (requiredProps?.every(p => hasDefinedProp(node.attributes, p))) return true;
-    if (labelProps?.some(p => hasNonEmptyProp(node.attributes, p))) return true;
+    if (requiredProps?.every(p => hasDefinedProp(opening.attributes, p))) return true;
+    if (labelProps?.some(p => hasNonEmptyProp(opening.attributes, p))) return true;
     if (allowWrappingLabel && isInsideLabelTag(context)) return true;
     if (allowHtmlFor && hasAssociatedLabelViaHtmlFor(opening, context)) return true;
     if (allowLabelledBy && hasAssociatedLabelViaAriaLabelledBy(opening, context)) return true;

tests/lib/rules/utils/ruleFactory.test.ts

@@ -1,26 +1,31 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
+import type { TSESLint, TSESTree } from "@typescript-eslint/utils";
 import { AST_NODE_TYPES } from "@typescript-eslint/utils";
+import { Rule, RuleTester } from "eslint";
 
+import { hasDefinedProp } from "../../../../lib/util/hasDefinedProp";
+import { hasFieldParent } from "../../../../lib/util/hasFieldParent";
+import { hasLabeledChild } from "../../../../lib/util/hasLabeledChild";
 import { hasNonEmptyProp } from "../../../../lib/util/hasNonEmptyProp";
+import { hasTextContentChild } from "../../../../lib/util/hasTextContentChild";
+import { hasToolTipParent } from "../../../../lib/util/hasTooltipParent";
 import {
+    hasAssociatedLabelViaAriaDescribedby,
     hasAssociatedLabelViaAriaLabelledBy,
-    isInsideLabelTag,
     hasAssociatedLabelViaHtmlFor,
-    hasAssociatedLabelViaAriaDescribedby
+    isInsideLabelTag
 } from "../../../../lib/util/labelUtils";
-import { hasFieldParent } from "../../../../lib/util/hasFieldParent";
 import { hasAccessibleLabel, LabeledControlConfig, makeLabeledControlRule } from "../../../../lib/util/ruleFactory";
-import type { TSESLint, TSESTree } from "@typescript-eslint/utils";
-import { Rule, RuleTester } from "eslint";
-import { hasLabeledChild } from "../../../../lib/util/hasLabeledChild";
-import { hasToolTipParent } from "../../../../lib/util/hasTooltipParent";
-import { hasTextContentChild } from "../../../../lib/util/hasTextContentChild";
 
 jest.mock("../../../../lib/util/hasDefinedProp", () => ({
     hasDefinedProp: jest.fn()
 }));
+
+jest.mock("../../../../lib/util/hasNonEmptyProp", () => ({
+    hasNonEmptyProp: jest.fn()
+}));
 jest.mock("../../../../lib/util/labelUtils", () => ({
     hasAssociatedLabelViaAriaDescribedby: jest.fn(),
     hasAssociatedLabelViaAriaLabelledBy: jest.fn(),
@@ -36,8 +41,6 @@ jest.mock("../../../../lib/util/hasLabeledChild", () => ({
 jest.mock("../../../../lib/util/hasTooltipParent", () => ({
     hasToolTipParent: jest.fn()
 }));
-
-import { hasDefinedProp } from "../../../../lib/util/hasDefinedProp";
 jest.mock("../../../../lib/util/hasTextContentChild", () => ({
     hasTextContentChild: jest.fn()
 }));