Merge pull request #18 from julien-capellari/fix/pattern-matching

Fix pattern matching
neoxia · Mar 19, 2021 · 3cbdab7 · 3cbdab7
2 parents 62d5cac + f7b15ab
commit 3cbdab7
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -85,6 +85,12 @@ jobs:
             pattern: '*.ts'
             affected: false
 
+          - branch: test/test-a-affected
+            workspace: test-a
+            base: master
+            pattern: 'src/**'
+            affected: true
+
           - branch: test/test-a-affected
             workspace: test-b
             base: master

diff --git a/action.yml b/action.yml
@@ -16,7 +16,7 @@ inputs:
     required: true
 
   pattern:
-    description: 'Files to search in the diff'
+    description: 'Files to search in the diff. Relative to tested workspace root.'
     required: false
     default: '**'
 

diff --git a/dist/bundle.js b/dist/bundle.js
diff --git a/src/git.ts b/src/git.ts
@@ -10,10 +10,12 @@ export interface GitTagsOptions {
 export const git = {
   // Attributes
   git: simpleGit(),
+  root: process.cwd(),
 
   // Methods
   setup(root: string): void {
     this.git = simpleGit({ baseDir: root });
+    this.root = root;
   },
 
   // Commands

diff --git a/src/workspace.ts b/src/workspace.ts
@@ -57,7 +57,8 @@ export class Workspace {
       return diff.length > 0;
     }
 
-    return diff.some(minimatch.filter(pattern));
+    const rel = path.relative(git.root, this.root);
+    return diff.some(minimatch.filter(path.join(rel, pattern)));
   }
 
   private async _testDepsAffected(tested: Set<Workspace>, baseRef: string, pattern = '**'): Promise<boolean> {

diff --git a/tests/workspace.test.ts b/tests/workspace.test.ts
@@ -55,14 +55,15 @@ describe('Workspace.isAffected', () => {
     jest.restoreAllMocks();
 
     prj = await Project.loadProject(TEST_PROJECT_ROOT);
+    git.root = TEST_PROJECT_ROOT;
   });
 
   // Tests
   describe('direct change', () => {
     it('should be affected (test-b, no pattern)', async () => {
       // Spy
       jest.spyOn(git, 'diff')
-        .mockResolvedValue(['test.js']);
+        .mockResolvedValue(['test-b/test.js']);
 
       // Test
       const wks = prj.getWorkspace('test-b');
@@ -94,13 +95,13 @@ describe('Workspace.isAffected', () => {
     it('should be affected (test-b, with pattern)', async () => {
       // Spy
       jest.spyOn(git, 'diff')
-        .mockResolvedValue(['test.js']);
+        .mockResolvedValue(['test-b/src/test.js']);
 
       // Test
       const wks = prj.getWorkspace('test-b');
       expect(wks).not.toBeNull();
 
-      await expect(wks!.isAffected('master', '*.js'))
+      await expect(wks!.isAffected('master', 'src/**'))
         .resolves.toBeTruthy();
 
       expect(git.diff).toBeCalledTimes(1);
@@ -110,7 +111,7 @@ describe('Workspace.isAffected', () => {
     it('should not be affected (test-b, with pattern)', async () => {
       // Spy
       jest.spyOn(git, 'diff')
-        .mockResolvedValue(['test.js']);
+        .mockResolvedValue(['test-b/test.js']);
 
       // Test
       const wks = prj.getWorkspace('test-b');
@@ -128,7 +129,7 @@ describe('Workspace.isAffected', () => {
     it('should be affected (test-c, no pattern)', async () => {
       // Spy
       jest.spyOn(git, 'diff')
-        .mockImplementation(async (...args) => args[args.length - 1].endsWith('test-b') ? ['test.js'] : []);
+        .mockImplementation(async (...args) => args[args.length - 1].endsWith('test-b') ? ['test-b/test.js'] : []);
 
       // Test
       const wks = prj.getWorkspace('test-c');
@@ -162,7 +163,7 @@ describe('Workspace.isAffected', () => {
     it('should be affected (test-c, with pattern)', async () => {
       // Spy
       jest.spyOn(git, 'diff')
-        .mockImplementation(async (...args) => args[args.length - 1].endsWith('test-b') ? ['test.js'] : []);
+        .mockImplementation(async (...args) => args[args.length - 1].endsWith('test-b') ? ['test-b/test.js'] : []);
 
       // Test
       const wks = prj.getWorkspace('test-c');
@@ -179,7 +180,7 @@ describe('Workspace.isAffected', () => {
     it('should not be affected (test-c, with pattern)', async () => {
       // Spy
       jest.spyOn(git, 'diff')
-        .mockImplementation(async (...args) => args[args.length - 1].endsWith('test-b') ? ['test.js'] : []);
+        .mockImplementation(async (...args) => args[args.length - 1].endsWith('test-b') ? ['test-b/test.js'] : []);
 
 
       // Test