@vitest/runner 1.1.0 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/dist/index.js +23 -24
  2. package/package.json +2 -2
package/dist/index.js CHANGED
@@ -139,30 +139,7 @@ function withFixtures(fn, testContext) {
139
139
  for (const fixture of pendingFixtures) {
140
140
  if (fixtureValueMap.has(fixture))
141
141
  continue;
142
- let resolvedValue;
143
- if (fixture.isFn) {
144
- const useFnArgPromise = createDefer();
145
- let isUseFnArgResolved = false;
146
- const fixtureReturn = fixture.value(context, async (useFnArg) => {
147
- isUseFnArgResolved = true;
148
- useFnArgPromise.resolve(useFnArg);
149
- const useReturnPromise = createDefer();
150
- cleanupFnArray.push(async () => {
151
- useReturnPromise.resolve();
152
- await fixtureReturn;
153
- });
154
- await useReturnPromise;
155
- }).catch((e) => {
156
- if (!isUseFnArgResolved) {
157
- useFnArgPromise.reject(e);
158
- return;
159
- }
160
- throw e;
161
- });
162
- resolvedValue = await useFnArgPromise;
163
- } else {
164
- resolvedValue = fixture.value;
165
- }
142
+ const resolvedValue = fixture.isFn ? await resolveFixtureFunction(fixture.value, context, cleanupFnArray) : fixture.value;
166
143
  context[fixture.prop] = resolvedValue;
167
144
  fixtureValueMap.set(fixture, resolvedValue);
168
145
  cleanupFnArray.unshift(() => {
@@ -173,6 +150,27 @@ function withFixtures(fn, testContext) {
173
150
  return resolveFixtures().then(() => fn(context));
174
151
  };
175
152
  }
153
+ async function resolveFixtureFunction(fixtureFn, context, cleanupFnArray2) {
154
+ const useFnArgPromise = createDefer();
155
+ let isUseFnArgResolved = false;
156
+ const fixtureReturn = fixtureFn(context, async (useFnArg) => {
157
+ isUseFnArgResolved = true;
158
+ useFnArgPromise.resolve(useFnArg);
159
+ const useReturnPromise = createDefer();
160
+ cleanupFnArray2.push(async () => {
161
+ useReturnPromise.resolve();
162
+ await fixtureReturn;
163
+ });
164
+ await useReturnPromise;
165
+ }).catch((e) => {
166
+ if (!isUseFnArgResolved) {
167
+ useFnArgPromise.reject(e);
168
+ return;
169
+ }
170
+ throw e;
171
+ });
172
+ return useFnArgPromise;
173
+ }
176
174
  function resolveDeps(fixtures, depSet = /* @__PURE__ */ new Set(), pendingFixtures = []) {
177
175
  fixtures.forEach((fixture) => {
178
176
  if (pendingFixtures.includes(fixture))
@@ -692,6 +690,7 @@ async function runTest(test, runner) {
692
690
  test.mode = "skip";
693
691
  test.result = { state: "skip" };
694
692
  updateTask(test, runner);
693
+ setCurrentTest(void 0);
695
694
  return;
696
695
  }
697
696
  try {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@vitest/runner",
3
3
  "type": "module",
4
- "version": "1.1.0",
4
+ "version": "1.1.1",
5
5
  "description": "Vitest test runner",
6
6
  "license": "MIT",
7
7
  "funding": "https://opencollective.com/vitest",
@@ -40,7 +40,7 @@
40
40
  "dependencies": {
41
41
  "p-limit": "^5.0.0",
42
42
  "pathe": "^1.1.1",
43
- "@vitest/utils": "1.1.0"
43
+ "@vitest/utils": "1.1.1"
44
44
  },
45
45
  "scripts": {
46
46
  "build": "rimraf dist && rollup -c",