fix(test): apply suggestions

Author: salome-voltz

src/lib/ggshield-configuration-utils.ts

@@ -24,9 +24,9 @@ export function getConfiguration(
     ggshieldPath
       ? ggshieldPath
       : getBinaryAbsolutePath(os.platform(), os.arch(), context),
-    apiUrl ? apiUrl : apiUrlDefault,
-    apiKey ? apiKey : "",
-    allowSelfSigned ? allowSelfSigned : false
+    apiUrl || apiUrlDefault,
+    apiKey || "",
+    allowSelfSigned || false
   );
 }
 

src/test/suite/lib/ggshield-configuration-utils.test.ts

@@ -1,24 +1,14 @@
 import * as simple from "simple-mock";
 import assert = require("assert");
 import { ExtensionContext, workspace } from "vscode";
-import * as GGShieldConfiguration from "../../../lib/ggshield-configuration";
 import { getConfiguration } from "../../../lib/ggshield-configuration-utils";
 
 suite("getConfiguration", () => {
   let getConfigurationMock: simple.Stub<Function>;
-  let constructorMock: simple.Stub<Function>;
-  let context: Partial<ExtensionContext>;
 
   setup(() => {
     // Mock workspace.getConfiguration
     getConfigurationMock = simple.mock(workspace, "getConfiguration");
-
-    // Mock the GGShieldConfiguration constructor globally
-    constructorMock = simple.mock(
-      GGShieldConfiguration,
-      "GGShieldConfiguration"
-    );
-    context = {} as ExtensionContext;
   });
 
   teardown(() => {
@@ -42,25 +32,18 @@ suite("getConfiguration", () => {
         }
       },
     });
-    constructorMock.returnWith({});
-
-    getConfiguration(context as ExtensionContext);
+    const configuration = getConfiguration({} as ExtensionContext);
 
     // Assert both workspace.getConfiguration  and GGShieldConfiguration constructor were called
     assert(
       getConfigurationMock.called,
       "getConfiguration should be called once"
     );
-    assert(
-      constructorMock.called,
-      "GGShieldConfiguration constructor should be called once"
-    );
 
-    // Check the arguments passed to GGShieldConfiguration constructor
-    const ggshieldConfigurationArgs = constructorMock.lastCall.args;
-    assert.strictEqual(ggshieldConfigurationArgs[0], "path/to/ggshield");
-    assert.strictEqual(ggshieldConfigurationArgs[1], "https://custom-url.com");
-    assert.strictEqual(ggshieldConfigurationArgs[2], "test-api-key");
-    assert.strictEqual(ggshieldConfigurationArgs[3], true);
+    // Assert that the configuration has the expected values
+    assert.strictEqual(configuration.ggshieldPath, "path/to/ggshield");
+    assert.strictEqual(configuration.apiUrl, "https://custom-url.com");
+    assert.strictEqual(configuration.apiKey, "test-api-key");
+    assert.strictEqual(configuration.allowSelfSigned, true);
   });
 });

src/test/suite/lib/run-ggshield.test.ts

@@ -61,15 +61,15 @@ suite("runGGShieldCommand", () => {
           apiKey: "",
           allowSelfSigned: allowSelfSigned,
         } as GGShieldConfiguration,
-        []
+        ["test"]
       );
 
       assert(spawnSyncMock.called, "spawnSync should be called once");
 
       const spawnSyncArgs = spawnSyncMock.lastCall.args;
       const args = spawnSyncArgs[1];
 
-      assert.strictEqual(args.includes("--allow-self-signed"), allowSelfSigned);
+      assert.strictEqual(args[0] === "--allow-self-signed", allowSelfSigned);
     });
   });
 });