Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(testing): prepare for noUncheckedIndexedAccess #4084

Merged
merged 11 commits into from
Jan 4, 2024
Merged

refactor(testing): prepare for noUncheckedIndexedAccess #4084

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
413a16d
refactor(testing): prepare for noUncheckedIndexedAccess
syhol Jan 4, 2024
d412a7c
tweaks
iuioiua Jan 4, 2024
e867e07
fix(testing): returnsArg throws when no arg at index
syhol Jan 4, 2024
eea3bf2
refactor(testing): sessions to use .at(-1) to get last item
syhol Jan 4, 2024
ede3fbd
non-null after check
syhol Jan 4, 2024
de22909
swap non-null assertions for as const
syhol Jan 4, 2024
d6226ab
proper error message
syhol Jan 4, 2024
34212a0
more as const in the mock_test file
syhol Jan 4, 2024
44182f8
fix tests for new behaviour
syhol Jan 4, 2024
06f2259
tweak
iuioiua Jan 4, 2024
76dc2ea
revert returnsArg handling back to `| undefined`
syhol Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
149 changes: 76 additions & 73 deletions testing/bdd_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@ Deno.test("global", async (t) => {
}

await t.step("global hooks", async () => {
const test = stub(Deno, "test"),
fns = [spy(), spy()],
{ beforeAllFn, afterAllFn, beforeEachFn, afterEachFn } = hookFns();
const test = stub(Deno, "test");
const fns = [spy(), spy()] as const;
const { beforeAllFn, afterAllFn, beforeEachFn, afterEachFn } = hookFns();

const context = new TestContext("global");
try {
Expand All @@ -138,7 +138,7 @@ Deno.test("global", async (t) => {

assertSpyCall(test, 0);
const call = test.calls[0];
const options = call.args[0] as Deno.TestDefinition;
const options = call?.args[0] as Deno.TestDefinition;
assertEquals(Object.keys(options).sort(), ["fn", "name"]);
assertEquals(options.name, "global");

Expand Down Expand Up @@ -190,7 +190,7 @@ Deno.test("global", async (t) => {
assertSpyCalls(fn, 0);
assertSpyCall(test, 0);
const call = test.calls[0];
const options = call.args[0] as Deno.TestDefinition;
const options = call?.args[0] as Deno.TestDefinition;
assertEquals(
Object.keys(options).sort(),
["name", "fn", ...Object.keys(expectedOptions)].sort(),
Expand Down Expand Up @@ -683,16 +683,16 @@ Deno.test("global", async (t) => {
*/
async function assertOptions(
expectedOptions: Omit<Deno.TestDefinition, "name" | "fn">,
cb: (fns: Spy[]) => void,
cb: (fns: readonly [Spy, Spy]) => void,
) {
const test = stub(Deno, "test");
const fns = [spy(), spy()];
const fns = [spy(), spy()] as const;
try {
cb(fns);

assertSpyCall(test, 0);
const call = test.calls[0];
const options = call.args[0] as Deno.TestDefinition;
const options = call?.args[0] as Deno.TestDefinition;
assertEquals(
Object.keys(options).sort(),
["name", "fn", ...Object.keys(expectedOptions)].sort(),
Expand Down Expand Up @@ -737,7 +737,7 @@ Deno.test("global", async (t) => {
* This is used to reduce code duplication when testing calling `describe` with different call signatures.
*/
async function assertMinimumOptions(
cb: (fns: Spy[]) => void,
cb: (fns: readonly [Spy, Spy]) => void,
) {
await assertOptions({}, cb);
}
Expand All @@ -748,7 +748,7 @@ Deno.test("global", async (t) => {
* This is used to reduce code duplication when testing calling `describe` with different call signatures.
*/
async function assertAllOptions(
cb: (fns: Spy[]) => void,
cb: (fns: readonly [Spy, Spy]) => void,
) {
await assertOptions({ ...baseOptions }, cb);
}
Expand Down Expand Up @@ -922,7 +922,7 @@ Deno.test("global", async (t) => {
* This is used to reduce code duplication when testing calling `describe.only` with different call signatures.
*/
async function assertMinimumOptions(
cb: (fns: Spy[]) => void,
cb: (fns: readonly [Spy, Spy]) => void,
) {
await assertOptions({ only: true }, cb);
}
Expand All @@ -933,7 +933,7 @@ Deno.test("global", async (t) => {
* This is used to reduce code duplication when testing calling `describe.only` with different call signatures.
*/
async function assertAllOptions(
cb: (fns: Spy[]) => void,
cb: (fns: readonly [Spy, Spy]) => void,
) {
await assertOptions({ ...baseOptions, only: true }, cb);
}
Expand Down Expand Up @@ -1123,7 +1123,7 @@ Deno.test("global", async (t) => {
* This is used to reduce code duplication when testing calling `describe.ignore` with different call signatures.
*/
async function assertMinimumOptions(
cb: (fns: Spy[]) => void,
cb: (fns: readonly [Spy, Spy]) => void,
) {
await assertOptions({ ignore: true }, cb);
}
Expand All @@ -1134,7 +1134,7 @@ Deno.test("global", async (t) => {
* This is used to reduce code duplication when testing calling `describe.ignore` with different call signatures.
*/
async function assertAllOptions(
cb: (fns: Spy[]) => void,
cb: (fns: readonly [Spy, Spy]) => void,
) {
await assertOptions({ ...baseOptions, ignore: true }, cb);
}
Expand Down Expand Up @@ -1327,16 +1327,16 @@ Deno.test("global", async (t) => {
* This is used to reduce code duplication when testing calling `describe.ignore` with different call signatures.
*/
async function assertOnly(
cb: (fns: Spy[]) => void,
cb: (fns: readonly [Spy, Spy, Spy]) => void,
) {
const test = stub(Deno, "test");
const fns = [spy(), spy(), spy()];
const fns = [spy(), spy(), spy()] as const;
try {
cb(fns);

assertSpyCall(test, 0);
const call = test.calls[0];
const options = call.args[0] as Deno.TestDefinition;
const options = call?.args[0] as Deno.TestDefinition;
assertEquals(
Object.keys(options).sort(),
["name", "only", "fn"].sort(),
Expand Down Expand Up @@ -1425,16 +1425,16 @@ Deno.test("global", async (t) => {
* This is used to reduce code duplication when testing calling `describe.ignore` with different call signatures.
*/
async function assertOnly(
cb: (fns: Spy[]) => void,
cb: (fns: readonly [Spy, Spy, Spy]) => void,
) {
const test = stub(Deno, "test");
const fns = [spy(), spy(), spy()];
const fns = [spy(), spy(), spy()] as const;
try {
cb(fns);

assertSpyCall(test, 0);
const call = test.calls[0];
const options = call.args[0] as Deno.TestDefinition;
const options = call?.args[0] as Deno.TestDefinition;
assertEquals(
Object.keys(options).sort(),
["name", "fn"].sort(),
Expand Down Expand Up @@ -1531,13 +1531,14 @@ Deno.test("global", async (t) => {
afterAllFn: Spy;
beforeEachFn: Spy;
afterEachFn: Spy;
fns: Spy[];
fns: readonly [Spy, Spy];
},
) => void,
) {
const test = stub(Deno, "test"),
fns = [spy(), spy()],
{ beforeAllFn, afterAllFn, beforeEachFn, afterEachFn } = hookFns();
const test = stub(Deno, "test");
const fns = [spy(), spy()] as const;
const { beforeAllFn, afterAllFn, beforeEachFn, afterEachFn } =
hookFns();

const context = new TestContext("example");
try {
Expand All @@ -1548,7 +1549,7 @@ Deno.test("global", async (t) => {

assertSpyCall(test, 0);
const call = test.calls[0];
const options = call.args[0] as Deno.TestDefinition;
const options = call?.args[0] as Deno.TestDefinition;
assertEquals(Object.keys(options).sort(), ["fn", "name"]);
assertEquals(options.name, "example");

Expand Down Expand Up @@ -1631,9 +1632,10 @@ Deno.test("global", async (t) => {
await t.step(
"nested",
async () => {
const test = stub(Deno, "test"),
fns = [spy(), spy()],
{ beforeAllFn, afterAllFn, beforeEachFn, afterEachFn } = hookFns();
const test = stub(Deno, "test");
const fns = [spy(), spy()] as readonly [Spy, Spy];
const { beforeAllFn, afterAllFn, beforeEachFn, afterEachFn } =
hookFns();

const context = new TestContext("example");
try {
Expand All @@ -1655,7 +1657,7 @@ Deno.test("global", async (t) => {

assertSpyCall(test, 0);
const call = test.calls[0];
const options = call.args[0] as Deno.TestDefinition;
const options = call?.args[0] as Deno.TestDefinition;
assertEquals(Object.keys(options).sort(), ["fn", "name"]);
assertEquals(options.name, "example");

Expand All @@ -1666,7 +1668,7 @@ Deno.test("global", async (t) => {

assertStrictEquals(Promise.resolve(result), result);
assertEquals(await result, undefined);
assertSpyCalls(context.steps[0].spies.step, 2);
assertSpyCalls(context.steps[0]!.spies.step, 2);
} finally {
TestSuiteInternal.reset();
test.restore();
Expand All @@ -1675,15 +1677,15 @@ Deno.test("global", async (t) => {
let fn = fns[0];
assertSpyCall(fn, 0, {
self: { allTimer: 1, eachTimer: 2 },
args: [context.steps[0].steps[0]],
args: [context.steps[0]!.steps[0]],
returned: undefined,
});
assertSpyCalls(fn, 1);

fn = fns[1];
assertSpyCall(fn, 0, {
self: { allTimer: 1, eachTimer: 3 },
args: [context.steps[0].steps[1]],
args: [context.steps[0]!.steps[1]],
returned: undefined,
});
assertSpyCalls(fn, 1);
Expand All @@ -1705,46 +1707,47 @@ Deno.test("global", async (t) => {
await t.step(
"nested with hooks",
async () => {
const test = stub(Deno, "test"),
fns = [
spy(function (this: NestedContext) {
this.x = 2;
}),
spy(function (this: NestedContext) {
this.y = 3;
}),
],
{ beforeAllFn, afterAllFn, beforeEachFn, afterEachFn } = hookFns(),
beforeAllFnNested = spy(async function (this: NestedContext) {
await Promise.resolve();
this.x = 1;
this.allTimerNested = timerIdx++;
timers.set(
this.allTimerNested,
setTimeout(() => {}, 10000),
);
const test = stub(Deno, "test");
const fns = [
spy(function (this: NestedContext) {
this.x = 2;
}),
afterAllFnNested = spy(
async function (this: NestedContext) {
await Promise.resolve();
clearTimeout(timers.get(this.allTimerNested));
},
),
beforeEachFnNested = spy(async function (this: NestedContext) {
await Promise.resolve();
this.y = 2;
this.eachTimerNested = timerIdx++;
timers.set(
this.eachTimerNested,
setTimeout(() => {}, 10000),
);
spy(function (this: NestedContext) {
this.y = 3;
}),
afterEachFnNested = spy(
async function (this: NestedContext) {
await Promise.resolve();
clearTimeout(timers.get(this.eachTimerNested));
},
] as const;
const { beforeAllFn, afterAllFn, beforeEachFn, afterEachFn } =
hookFns();
const beforeAllFnNested = spy(async function (this: NestedContext) {
await Promise.resolve();
this.x = 1;
this.allTimerNested = timerIdx++;
timers.set(
this.allTimerNested,
setTimeout(() => {}, 10000),
);
});
const afterAllFnNested = spy(
async function (this: NestedContext) {
await Promise.resolve();
clearTimeout(timers.get(this.allTimerNested));
},
);
const beforeEachFnNested = spy(async function (this: NestedContext) {
await Promise.resolve();
this.y = 2;
this.eachTimerNested = timerIdx++;
timers.set(
this.eachTimerNested,
setTimeout(() => {}, 10000),
);
});
const afterEachFnNested = spy(
async function (this: NestedContext) {
await Promise.resolve();
clearTimeout(timers.get(this.eachTimerNested));
},
);

const context = new TestContext("example");
try {
Expand Down Expand Up @@ -1772,7 +1775,7 @@ Deno.test("global", async (t) => {

assertSpyCall(test, 0);
const call = test.calls[0];
const options = call.args[0] as Deno.TestDefinition;
const options = call?.args[0] as Deno.TestDefinition;
assertEquals(Object.keys(options).sort(), ["fn", "name"]);
assertEquals(options.name, "example");

Expand All @@ -1783,7 +1786,7 @@ Deno.test("global", async (t) => {

assertStrictEquals(Promise.resolve(result), result);
assertEquals(await result, undefined);
assertSpyCalls(context.steps[0].spies.step, 2);
assertSpyCalls(context.steps[0]!.spies.step, 2);
} finally {
TestSuiteInternal.reset();
test.restore();
Expand All @@ -1799,7 +1802,7 @@ Deno.test("global", async (t) => {
x: 2,
y: 2,
},
args: [context.steps[0].steps[0]],
args: [context.steps[0]!.steps[0]],
returned: undefined,
});
assertSpyCalls(fn, 1);
Expand All @@ -1814,7 +1817,7 @@ Deno.test("global", async (t) => {
x: 1,
y: 3,
},
args: [context.steps[0].steps[1]],
args: [context.steps[0]!.steps[1]],
returned: undefined,
});
assertSpyCalls(fn, 1);
Expand Down
Loading