Use testProp for tests with fc.pre

Possible due to the bump to `(at)fast-check/ava` v1.2.0
ericcornelissen · Nov 22, 2023 · 348dc50 · 348dc50
1 parent b5a4ef3
commit 348dc50
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 65 deletions.
diff --git a/test/unit/executables/resolve.test.js b/test/unit/executables/resolve.test.js
@@ -96,33 +96,32 @@ testProp("env.PATH and env.Path are missing", [arbitrary.env()], (t, env) => {
   );
 });
 
-test("env.PATH is polluted", (t) => {
-  fc.assert(
-    fc.property(
-      arbitrary.env({ keys: ["PATH", "Path"] }),
-      fc.constantFrom("PATH", "Path"),
-      fc.string(),
-      (env, pathName, prototypePath) => {
-        fc.pre(env.PATH !== prototypePath && env.Path !== prototypePath);
-
-        t.context.deps.which.resetHistory();
-
-        env = Object.assign(Object.create({ [pathName]: prototypePath }), env);
-
-        const { executable } = t.context;
-        const args = { env, executable };
-
-        resolveExecutable(args, t.context.deps);
-        t.is(t.context.deps.which.callCount, 1);
-        t.false(
-          t.context.deps.which.calledWithExactly(sinon.match.any, {
-            path: prototypePath,
-          }),
-        );
-      },
-    ),
-  );
-});
+testProp(
+  "env.PATH is polluted",
+  [
+    arbitrary.env({ keys: ["PATH", "Path"] }),
+    fc.constantFrom("PATH", "Path"),
+    fc.string(),
+  ],
+  (t, env, pathName, prototypePath) => {
+    fc.pre(env.PATH !== prototypePath && env.Path !== prototypePath);
+
+    t.context.deps.which.resetHistory();
+
+    env = Object.assign(Object.create({ [pathName]: prototypePath }), env);
+
+    const { executable } = t.context;
+    const args = { env, executable };
+
+    resolveExecutable(args, t.context.deps);
+    t.is(t.context.deps.which.callCount, 1);
+    t.false(
+      t.context.deps.which.calledWithExactly(sinon.match.any, {
+        path: prototypePath,
+      }),
+    );
+  },
+);
 
 test("the executable cannot be resolved", (t) => {
   const { env, executable } = t.context;

diff --git a/test/unit/platforms/get-helpers.test.js b/test/unit/platforms/get-helpers.test.js
@@ -5,7 +5,6 @@
  */
 
 import { testProp } from "@fast-check/ava";
-import test from "ava";
 import * as fc from "fast-check";
 
 import { arbitrary, constants } from "./_.js";
@@ -72,24 +71,23 @@ for (const osType of winOsTypes) {
   );
 }
 
-test("env.OSTYPE is polluted", (t) => {
-  fc.assert(
-    fc.property(
-      arbitrary.env({ keys: ["OSTYPE"] }),
-      fc.constantFrom(...winOsTypes),
-      fc.constantFrom(...unixPlatforms),
-      (env, prototypeOstype, platform) => {
-        fc.pre(![...winOsTypes].includes(env.OSTYPE));
-
-        env = Object.assign(Object.create({ OSTYPE: prototypeOstype }), env);
-
-        const result = getHelpersByPlatform({
-          env,
-          platform,
-        });
-
-        t.deepEqual(result, unix);
-      },
-    ),
-  );
-});
+testProp(
+  "env.OSTYPE is polluted",
+  [
+    arbitrary.env({ keys: ["OSTYPE"] }),
+    fc.constantFrom(...winOsTypes),
+    fc.constantFrom(...unixPlatforms),
+  ],
+  (t, env, prototypeOstype, platform) => {
+    fc.pre(![...winOsTypes].includes(env.OSTYPE));
+
+    env = Object.assign(Object.create({ OSTYPE: prototypeOstype }), env);
+
+    const result = getHelpersByPlatform({
+      env,
+      platform,
+    });
+
+    t.deepEqual(result, unix);
+  },
+);
diff --git a/test/unit/win/index.test.js b/test/unit/win/index.test.js
@@ -55,22 +55,18 @@ testProp(
   },
 );
 
-test("the default shell when %COMSPEC% is polluted", (t) => {
-  fc.assert(
-    fc.property(
-      arbitrary.env({ keys: ["ComSpec"] }),
-      fc.string(),
-      (env, prototypeComSpec) => {
-        fc.pre(env.ComSpec !== prototypeComSpec);
-
-        env = Object.assign(Object.create({ ComSpec: prototypeComSpec }), env);
-
-        const result = win.getDefaultShell({ env });
-        t.not(result, prototypeComSpec);
-      },
-    ),
-  );
-});
+testProp(
+  "the default shell when %COMSPEC% is polluted",
+  [arbitrary.env({ keys: ["ComSpec"] }), fc.string()],
+  (t, env, prototypeComSpec) => {
+    fc.pre(env.ComSpec !== prototypeComSpec);
+
+    env = Object.assign(Object.create({ ComSpec: prototypeComSpec }), env);
+
+    const result = win.getDefaultShell({ env });
+    t.not(result, prototypeComSpec);
+  },
+);
 
 test("escape function for no shell", (t) => {
   const actual = win.getEscapeFunction(noShell);