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

fix: v2 e2e tests #14655

Merged
merged 5 commits into from
Apr 18, 2024
Merged

fix: v2 e2e tests #14655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d3492a
fix: oauth-clients-users e2e -> auth was changed from access token to…
supalarry Apr 18, 2024
4dcc40b
fix: Gcal e2e
supalarry Apr 18, 2024
b41ccb1
remove gcal module
supalarry Apr 18, 2024
8e1b9a7
simplify gcal override
supalarry Apr 18, 2024
7893a23
Merge branch 'main' into fix-v2-e2e-tests
supalarry Apr 18, 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
17 changes: 17 additions & 0 deletions apps/api/v2/src/ee/gcal/gcal.controller.e2e-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { bootstrap } from "@/app";
import { AppModule } from "@/app.module";
import { CalendarsService } from "@/ee/calendars/services/calendars.service";
import { HttpExceptionFilter } from "@/filters/http-exception.filter";
import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter";
import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
Expand All @@ -18,6 +19,20 @@ import { UserRepositoryFixture } from "test/fixtures/repository/users.repository

const CLIENT_REDIRECT_URI = "http://localhost:5555";

class CalendarsServiceMock {
async getCalendars() {
return {
connectedCalendars: [
{
integration: {
type: "google_calendar",
},
},
],
};
}
}

describe("Platform Gcal Endpoints", () => {
let app: INestApplication;

Expand All @@ -42,6 +57,8 @@ describe("Platform Gcal Endpoints", () => {
.useValue({
canActivate: () => true,
})
.overrideProvider(CalendarsService)
.useClass(CalendarsServiceMock)
.compile();

app = moduleRef.createNestApplication();
Expand Down
6 changes: 3 additions & 3 deletions ...es/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.e2e-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ describe("OAuth Client Users Endpoints", () => {
it(`/GET/:id`, async () => {
const response = await request(app.getHttpServer())
.get(`/api/v2/oauth-clients/${oAuthClient.id}/users/${postResponseData.user.id}`)
.set("Authorization", `Bearer ${postResponseData.accessToken}`)
.set("x-cal-secret-key", oAuthClient.secret)
.set("Origin", `${CLIENT_REDIRECT_URI}`)
.expect(200);

Expand All @@ -216,7 +216,7 @@ describe("OAuth Client Users Endpoints", () => {

const response = await request(app.getHttpServer())
.patch(`/api/v2/oauth-clients/${oAuthClient.id}/users/${postResponseData.user.id}`)
.set("Authorization", `Bearer ${postResponseData.accessToken}`)
.set("x-cal-secret-key", oAuthClient.secret)
.set("Origin", `${CLIENT_REDIRECT_URI}`)
.send(body)
.expect(200);
Expand All @@ -231,7 +231,7 @@ describe("OAuth Client Users Endpoints", () => {
it(`/DELETE/:id`, () => {
return request(app.getHttpServer())
.delete(`/api/v2/oauth-clients/${oAuthClient.id}/users/${postResponseData.user.id}`)
.set("Authorization", `Bearer ${postResponseData.accessToken}`)
.set("x-cal-secret-key", oAuthClient.secret)
.set("Origin", `${CLIENT_REDIRECT_URI}`)
.expect(200);
});
Expand Down
Loading