Fixing tests

Author: bnookala

src/commands/hld/reconcile.test.ts

@@ -16,7 +16,6 @@ import {
   IReconcileDependencies,
   reconcileHld,
   testAndGetAbsPath,
-  tryGetGitOrigin,
   validateInputs
 } from "./reconcile";
 import * as reconcile from "./reconcile";
@@ -104,31 +103,6 @@ describe("checkForFabrikate", () => {
   });
 });
 
-describe("tryGetGitOrigin", () => {
-  it("attempts to retrieve azdo git origin", async () => {
-    const originUrl = "http://github.com/repo/url";
-
-    (getAzdoOriginUrl as jest.Mock).mockReturnValue(originUrl);
-
-    const originUrlResponse = await tryGetGitOrigin();
-    expect(originUrlResponse).toEqual(originUrl);
-    expect(getAzdoOriginUrl).toHaveBeenCalledTimes(1);
-  });
-
-  it("attempts to retrieve git origin from using git cli", async () => {
-    const originUrl = "http://github.com/repo/url";
-    (getAzdoOriginUrl as jest.Mock).mockRejectedValue("some reason");
-
-    (getOriginUrl as jest.Mock).mockReturnValue(originUrl);
-
-    const originUrlResponse = await tryGetGitOrigin();
-
-    expect(originUrlResponse).toEqual(originUrl);
-    expect(getAzdoOriginUrl).toHaveBeenCalledTimes(1);
-    expect(getOriginUrl).toHaveBeenCalledTimes(1);
-  });
-});
-
 describe("testAndGetAbsPath", () => {
   it("fails to test and get an absolute path for a file", () => {
     const test = jest.fn();

src/commands/hld/reconcile.ts

@@ -9,7 +9,7 @@ import { Bedrock } from "../../config";
 import { assertIsStringWithContent } from "../../lib/assertions";
 import { build as buildCmd, exit as exitCmd } from "../../lib/commandBuilder";
 import { generateAccessYaml } from "../../lib/fileutils";
-import { getAzdoOriginUrl, getOriginUrl } from "../../lib/gitutils";
+import { tryGetGitOrigin } from "../../lib/gitutils";
 import { TraefikIngressRoute } from "../../lib/traefik/ingress-route";
 import {
   ITraefikMiddleware,
@@ -210,17 +210,6 @@ export const commandDecorator = (command: commander.Command) => {
   );
 };
 
-export const tryGetGitOrigin = async (
-  absRepoPath?: string
-): Promise<string> => {
-  return getAzdoOriginUrl().catch(_ => {
-    logger.warn(
-      "Could not get Git Origin for Azure DevOps - are you running 'spk' _not_ in a pipeline?"
-    );
-    return getOriginUrl(absRepoPath);
-  });
-};
-
 export const reconcileHld = async (
   dependencies: IReconcileDependencies,
   bedrockYaml: IBedrockFile,

src/lib/gitutils.test.ts

@@ -10,7 +10,8 @@ import {
   getRepositoryName,
   getRepositoryUrl,
   pushBranch,
-  safeGitUrlForLogging
+  safeGitUrlForLogging,
+  tryGetGitOrigin
 } from "../lib/gitutils";
 import { disableVerboseLogging, enableVerboseLogging } from "../logger";
 import { exec } from "./shell";
@@ -211,6 +212,35 @@ describe("pushBranch", () => {
   });
 });
 
+describe("tryGetGitOrigin", () => {
+  it("attempts to retrieve azdo git origin", async () => {
+    const originUrl = "http://github.com/repo/url";
+
+    when(exec as jest.Mock)
+      .calledWith("echo", ["$(Build.Repository.Uri)"])
+      .mockReturnValue(originUrl);
+
+    const originUrlResponse = await tryGetGitOrigin();
+    expect(originUrlResponse).toEqual(originUrl);
+  });
+
+  it("attempts to retrieve git origin from using git cli", async () => {
+    const originUrl = "http://github.com/repo/url";
+    // Echoing variable from AzDo fails… trying Git
+    when(exec as jest.Mock)
+      .calledWith("echo", ["$(Build.Repository.Uri)"])
+      .mockRejectedValue("some reason");
+
+    // Retrieving url from Git succeeds
+    when(exec as jest.Mock)
+      .calledWith("git", ["config", "--get", "remote.origin.url"])
+      .mockReturnValue(originUrl);
+
+    const originUrlResponse = await tryGetGitOrigin();
+    expect(originUrlResponse).toEqual(originUrl);
+  });
+});
+
 describe("getOriginUrl", () => {
   it("should call exec with the proper git arguments", async () => {
     const originUrl = "foo";

src/lib/gitutils.ts

@@ -110,6 +110,21 @@ export const pushBranch = async (branchName: string): Promise<void> => {
   }
 };
 
+/**
+ * Tries to fetch the Git origin from an AzDo set environment variable, else falls back to fetching it from Git directly.
+ * @param absRepoPath The Absolute Path to the Repository to fetch the origin url.
+ */
+export const tryGetGitOrigin = async (
+  absRepoPath?: string
+): Promise<string> => {
+  return getAzdoOriginUrl().catch(_ => {
+    logger.warn(
+      "Could not get Git Origin for Azure DevOps - are you running 'spk' _not_ in a pipeline?"
+    );
+    return getOriginUrl(absRepoPath);
+  });
+};
+
 /**
  * Gets the origin url.
  * @param absRepositoryPath The Absolute Path to the Repository to fetch the origin