From 0705a52b46aab4fbf147dd0debd624cf72ffe051 Mon Sep 17 00:00:00 2001
From: Amin Yahyaabadi <aminyahyaabadi74@gmail.com>
Date: Thu, 16 Sep 2021 14:38:52 -0500
Subject: [PATCH] test: simplify cmake test

---
 src/cmake/__tests__/cmake.test.ts | 11 ++++-------
 src/utils/tests/test-helpers.ts   |  2 --
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/cmake/__tests__/cmake.test.ts b/src/cmake/__tests__/cmake.test.ts
index 48b7be3b..5ec0f29f 100644
--- a/src/cmake/__tests__/cmake.test.ts
+++ b/src/cmake/__tests__/cmake.test.ts
@@ -2,11 +2,6 @@ import { setupCmake } from "../cmake"
 import { setupTmpDir, cleanupTmpDir, testBin } from "../../utils/tests/test-helpers"
 
 jest.setTimeout(200000)
-async function testCmake(directory: string) {
-  const { binDir } = await setupCmake("3.20.2", directory, "")
-  await testBin("cmake", ["--version"], binDir)
-  return binDir
-}
 
 describe("setup-cmake", () => {
   let directory: string
@@ -15,11 +10,13 @@ describe("setup-cmake", () => {
   })
 
   it("should setup CMake", async () => {
-    await testCmake(directory)
+    const { binDir } = await setupCmake("3.20.2", directory, "")
+    await testBin("cmake", ["--version"], binDir)
   })
 
   it("should find CMake in the cache", async () => {
-    const binDir = await testCmake(directory)
+    const { binDir } = await setupCmake("3.20.2", directory, "")
+    await testBin("cmake", ["--version"], binDir)
     expect(binDir.includes("ToolCache")).toBeTruthy()
   })
 
diff --git a/src/utils/tests/test-helpers.ts b/src/utils/tests/test-helpers.ts
index d0453368..44f5f0de 100644
--- a/src/utils/tests/test-helpers.ts
+++ b/src/utils/tests/test-helpers.ts
@@ -47,6 +47,4 @@ export async function testBin(name: string, args: string[] = ["--version"], binD
   expect(status).toBe(0)
 
   expect(await io.which(name, true)).toBe(bin)
-
-  return binDir
 }