Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
52 changes: 51 additions & 1 deletion src/rules/__tests__/prefer-ending-with-an-expect.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ ruleTester.run('prefer-ending-with-an-expect', rule, {
code: dedent`
test('verifies chained expect method call', () => {
doSomething();

tester
.foo()
.bar()
Expand All @@ -70,6 +70,10 @@ ruleTester.run('prefer-ending-with-an-expect', rule, {
`,
options: [{ assertFunctionNames: ['td.verify'] }],
},
{
code: 'it("should pass", async () => expect(true).toBeDefined())',
parserOptions: { ecmaVersion: 2017 },
},
{
code: 'it("should pass", () => expect(true).toBeDefined())',
options: [
Expand All @@ -92,6 +96,34 @@ ruleTester.run('prefer-ending-with-an-expect', rule, {
expect(container.toHTML()).toContain('Hello Bob!');
});
`,
{
code: dedent`
it('is a complete test', async () => {
const container = render(Greeter);

expect(container).toBeDefined();

container.setProp('name', 'Bob');

await expect(container.toHTML()).resolve.toContain('Hello Bob!');
});
`,
parserOptions: { ecmaVersion: 2017 },
},
{
code: dedent`
it('is a complete test', async function () {
const container = render(Greeter);

expect(container).toBeDefined();

container.setProp('name', 'Bob');

await expect(container.toHTML()).resolve.toContain('Hello Bob!');
});
`,
parserOptions: { ecmaVersion: 2017 },
},
{
code: dedent`
describe('GET /user', function () {
Expand Down Expand Up @@ -280,6 +312,24 @@ ruleTester.run('prefer-ending-with-an-expect', rule, {
},
],
},
{
code: dedent`
it('is a complete test', async () => {
const container = render(Greeter);

await expect(container).toBeDefined();

await container.setProp('name', 'Bob');
});
`,
parserOptions: { ecmaVersion: 2017 },
errors: [
{
messageId: 'mustEndWithExpect',
type: AST_NODE_TYPES.Identifier,
},
],
},
],
});

Expand Down
6 changes: 5 additions & 1 deletion src/rules/prefer-ending-with-an-expect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,11 @@ export default createRule<
return;
}

const lastStatement = getLastStatement(node.arguments[1]);
let lastStatement = getLastStatement(node.arguments[1]);

if (lastStatement?.type === AST_NODE_TYPES.AwaitExpression) {
lastStatement = lastStatement.argument;
}

if (
lastStatement?.type === AST_NODE_TYPES.CallExpression &&
Expand Down