Merge pull request #1393 from 10hendersonm/master

Fixes baseBranch from config
intuit · Jul 20, 2020 · f18e3d3 · f18e3d3
2 parents 2566ec6 + c01e8d6
commit f18e3d3
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/packages/core/src/__tests__/auto.test.ts b/packages/core/src/__tests__/auto.test.ts
@@ -98,6 +98,32 @@ describe("Auto", () => {
     expect(auto.release).toBeDefined();
   });
 
+  test("should set default baseBranch", async () => {
+    search.mockReturnValueOnce({
+      config: defaults,
+    });
+
+    const auto = new Auto();
+    auto.logger = dummyLog();
+    await auto.loadConfig();
+    expect(auto.baseBranch).toBe("master");
+  });
+
+  test("should set custom baseBranch", async () => {
+    search.mockReturnValueOnce({
+      config: {
+        ...defaults,
+        baseBranch: "production",
+      },
+    });
+
+    const auto = new Auto();
+    auto.logger = dummyLog();
+    await auto.loadConfig();
+    expect(auto.baseBranch).toBe("production");
+    expect(auto.config?.baseBranch).toBe("production");
+  });
+
   test("should default to npm in non-pkg", async () => {
     search.mockReturnValueOnce({ config: defaults });
     // @ts-ignore

diff --git a/packages/core/src/auto.ts b/packages/core/src/auto.ts
@@ -538,9 +538,10 @@ export default class Auto {
       // This Line overrides config with args
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       ...omit(this.options, ["_command", "_all", "main"] as any),
-      baseBranch: this.baseBranch,
+      baseBranch: this.config.baseBranch || this.baseBranch,
     };
     this.config = config;
+    this.baseBranch = config.baseBranch;
     const repository = await this.getRepo(config);
     const token =
       repository?.token || process.env.GH_TOKEN || process.env.GITHUB_TOKEN;