Skip to content

test: make calendar api tests fully independent #31785

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

Merged
ggazzo merged 2 commits into from
Feb 23, 2024
Merged

test: make calendar api tests fully independent #31785

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6df312
test: make calendar api tests fully independent
Feb 19, 2024
45819cf
Merge branch 'develop' into test/decouple-calendar
Feb 20, 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
51 changes: 28 additions & 23 deletions apps/meteor/tests/end-to-end/api/30-calendar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { Response } from 'supertest';

import { getCredentials, api, request, credentials } from '../../data/api-data.js';
import { password } from '../../data/user';
import { createUser, login } from '../../data/users.helper';
import { createUser, deleteUser, login } from '../../data/users.helper';

describe('[Calendar Events]', function () {
this.retries(0);
Expand All @@ -19,6 +19,8 @@ describe('[Calendar Events]', function () {
userCredentials = await login(user2.username, password);
});

after(() => deleteUser(user2));

describe('[/calendar-events.create]', () => {
it('should successfully create an event in the calendar', async () => {
let eventId: string | undefined;
Expand Down Expand Up @@ -155,11 +157,13 @@ describe('[Calendar Events]', function () {
});
});

after(async () => {
await request.post(api('calendar-events.delete')).set(credentials).send({ eventId });
await request.post(api('calendar-events.delete')).set(credentials).send({ eventId: eventId2 });
await request.post(api('calendar-events.delete')).set(userCredentials).send({ eventId: eventId3 });
});
after(() =>
Promise.all([
request.post(api('calendar-events.delete')).set(credentials).send({ eventId }),
request.post(api('calendar-events.delete')).set(credentials).send({ eventId: eventId2 }),
request.post(api('calendar-events.delete')).set(userCredentials).send({ eventId: eventId3 }),
]),
);

it('should list only the events with the same date', async () => {
await request
Expand Down Expand Up @@ -233,10 +237,12 @@ describe('[Calendar Events]', function () {
});
});

after(async () => {
await request.post(api('calendar-events.delete')).set(credentials).send({ eventId });
await request.post(api('calendar-events.delete')).set(userCredentials).send({ eventId: eventId2 });
});
after(() =>
Promise.all([
request.post(api('calendar-events.delete')).set(credentials).send({ eventId }),
request.post(api('calendar-events.delete')).set(userCredentials).send({ eventId: eventId2 }),
]),
);

it('should return the event information', async () => {
await request
Expand Down Expand Up @@ -292,6 +298,14 @@ describe('[Calendar Events]', function () {
});

describe('[/calendar-events.import]', () => {
const eventsToRemove: Record<string, any>[] = [];

after(() =>
Promise.all([
...eventsToRemove.map(({ credentials, eventId }) => request.post(api('calendar-events.delete')).set(credentials).send({ eventId })),
]),
);

it('should successfully import an event to the calendar', async () => {
let eventId: string | undefined;
const externalId = `calendar-events.import-${Date.now()}`;
Expand All @@ -311,11 +325,8 @@ describe('[Calendar Events]', function () {
.expect((res: Response) => {
expect(res.body).to.have.property('success', true);
eventId = res.body.id;
eventsToRemove.push({ credentials, eventId });
});

after(async () => {
await request.post(api('calendar-events.delete')).set(credentials).send({ eventId });
});
});

it('should fail to import an event without an external id', async () => {
Expand Down Expand Up @@ -400,11 +411,6 @@ describe('[Calendar Events]', function () {
let eventId2: string | undefined;
const externalId = `calendar-events.import-${Date.now()}`;

after(async () => {
await request.post(api('calendar-events.delete')).set(userCredentials).send({ eventId });
await request.post(api('calendar-events.delete')).set(credentials).send({ eventId: eventId2 });
});

await request
.post(api('calendar-events.import'))
.set(userCredentials)
Expand All @@ -417,6 +423,7 @@ describe('[Calendar Events]', function () {
})
.then((res) => {
eventId = res.body.id;
eventsToRemove.push({ credentials: userCredentials, eventId });
});

await request
Expand All @@ -435,6 +442,7 @@ describe('[Calendar Events]', function () {
expect(res.body).to.have.property('success', true);
expect(res.body.id).to.not.be.equal(eventId);
eventId2 = res.body.id;
eventsToRemove.push({ credentials, eventId: eventId2 });
});

await request
Expand Down Expand Up @@ -464,10 +472,6 @@ describe('[Calendar Events]', function () {
let eventId: string | undefined;
const externalId = `calendar-events.import-twice-${Date.now()}`;

after(async () => {
await request.post(api('calendar-events.delete')).set(credentials).send({ eventId });
});

await request
.post(api('calendar-events.import'))
.set(credentials)
Expand All @@ -480,6 +484,7 @@ describe('[Calendar Events]', function () {
})
.then((res) => {
eventId = res.body.id;
eventsToRemove.push({ credentials, eventId });
});

await request
Expand Down