update: userContext/userroles tests use core apps

Author: namsnath

test/end-to-end/userContext.test.js

@@ -13,7 +13,6 @@
  * under the License.
  */
 
-import puppeteer from "puppeteer";
 import {
     clearBrowserCookiesWithoutAffectingConsole,
     getLatestURLWithToken,
@@ -24,13 +23,15 @@ import {
     assertProviders,
     clickOnProviderButton,
     loginWithAuth0,
-    backendBeforeEach,
     waitForUrl,
     setupBrowser,
+    backendHook,
+    setupCoreApp,
+    setupST,
+    screenshotOnFailure,
 } from "../helpers";
 import {
     TEST_CLIENT_BASE_URL,
-    TEST_SERVER_BASE_URL,
     RESET_PASSWORD_TOKEN_API,
     RESET_PASSWORD_API,
     SIGN_IN_UP_API,
@@ -43,11 +44,9 @@ describe("SuperTokens userContext with UI components test", function () {
     let consoleLogs = [];
 
     before(async function () {
-        await backendBeforeEach();
-
-        await fetch(`${TEST_SERVER_BASE_URL}/startst`, {
-            method: "POST",
-        }).catch(console.error);
+        backendHook("before");
+        const coreUrl = await setupCoreApp();
+        await setupST({ coreUrl });
 
         browser = await setupBrowser();
         page = await browser.newPage();
@@ -59,18 +58,8 @@ describe("SuperTokens userContext with UI components test", function () {
         });
     });
 
-    after(async function () {
-        await browser.close();
-        await fetch(`${TEST_SERVER_BASE_URL}/after`, {
-            method: "POST",
-        }).catch(console.error);
-
-        await fetch(`${TEST_SERVER_BASE_URL}/stopst`, {
-            method: "POST",
-        }).catch(console.error);
-    });
-
     beforeEach(async function () {
+        await backendHook("beforeEach");
         consoleLogs = [];
         consoleLogs = await clearBrowserCookiesWithoutAffectingConsole(page, consoleLogs);
         await Promise.all([
@@ -79,6 +68,17 @@ describe("SuperTokens userContext with UI components test", function () {
         ]);
     });
 
+    afterEach(async function () {
+        await screenshotOnFailure(this, browser);
+        await backendHook("afterEach");
+    });
+
+    after(async function () {
+        await page?.close();
+        await browser?.close();
+        await backendHook("after");
+    });
+
     it("Test that user context gets passed correctly when resetting password", async function () {
         await Promise.all([
             page.goto(`${TEST_CLIENT_BASE_URL}/auth?authRecipe=thirdpartyemailpassword&mode=OFF&forUserContext=true`),

test/end-to-end/userroles.test.js

@@ -17,8 +17,6 @@
  * Imports
  */
 import assert from "assert";
-import puppeteer from "puppeteer";
-import fetch from "isomorphic-fetch";
 import {
     clearBrowserCookiesWithoutAffectingConsole,
     screenshotOnFailure,
@@ -30,15 +28,17 @@ import {
     getInvalidClaimsJSON as getInvalidClaims,
     waitFor,
     waitForText,
-    backendBeforeEach,
     waitForUrl,
     setupBrowser,
+    backendHook,
+    setupCoreApp,
+    setupST,
 } from "../helpers";
-
-import { TEST_APPLICATION_SERVER_BASE_URL, TEST_CLIENT_BASE_URL, TEST_SERVER_BASE_URL } from "../constants";
+import { TEST_APPLICATION_SERVER_BASE_URL, TEST_CLIENT_BASE_URL } from "../constants";
 
 describe("User Roles in the frontend", function () {
     before(async function () {
+        backendHook("before");
         const isRolesSupported = await isUserRolesSupported();
         if (!isRolesSupported) {
             this.skip();
@@ -49,11 +49,8 @@ describe("User Roles in the frontend", function () {
         let browser;
         let page;
         before(async function () {
-            await backendBeforeEach();
-
-            await fetch(`${TEST_SERVER_BASE_URL}/startst`, {
-                method: "POST",
-            }).catch(console.error);
+            const coreUrl = await setupCoreApp();
+            await setupST({ coreUrl });
 
             browser = await setupBrowser();
             page = await browser.newPage();
@@ -66,24 +63,8 @@ describe("User Roles in the frontend", function () {
             await page.close();
         });
 
-        after(async function () {
-            await browser.close();
-            await fetch(`${TEST_SERVER_BASE_URL}/after`, {
-                method: "POST",
-            }).catch(console.error);
-            await fetch(`${TEST_SERVER_BASE_URL}/stopst`, {
-                method: "POST",
-            }).catch(console.error);
-        });
-
-        afterEach(async function () {
-            await screenshotOnFailure(this, browser);
-            if (page) {
-                page.close();
-            }
-        });
-
         beforeEach(async function () {
+            backendHook("beforeEach");
             page = await browser.newPage();
             await clearBrowserCookiesWithoutAffectingConsole(page, []);
 
@@ -100,6 +81,17 @@ describe("User Roles in the frontend", function () {
             await page.waitForSelector(".sessionInfo-user-id");
         });
 
+        afterEach(async function () {
+            await screenshotOnFailure(this, browser);
+            await page?.close();
+            await backendHook("afterEach");
+        });
+    
+        after(async function () {
+            await browser?.close();
+            await backendHook("after");
+        });
+
         it("should be able to read in the frontend", async () => {
             assert.deepStrictEqual(
                 await page.evaluate(() =>