Fixed access token generation for testcafe

This commit is contained in:
Ojakoo
2022-07-05 18:57:29 +03:00
parent 2ab8185a59
commit a1434b84be
4 changed files with 11 additions and 10 deletions
+3 -3
View File
@@ -1,6 +1,6 @@
import { Selector } from "testcafe"; import { Selector } from "testcafe";
import { import {
getSiteRoot, getPageUrl, generateTestForm, deleteEvent, deleteForm, doLogin, generateToken, getPostRequestLogger, getSiteRoot, getPageUrl, generateTestForm, deleteEvent, deleteForm, doLogin, generateAccessToken, getPostRequestLogger,
} from "../utils"; } from "../utils";
const LOGGER = getPostRequestLogger("events/"); const LOGGER = getPostRequestLogger("events/");
@@ -8,12 +8,12 @@ const LOGGER = getPostRequestLogger("events/");
fixture`Admin events`.page(`${getSiteRoot()}/admin/events`) fixture`Admin events`.page(`${getSiteRoot()}/admin/events`)
.requestHooks(LOGGER) .requestHooks(LOGGER)
.before(async (ctx) => { .before(async (ctx) => {
const token = await generateToken(); const token = await generateAccessToken();
const form = await generateTestForm(token); const form = await generateTestForm(token);
ctx.formId = form.id; ctx.formId = form.id;
}) })
.after(async (ctx) => { .after(async (ctx) => {
const token = await generateToken(); const token = await generateAccessToken();
await deleteEvent(ctx.eventId, token); await deleteEvent(ctx.eventId, token);
await deleteForm(ctx.formId, token); await deleteForm(ctx.formId, token);
}); });
+3 -2
View File
@@ -1,6 +1,6 @@
import { Selector } from "testcafe"; import { Selector } from "testcafe";
import { import {
getSiteRoot, getPageUrl, deleteForm, doLogin, generateToken, getPostRequestLogger, getSiteRoot, getPageUrl, deleteForm, doLogin, generateAccessToken, getPostRequestLogger,
} from "../utils"; } from "../utils";
const LOGGER = getPostRequestLogger("signupForm/"); const LOGGER = getPostRequestLogger("signupForm/");
@@ -8,7 +8,8 @@ const LOGGER = getPostRequestLogger("signupForm/");
fixture`Admin signup form`.page(`${getSiteRoot()}/admin/signups`) fixture`Admin signup form`.page(`${getSiteRoot()}/admin/signups`)
.requestHooks(LOGGER) .requestHooks(LOGGER)
.after(async (ctx) => { .after(async (ctx) => {
const token = await generateToken(); const token = await generateAccessToken();
await deleteForm(ctx.formId, token); await deleteForm(ctx.formId, token);
}); });
+3 -3
View File
@@ -1,18 +1,18 @@
import { Selector } from "testcafe"; import { Selector } from "testcafe";
import { import {
getSiteRoot, getPageUrl, generateTestEvent, generateTestForm, deleteEvent, deleteForm, generateToken, getSiteRoot, getPageUrl, generateTestEvent, generateTestForm, deleteEvent, deleteForm, generateAccessToken,
} from "./utils"; } from "./utils";
fixture`Event signup`.page(getSiteRoot()) fixture`Event signup`.page(getSiteRoot())
.before(async (ctx) => { .before(async (ctx) => {
const token = await generateToken(); const token = await generateAccessToken();
const form = await generateTestForm(token); const form = await generateTestForm(token);
const event = await generateTestEvent([form.id], token); const event = await generateTestEvent([form.id], token);
ctx.eventId = event.id; ctx.eventId = event.id;
ctx.formId = form.id; ctx.formId = form.id;
}) })
.after(async (ctx) => { .after(async (ctx) => {
const token = await generateToken(); const token = await generateAccessToken();
await deleteEvent(ctx.eventId, token); await deleteEvent(ctx.eventId, token);
await deleteForm(ctx.formId, token); await deleteForm(ctx.formId, token);
}); });
+2 -2
View File
@@ -26,7 +26,7 @@ export const doLogin = async (t: TestController) => {
await t.click(Selector("#login-submit")); await t.click(Selector("#login-submit"));
}; };
export async function generateToken(): Promise<string> { export async function generateAccessToken(): Promise<string> {
const tokenUrl = `${API_URL}/token/`; const tokenUrl = `${API_URL}/token/`;
try { try {
@@ -34,7 +34,7 @@ export async function generateToken(): Promise<string> {
username: USERNAME, username: USERNAME,
password: PASSWORD, password: PASSWORD,
}); });
return resp.data.token; return resp.data.access;
} catch (err) { } catch (err) {
console.error(err); console.error(err);
throw err; throw err;