Skip to content

Commit

Permalink
Remove controlledPromise
Browse files Browse the repository at this point in the history
  • Loading branch information
Exelord committed Jan 20, 2023
1 parent a3d553a commit e4fc1fe
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 28 deletions.
20 changes: 0 additions & 20 deletions src/utils/promise.ts
Original file line number Diff line number Diff line change
@@ -1,23 +1,3 @@
export interface ControlledPromise<T = any> extends Promise<T> {
resolve: (value: T) => void;
reject: (reason?: unknown) => void;
}

export function controlledPromise<T = any>(): ControlledPromise<T> {
let resolve;
let reject;

const promise = new Promise((resolvePromise, rejectPromise) => {
resolve = resolvePromise;
reject = rejectPromise;
}) as ControlledPromise<T>;

promise.resolve = resolve as any as ControlledPromise["resolve"];
promise.reject = reject as any as ControlledPromise["reject"];

return promise;
}

export function cancellablePromise<T>(
signal: AbortSignal,
promise: Promise<T>
Expand Down
9 changes: 1 addition & 8 deletions tests/vitest/task.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
TaskDroppedError,
TaskStatus,
} from "../../src/task";
import { controlledPromise } from "../../src/utils/promise";
import { describe, test, expect } from "vitest";

describe("Task", () => {
Expand Down Expand Up @@ -51,8 +50,7 @@ describe("Task", () => {

describe("#cancel", async () => {
test("cancelling pending task", async () => {
const promise = controlledPromise();
const task = createTask(() => promise);
const task = createTask(() => new Promise(() => {}));

expect(task.status).toBe(TaskStatus.Idle);

Expand All @@ -64,11 +62,6 @@ describe("Task", () => {

expect(task.status).toBe(TaskStatus.Canceled);
expect(task.error).toBeInstanceOf(TaskCancelledError);

promise.resolve(undefined);

expect(task.status).toBe(TaskStatus.Canceled);
expect(task.error).toBeInstanceOf(TaskCancelledError);
});

test("cancelling idle task", async () => {
Expand Down

0 comments on commit e4fc1fe

Please sign in to comment.