Merge pull request #1060 from chromaui/1053-chromatic-diagnosticsjson…

…-no-longer-includes-`storybookUrl`-or-`webUrl` Include `storybookUrl` and `webUrl` on skipped rebuild
chromaui · Sep 30, 2024 · 055ebd3 · 055ebd3
2 parents 2f6a0a4 + cb887f1
commit 055ebd3
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/node-src/tasks/gitInfo.test.ts b/node-src/tasks/gitInfo.test.ts
@@ -137,4 +137,21 @@ describe('setGitInfo', () => {
     await setGitInfo(ctx, {} as any);
     expect(ctx.options.forceRebuild).toBe(true);
   });
+
+  it('sets storybookUrl and rebuildForBuild on skipped rebuild', async () => {
+    const lastBuild = {
+      id: 'parent',
+      status: 'ACCEPTED',
+      webUrl: 'some-web-url',
+      storybookUrl: 'some-storybook-url',
+    };
+
+    getParentCommits.mockResolvedValue([commitInfo.commit]);
+    client.runQuery.mockReturnValue({ app: { lastBuild } });
+
+    const ctx = { log, options: {}, client } as any;
+    await setGitInfo(ctx, {} as any);
+    expect(ctx.rebuildForBuild).toEqual(lastBuild);
+    expect(ctx.storybookUrl).toEqual(lastBuild.storybookUrl);
+  });
 });
diff --git a/node-src/tasks/gitInfo.ts b/node-src/tasks/gitInfo.ts
@@ -38,6 +38,8 @@ const LastBuildQuery = `
       lastBuild(ref: $commit, branch: $branch) {
         id
         status(legacy: false)
+        storybookUrl
+        webUrl
       }
     }
   }
@@ -48,6 +50,8 @@ interface LastBuildQueryResult {
     lastBuild: {
       id: string;
       status: string;
+      storybookUrl: string;
+      webUrl: string;
     };
   };
 }
@@ -141,6 +145,8 @@ export const setGitInfo = async (ctx: Context, task: Task) => {
         !ctx.git.matchesBranch(ctx.options.forceRebuild)
       ) {
         ctx.skip = true;
+        ctx.rebuildForBuild = result.app.lastBuild;
+        ctx.storybookUrl = result.app.lastBuild.storybookUrl;
         transitionTo(skippedRebuild, true)(ctx, task);
         ctx.log.info(forceRebuildHint());
         ctx.exitCode = 0;

diff --git a/node-src/types.ts b/node-src/types.ts
@@ -307,6 +307,12 @@ export interface Context {
       };
     }[];
   };
+  rebuildForBuild: {
+    id: string;
+    status: string;
+    webUrl: string;
+    storybookUrl: string;
+  };
   sourceDir: string;
   buildCommand?: string;
   buildLogFile?: string;