diff --git a/tests/testcafe/admin/create-event.test.ts b/tests/testcafe/admin/create-event.test.ts index 8df7f6b..41f0917 100644 --- a/tests/testcafe/admin/create-event.test.ts +++ b/tests/testcafe/admin/create-event.test.ts @@ -1,6 +1,6 @@ import { Selector } from "testcafe"; import { - getSiteRoot, getPageUrl, generateTestForm, deleteEvent, deleteForm, doLogin, generateToken, getPostRequestLogger, + getSiteRoot, getPageUrl, generateTestForm, deleteEvent, deleteForm, doLogin, generateAccessToken, getPostRequestLogger, } from "../utils"; const LOGGER = getPostRequestLogger("events/"); @@ -8,12 +8,12 @@ const LOGGER = getPostRequestLogger("events/"); fixture`Admin events`.page(`${getSiteRoot()}/admin/events`) .requestHooks(LOGGER) .before(async (ctx) => { - const token = await generateToken(); + const token = await generateAccessToken(); const form = await generateTestForm(token); ctx.formId = form.id; }) .after(async (ctx) => { - const token = await generateToken(); + const token = await generateAccessToken(); await deleteEvent(ctx.eventId, token); await deleteForm(ctx.formId, token); }); diff --git a/tests/testcafe/admin/create-signup.test.ts b/tests/testcafe/admin/create-signup.test.ts index b272b3e..afe5767 100644 --- a/tests/testcafe/admin/create-signup.test.ts +++ b/tests/testcafe/admin/create-signup.test.ts @@ -1,6 +1,6 @@ import { Selector } from "testcafe"; import { - getSiteRoot, getPageUrl, deleteForm, doLogin, generateToken, getPostRequestLogger, + getSiteRoot, getPageUrl, deleteForm, doLogin, generateAccessToken, getPostRequestLogger, } from "../utils"; const LOGGER = getPostRequestLogger("signupForm/"); @@ -8,7 +8,8 @@ const LOGGER = getPostRequestLogger("signupForm/"); fixture`Admin signup form`.page(`${getSiteRoot()}/admin/signups`) .requestHooks(LOGGER) .after(async (ctx) => { - const token = await generateToken(); + const token = await generateAccessToken(); + await deleteForm(ctx.formId, token); }); diff --git a/tests/testcafe/signupToEvent.test.ts b/tests/testcafe/signupToEvent.test.ts index e447d89..5205188 100644 --- a/tests/testcafe/signupToEvent.test.ts +++ b/tests/testcafe/signupToEvent.test.ts @@ -1,18 +1,18 @@ import { Selector } from "testcafe"; import { - getSiteRoot, getPageUrl, generateTestEvent, generateTestForm, deleteEvent, deleteForm, generateToken, + getSiteRoot, getPageUrl, generateTestEvent, generateTestForm, deleteEvent, deleteForm, generateAccessToken, } from "./utils"; fixture`Event signup`.page(getSiteRoot()) .before(async (ctx) => { - const token = await generateToken(); + const token = await generateAccessToken(); const form = await generateTestForm(token); const event = await generateTestEvent([form.id], token); ctx.eventId = event.id; ctx.formId = form.id; }) .after(async (ctx) => { - const token = await generateToken(); + const token = await generateAccessToken(); await deleteEvent(ctx.eventId, token); await deleteForm(ctx.formId, token); }); diff --git a/tests/testcafe/utils.ts b/tests/testcafe/utils.ts index ddd760b..e734fd7 100644 --- a/tests/testcafe/utils.ts +++ b/tests/testcafe/utils.ts @@ -26,7 +26,7 @@ export const doLogin = async (t: TestController) => { await t.click(Selector("#login-submit")); }; -export async function generateToken(): Promise { +export async function generateAccessToken(): Promise { const tokenUrl = `${API_URL}/token/`; try { @@ -34,7 +34,7 @@ export async function generateToken(): Promise { username: USERNAME, password: PASSWORD, }); - return resp.data.token; + return resp.data.access; } catch (err) { console.error(err); throw err;