fix: tags no operator

Author: sonic16x

src/test-reader/test-parser.ts

@@ -153,15 +153,15 @@ export class TestParser extends EventEmitter {
             treeBuilder.addTestFilter((test: Test) => {
                 let current: Test | Suite | null = test;
 
+                const allTags = new Set<string>([]);
+
                 while (current) {
-                    if (tag(current.tags)) {
-                        return true;
-                    } else {
-                        current = current.parent;
-                    }
+                    [...current.tags.keys()].forEach(item => allTags.add(item));
+
+                    current = current.parent;
                 }
 
-                return false;
+                return tag(allTags);
             });
         }
 

src/utils/cli.ts

@@ -7,7 +7,7 @@ export const collectCliValues = (newValue: unknown, array = [] as unknown[]): un
     return array.concat(newValue);
 };
 
-export type TagFilter = (tags: Map<string, boolean>) => boolean;
+export type TagFilter = (tags: Set<string>) => boolean;
 
 export const compileTagFilter = (filter: string): TagFilter => {
     const normalizedFilter = filter.replace(/[\s'"`\\]/g, "").toLowerCase();
@@ -37,7 +37,7 @@ export const compileTagFilter = (filter: string): TagFilter => {
 
     const compiledCode = compileOrExpression(normalizedFilter);
 
-    return new Function("tags", `return ${compiledCode};`) as (tags: Map<string, boolean>) => boolean;
+    return new Function("tags", `return ${compiledCode};`) as (tags: Set<string>) => boolean;
 };
 
 export const compileGrep = (grep: string): RegExp => {

test/src/test-reader/test-parser.js

@@ -674,6 +674,22 @@ describe("test-reader/test-parser", () => {
                     assert.isTrue(filter(test));
                 });
 
+                it("installed filter should accept matched test with not operator and parent test for tags", async () => {
+                    await parse_({ tag: compileTagFilter("!smoke") });
+
+                    const filter = TreeBuilder.prototype.addTestFilter.lastCall.args[0];
+                    const test = {
+                        fullTitle: () => "Some name",
+                        tags: new Map([["slow", false]]),
+                        parent: {
+                            fullTitle: () => "Some parent",
+                            tags: new Map([["smoke", false]]),
+                        },
+                    };
+
+                    assert.isFalse(filter(test));
+                });
+
                 it("installed filter should accept matched test with not operator for tags", async () => {
                     await parse_({ tag: compileTagFilter("!smoke&!slow") });
 
@@ -684,6 +700,10 @@ describe("test-reader/test-parser", () => {
                             ["smoke", false],
                             ["slow", false],
                         ]),
+                        parent: {
+                            fullTitle: () => "Some parent",
+                            tags: new Map([]),
+                        },
                     };
 
                     assert.isFalse(filter(test));

test/src/utils/compileTagFilter.ts

@@ -28,16 +28,16 @@ describe("compileTagFilter", () => {
         cases.forEach(({ expression, okTags, badTags }) => {
             const func = compileTagFilter(expression);
 
-            assert.isTrue(func(new Map(okTags.map(tag => [tag, false]))));
+            assert.isTrue(func(new Set(okTags.map(tag => tag))));
 
-            assert.isFalse(func(new Map(badTags.map(tag => [tag, false]))));
+            assert.isFalse(func(new Set(badTags.map(tag => tag))));
         });
     });
 
     it("check injection code", () => {
         const injectionStr = '")+console.log("111111';
         const func = compileTagFilter(injectionStr);
 
-        assert.isFalse(func(new Map()));
+        assert.isFalse(func(new Set()));
     });
 });