debug

Author: ecraig12345

packages/beachball/src/__fixtures__/repositoryFactory.ts

@@ -162,6 +162,13 @@ export class RepositoryFactory {
   /** Cloned child repos, tracked so we can clean them up */
   private childRepos: Repository[] = [];
 
+  public get originRoot(): string {
+    if (!this.root) {
+      throw new Error('Factory was already cleaned up');
+    }
+    return this.root;
+  }
+
   /**
    * Create the "origin" repo and create+commit fixture files.
    * If `fixture` is a string, the corresponding default fixture is used.

packages/beachball/src/__functional__/git/ensureSharedHistory.test.ts

@@ -228,7 +228,7 @@ describe('ensureSharedHistory', () => {
     `);
   });
 
-  it('deepens history if needed', () => {
+  it.only('deepens history if needed', () => {
     const repo = repositoryFactory.cloneRepository({ depth: 1, branch: testBranch, singleBranch: true });
     gitSpy.mockClear();
 
@@ -242,18 +242,35 @@ describe('ensureSharedHistory', () => {
       verbose: true,
     });
 
-    const allLogs = logs.getMockLines('all');
-    expect(allLogs).toMatch('Adding branch "master" to fetch config for remote "origin"');
-    expect(allLogs).toMatch('This is a shallow clone. Deepening to check for changes...');
-    expect(allLogs).toMatch('Deepening by 2 more commits (attempt 1/3)...');
-    expect(allLogs).toMatch('Deepening by 2 more commits (attempt 2/3)...');
-    expect(allLogs).toMatch('Deepening by 2 more commits (attempt 3/3)...');
-    expect(allLogs).not.toMatch('warning');
-    expect(logs.mocks.warn).not.toHaveBeenCalled();
-    expect(logs.mocks.error).not.toHaveBeenCalled();
+    const allLogs = logs.getMockLines('all', {
+      replacePaths: { [repo.rootPath]: '<root>', [repositoryFactory.originRoot]: '<origin-dir>' },
+    });
+    expect(allLogs).toMatchInlineSnapshot(`
+      "[log] Adding branch "master" to fetch config for remote "origin"
+      [log] Fetching branch "master" from remote "origin" (with --depth=2)...
+      [log] From <origin-dir>
+       * branch            master     -> FETCH_HEAD
+       * [new branch]      master     -> origin/master
+      [log] Fetching branch "master" from remote "origin" (with --depth=2) completed successfully
+      [log] This is a shallow clone. Deepening to check for changes...
+      [log] Deepening by 2 more commits (attempt 1/3)...
+      [log] Fetching branch "master" from remote "origin" (with --deepen=2)...
+      [log] From <origin-dir>
+       * branch            master     -> FETCH_HEAD
+      [log] Fetching branch "master" from remote "origin" (with --deepen=2) completed successfully
+      [log] Deepening by 2 more commits (attempt 2/3)...
+      [log] Fetching branch "master" from remote "origin" (with --deepen=2)...
+      [log] From <origin-dir>
+       * branch            master     -> FETCH_HEAD
+      [log] Fetching branch "master" from remote "origin" (with --deepen=2) completed successfully
+      [log] Deepening by 2 more commits (attempt 3/3)...
+      [log] Fetching branch "master" from remote "origin" (with --deepen=2)...
+      [log] From <origin-dir>
+       * branch            master     -> FETCH_HEAD
+      [log] Fetching branch "master" from remote "origin" (with --deepen=2) completed successfully"
+    `);
 
-    expect(filteredGitCalls().filter(line => !line.startsWith('rev-parse') && !line.startsWith('merge-base')))
-      .toMatchInlineSnapshot(`
+    expect(filteredGitCalls()).toMatchInlineSnapshot(`
       [
         "config --get-all remote.origin.fetch",
         "remote set-branches --add origin master",