fix: if no PR number, default to auto.remote instead of fetching from…

… octokit
intuit · Jan 8, 2021 · ac02033 · ac02033
1 parent dbccad4
commit ac02033
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 5 deletions.
diff --git a/plugins/cocoapods/__tests__/cocoapods.test.ts b/plugins/cocoapods/__tests__/cocoapods.test.ts
@@ -83,12 +83,13 @@ describe("Cocoapods Plugin", () => {
           data: {
             head: {
               repo: {
-                clone_url: "https://github.com/intuit/auto.git",
+                clone_url: "https://github.com/intuit-fork/auto.git",
               },
             },
           },
         }),
       },
+      remote: "https://github.com/intuit/auto.git",
       getCurrentVersion: async () => "0.0.1",
     } as unknown) as Auto.Auto);
   });
@@ -399,6 +400,34 @@ describe("Cocoapods Plugin", () => {
       expect(exec).toBeCalledTimes(3);
       expect(exec).toHaveBeenCalledWith("git", ["checkout", "./Test.podspec"]);
 
+      expect(mock).toHaveBeenLastCalledWith(
+        expect.any(String),
+        specWithVersion(
+          "0.1.0-canary.1.1.1",
+          "{ :git => 'https://github.com/intuit-fork/auto.git', :commit => 'undefined' }"
+        )
+      );
+    });
+    test("should tag with canary version with no PR number", async () => {
+      let podSpec = specWithVersion("0.0.1");
+      jest
+        .spyOn(utilities, "getPodspecContents")
+        .mockImplementation(() => podSpec);
+      const mock = jest
+        .spyOn(utilities, "writePodspecContents")
+        .mockImplementation((path, contents) => {
+          podSpec = contents;
+        });
+
+      const newVersion = await hooks.canary.promise({
+        bump: "minor" as Auto.SEMVER,
+        canaryIdentifier: "canary.1.1.1",
+      });
+
+      expect(newVersion).toBe("0.1.0-canary.1.1.1");
+      expect(exec).toBeCalledTimes(3);
+      expect(exec).toHaveBeenCalledWith("git", ["checkout", "./Test.podspec"]);
+
       expect(mock).toHaveBeenLastCalledWith(
         expect.any(String),
         specWithVersion(

diff --git a/plugins/cocoapods/src/index.ts b/plugins/cocoapods/src/index.ts
@@ -230,14 +230,23 @@ export default class CocoapodsPlugin implements IPlugin {
     auto.hooks.canary.tapPromise(
       this.name,
       async ({ bump, canaryIdentifier, dryRun, quiet }) => {
+        if (!auto.git) {
+          return;
+        }
+
         const pr = getPrNumberFromEnv();
 
-        if (!auto.git || !pr) {
-          return;
+        if (!pr) {
+          this.logger?.log.info(
+            logMessage(
+              `No PR number found, using ${auto.remote} as the remote for canary. Commit must be pushed for this to work.`
+            )
+          );
         }
 
-        const remoteRepo = await (await auto.git.getPullRequest(pr)).data.head
-          .repo.clone_url;
+        const remoteRepo = pr
+          ? await (await auto.git.getPullRequest(pr)).data.head.repo.clone_url
+          : auto.remote;
 
         const lastRelease = await auto.git.getLatestRelease();
         const current = await auto.getCurrentVersion(lastRelease);