eslint-plugin-playwright 1.4.0 → 1.4.2

package/dist/index.js

@@ -112,7 +112,7 @@ var resolveToPlaywrightFn = (context, accessor) => {
     local: resolved
   };
 };
-function determinePlaywrightFnType(name) {
+function determinePlaywrightFnGroup(name) {
   if (name === "step")
     return "step";
   if (name === "expect")
@@ -165,6 +165,7 @@ var parseExpectCall = (call) => {
   return {
     ...call,
     args: getExpectArguments(call),
+    group: "expect",
     type: "expect",
     ...modifiersAndMatcher
   };
@@ -204,8 +205,8 @@ function parse(context, node) {
   }
   if (name === "test" && links.length > 1) {
     const nextLinkName = links[1];
-    const nextLinkType = determinePlaywrightFnType(nextLinkName);
-    if (nextLinkType !== "unknown") {
+    const nextLinkGroup = determinePlaywrightFnGroup(nextLinkName);
+    if (nextLinkGroup !== "unknown") {
       name = nextLinkName;
     }
   }
@@ -216,8 +217,8 @@ function parse(context, node) {
     members: rest,
     name
   };
-  const type = determinePlaywrightFnType(name);
-  if (type === "expect") {
+  const group = determinePlaywrightFnGroup(name);
+  if (group === "expect") {
     const result = parseExpectCall(parsedFnCall);
     if (typeof result === "string" && findTopMostCallExpression(node) !== node) {
       return null;
@@ -236,7 +237,15 @@ function parse(context, node) {
   if (parent?.type === "CallExpression" || parent?.type === "MemberExpression") {
     return null;
   }
-  return { ...parsedFnCall, type };
+  let type = group;
+  if ((name === "test" || name === "describe") && (node.arguments.length !== 2 || !isFunction(node.arguments[1]))) {
+    type = "config";
+  }
+  return {
+    ...parsedFnCall,
+    group,
+    type
+  };
 }
 var cache = /* @__PURE__ */ new WeakMap();
 function parseFnCallWithReason(context, node) {
@@ -790,11 +799,7 @@ var no_conditional_in_test_default = {
       const call = findParent(node, "CallExpression");
       if (!call)
         return;
-      const fnCall = parseFnCall(context, call);
-      if (fnCall?.type === "test" && fnCall.members.some((member) => getStringValue(member) === "skip") && call.arguments[0]?.type === "LogicalExpression") {
-        return;
-      }
-      if (fnCall?.type === "test" || fnCall?.type === "step") {
+      if (isTypeOfFnCall(context, call, ["test", "step"])) {
         context.report({ messageId: "conditionalInTest", node });
       }
     }
@@ -1404,14 +1409,14 @@ var no_skipped_test_default = {
         const options = context.options[0] || {};
         const allowConditional = !!options.allowConditional;
         const call = parseFnCall(context, node);
-        if (call?.type !== "test" && call?.type !== "describe") {
+        if (call?.group !== "test" && call?.group !== "describe") {
           return;
         }
         const skipNode = call.members.find((s) => getStringValue(s) === "skip");
         if (!skipNode)
           return;
-        const isStandalone = call.type === "test" && !isFunction(node.arguments[1]);
-        if (isStandalone && allowConditional && node.arguments.length) {
+        const isStandalone = call.type === "config";
+        if (isStandalone && allowConditional) {
           return;
         }
         context.report({
@@ -2732,7 +2737,7 @@ var require_hook_default = {
     };
     return {
       CallExpression(node) {
-        if (!isTypeOfFnCall(context, node, ["describe"]) || node.arguments.length < 2) {
+        if (!isTypeOfFnCall(context, node, ["describe"])) {
           return;
         }
         const [, testFn] = node.arguments;
@@ -2923,8 +2928,11 @@ var valid_describe_callback_default = {
     return {
       CallExpression(node) {
         const call = parseFnCall(context, node);
-        if (call?.type !== "describe")
+        if (call?.group !== "describe")
+          return;
+        if (call.members.some((s) => getStringValue(s) === "configure")) {
           return;
+        }
         if (node.arguments.length < 1) {
           return context.report({
             loc: node.loc,
@@ -3425,9 +3433,8 @@ var valid_title_default = {
           return;
         }
         const [argument] = node.arguments;
-        if (!argument) {
+        if (!argument)
           return;
-        }
         if (!isStringNode(argument)) {
           if (argument.type === "BinaryExpression" && doesBinaryExpressionContainStringNode(argument)) {
             return;

package/dist/index.mjs

@@ -21,7 +21,7 @@ function getNodeChain(node) {
   }
   return null;
 }
-function determinePlaywrightFnType(name) {
+function determinePlaywrightFnGroup(name) {
   if (name === "step")
     return "step";
   if (name === "expect")
@@ -53,8 +53,8 @@ function parse(context, node) {
   }
   if (name === "test" && links.length > 1) {
     const nextLinkName = links[1];
-    const nextLinkType = determinePlaywrightFnType(nextLinkName);
-    if (nextLinkType !== "unknown") {
+    const nextLinkGroup = determinePlaywrightFnGroup(nextLinkName);
+    if (nextLinkGroup !== "unknown") {
       name = nextLinkName;
     }
   }
@@ -65,8 +65,8 @@ function parse(context, node) {
     members: rest,
     name
   };
-  const type = determinePlaywrightFnType(name);
-  if (type === "expect") {
+  const group = determinePlaywrightFnGroup(name);
+  if (group === "expect") {
     const result = parseExpectCall(parsedFnCall);
     if (typeof result === "string" && findTopMostCallExpression(node) !== node) {
       return null;
@@ -85,7 +85,15 @@ function parse(context, node) {
   if (parent?.type === "CallExpression" || parent?.type === "MemberExpression") {
     return null;
   }
-  return { ...parsedFnCall, type };
+  let type = group;
+  if ((name === "test" || name === "describe") && (node.arguments.length !== 2 || !isFunction(node.arguments[1]))) {
+    type = "config";
+  }
+  return {
+    ...parsedFnCall,
+    group,
+    type
+  };
 }
 function parseFnCallWithReason(context, node) {
   if (cache.has(node)) {
@@ -213,6 +221,7 @@ var init_parseFnCall = __esm({
       return {
         ...call,
         args: getExpectArguments(call),
+        group: "expect",
         type: "expect",
         ...modifiersAndMatcher
       };
@@ -836,11 +845,7 @@ var init_no_conditional_in_test = __esm({
           const call = findParent(node, "CallExpression");
           if (!call)
             return;
-          const fnCall = parseFnCall(context, call);
-          if (fnCall?.type === "test" && fnCall.members.some((member) => getStringValue(member) === "skip") && call.arguments[0]?.type === "LogicalExpression") {
-            return;
-          }
-          if (fnCall?.type === "test" || fnCall?.type === "step") {
+          if (isTypeOfFnCall(context, call, ["test", "step"])) {
             context.report({ messageId: "conditionalInTest", node });
           }
         }
@@ -1552,14 +1557,14 @@ var init_no_skipped_test = __esm({
             const options = context.options[0] || {};
             const allowConditional = !!options.allowConditional;
             const call = parseFnCall(context, node);
-            if (call?.type !== "test" && call?.type !== "describe") {
+            if (call?.group !== "test" && call?.group !== "describe") {
               return;
             }
             const skipNode = call.members.find((s) => getStringValue(s) === "skip");
             if (!skipNode)
               return;
-            const isStandalone = call.type === "test" && !isFunction(node.arguments[1]);
-            if (isStandalone && allowConditional && node.arguments.length) {
+            const isStandalone = call.type === "config";
+            if (isStandalone && allowConditional) {
               return;
             }
             context.report({
@@ -3035,7 +3040,7 @@ var init_require_hook = __esm({
         };
         return {
           CallExpression(node) {
-            if (!isTypeOfFnCall(context, node, ["describe"]) || node.arguments.length < 2) {
+            if (!isTypeOfFnCall(context, node, ["describe"])) {
               return;
             }
             const [, testFn] = node.arguments;
@@ -3258,8 +3263,11 @@ var init_valid_describe_callback = __esm({
         return {
           CallExpression(node) {
             const call = parseFnCall(context, node);
-            if (call?.type !== "describe")
+            if (call?.group !== "describe")
+              return;
+            if (call.members.some((s) => getStringValue(s) === "configure")) {
               return;
+            }
             if (node.arguments.length < 1) {
               return context.report({
                 loc: node.loc,
@@ -3785,9 +3793,8 @@ var init_valid_title = __esm({
               return;
             }
             const [argument] = node.arguments;
-            if (!argument) {
+            if (!argument)
               return;
-            }
             if (!isStringNode(argument)) {
               if (argument.type === "BinaryExpression" && doesBinaryExpressionContainStringNode(argument)) {
                 return;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-playwright",
   "description": "ESLint plugin for Playwright testing.",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "repository": "https://github.com/playwright-community/eslint-plugin-playwright",
   "author": "Mark Skelton <mark@mskelton.dev>",
   "packageManager": "pnpm@8.12.0",