Merge pull request #274 from recca0120/fix/pest-with-namedargument

fix named argument
recca0120 · Jan 31, 2025 · 3fbbff2 · 3fbbff2
2 parents 0acb77e + cba90bd
commit 3fbbff2
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "displayName": "PHPUnit Test Explorer",
   "icon": "img/icon.png",
   "publisher": "recca0120",
-  "version": "3.5.20",
+  "version": "3.5.21",
   "private": true,
   "license": "MIT",
   "repository": {

diff --git a/src/PHPUnit/TestParser/Parser.ts b/src/PHPUnit/TestParser/Parser.ts
@@ -1,4 +1,4 @@
-import { Call, Declaration, Identifier, Namespace, Node, Variable } from 'php-parser';
+import { Call, Closure, Declaration, Identifier, namedargument, Namespace, Node, String, Variable } from 'php-parser';
 import { PHPUnitXML } from '../PHPUnitXML';
 import { TransformerFactory } from '../Transformer';
 import { TestDefinition, TestType } from '../types';
@@ -25,26 +25,40 @@ export abstract class Parser {
         return this.phpUnitXML?.root() ?? '';
     }
 
-    protected parseName(declaration?: Namespace | Declaration | Call | Identifier | Variable): string | undefined {
+    protected parseName(declaration?: Namespace | Declaration | Call | Identifier | namedargument | String | Variable): string | undefined {
         if (!declaration) {
-            return undefined;
+            return declaration;
         }
 
         if ('what' in declaration) {
             return this.parseName(declaration.what);
         }
 
-        if (typeof declaration.name === 'string') {
-            return declaration.name;
+        if (declaration.kind === 'namedargument') {
+            return this.parseName(((declaration as namedargument).value as String));
+        }
+
+        if ('name' in declaration) {
+            if (typeof declaration.name === 'string') {
+                return declaration.name;
+            }
+
+            if (declaration.name && 'name' in declaration.name) {
+                return declaration.name.name;
+            }
         }
 
-        if (declaration.name && 'name' in declaration.name) {
-            return declaration.name.name;
+        if (declaration.kind === 'string') {
+            return (declaration as String).value;
         }
 
         return undefined;
     };
 
+    protected parseClosure(argument: Closure | namedargument) {
+        return (argument.kind === 'namedargument' ? (argument as namedargument).value : argument) as Closure;
+    }
+
     protected parseAnnotations(declaration: Declaration) {
         return { ...annotationParser.parse(declaration), ...attributeParser.parse(declaration) };
     }

diff --git a/src/PHPUnit/TestParser/PestParser.test.ts b/src/PHPUnit/TestParser/PestParser.test.ts
@@ -289,4 +289,29 @@ it('asserts true is true', function () {
             depth: 3,
         });
     });
+
+    it('test with namedargument', async () => {
+        const content = `<?php 
+
+describe(description: 'something', test: function () {
+    it(description: 'asserts true is true', test: function () {
+        expect(true)->toBe(true);
+    });
+});
+        `;
+
+        expect(givenTest(file, content, '`something` → it asserts true is true')).toEqual({
+            type: TestType.method,
+            id: 'tests/Fixtures/ExampleTest.php::`something` → it asserts true is true',
+            classFQN: 'P\\Tests\\Fixtures\\ExampleTest',
+            namespace: 'P\\Tests\\Fixtures',
+            className: 'ExampleTest',
+            methodName: '`something` → it asserts true is true',
+            label: 'it asserts true is true',
+            file,
+            start: { line: expect.any(Number), character: expect.any(Number) },
+            end: { line: expect.any(Number), character: expect.any(Number) },
+            depth: 4,
+        });
+    });
 });
diff --git a/src/PHPUnit/TestParser/PestParser.ts b/src/PHPUnit/TestParser/PestParser.ts
@@ -1,5 +1,7 @@
 import { basename, dirname, join, relative } from 'node:path';
-import { Block, Call, Closure, Declaration, ExpressionStatement, Node, Program, String } from 'php-parser';
+import {
+    Block, Call, Closure, Declaration, ExpressionStatement, namedargument, Node, Program, String,
+} from 'php-parser';
 import { Transformer, TransformerFactory } from '../Transformer';
 import { TestDefinition, TestType } from '../types';
 import { capitalize } from '../utils';
@@ -51,8 +53,8 @@ export class PestParser extends Parser {
         if (['program', 'namespace'].includes(declaration.kind)) {
             children = (declaration as Program).children;
         } else {
-            const closure = (declaration as Call).arguments[1] as Closure;
-            prefixes = [...prefixes, ((declaration as Call).arguments[0] as String).value];
+            const closure = this.parseClosure((declaration as Call).arguments[1] as Closure | namedargument);
+            prefixes = [...prefixes, this.parseName((declaration as Call).arguments[0] as namedargument | String)!];
             children = closure.kind === 'arrowfunc' ? [{ expression: closure.body! }] : closure.body!.children!;
         }
 
@@ -85,7 +87,7 @@ export class PestParser extends Parser {
             return this.parseTestOrIt(((call.what as any).what) as Call, clazz, prefixes);
         }
 
-        let methodName = (call.arguments[0] as String).value;
+        let methodName = this.parseName(call.arguments[0] as (String | namedargument));
         if (this.parseName(call) === 'it') {
             methodName = 'it ' + methodName;
         }