fix inheritTasks with taskPrefix (#1525)

yeoman · Jun 17, 2024 · 89c2f99 · 89c2f99
1 parent e5f7908
commit 89c2f99
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/src/actions/lifecycle.ts b/src/actions/lifecycle.ts
@@ -154,7 +154,10 @@ export abstract class TasksMixin {
         currentPrototype = Object.getPrototypeOf(currentPrototype);
       }
 
-      propertyDescriptors = propertyDescriptors.filter(([name]) => queueNames.includes(name));
+      const { taskPrefix = '' } = this.features;
+      propertyDescriptors = propertyDescriptors.filter(
+        ([name]) => name.startsWith(taskPrefix) && queueNames.includes(name.slice(taskPrefix.length)),
+      );
       return Object.fromEntries(propertyDescriptors);
     }
 

diff --git a/test/base.test.ts b/test/base.test.ts
@@ -1966,5 +1966,40 @@ describe('Base', () => {
         Object.getOwnPropertyDescriptor(Object.getPrototypeOf(gen), 'default')!.value,
       );
     });
+
+    it('passing taskPrefix should return tasks without taskPrefix', async function () {
+      const Gen = class extends TestGen {
+        constructor(args, options, features) {
+          super(args, options, { ...features, taskPrefix: 'foo' });
+        }
+
+        foodefault() {}
+
+        foobar() {}
+      };
+
+      const gen = new Gen([], { env });
+      assert.deepStrictEqual(gen.getTaskNames(), ['default', 'bar']);
+    });
+
+    it('passing taskPrefix and inheritTasks should return tasks without taskPrefix', async function () {
+      const Parent = class extends TestGen {
+        constructor(args, options, features) {
+          super(args, options, { ...features, taskPrefix: 'foo', inheritTasks: true });
+        }
+
+        foodefault() {}
+      };
+      const Gen = class extends Parent {
+        constructor(args, options, features) {
+          super(args, options, { ...features, taskPrefix: 'foo', inheritTasks: true });
+        }
+
+        fooinitializing() {}
+      };
+
+      const gen = new Gen([], { env });
+      assert.deepStrictEqual(gen.getTaskNames(), ['default', 'initializing']);
+    });
   });
 });