update: oauth2provider tests use core apps

Author: namsnath

test/end-to-end/oauth2provider.test.js

@@ -18,12 +18,10 @@
  */
 
 import assert from "assert";
-import puppeteer from "puppeteer";
 import {
     clearBrowserCookiesWithoutAffectingConsole,
     toggleSignInSignUp,
     screenshotOnFailure,
-    backendBeforeEach,
     waitForUrl,
     createOAuth2Client,
     setOAuth2ClientInfo,
@@ -41,13 +39,12 @@ import {
     isOauth2Supported,
     setupBrowser,
     getGeneralError,
+    backendHook,
+    setupCoreApp,
+    setupST,
 } from "../helpers";
-import fetch from "isomorphic-fetch";
-
 import {
     TEST_CLIENT_BASE_URL,
-    TEST_SERVER_BASE_URL,
-    SIGN_OUT_API,
     TEST_APPLICATION_SERVER_BASE_URL,
     SOMETHING_WENT_WRONG_ERROR,
 } from "../constants";
@@ -63,50 +60,27 @@ describe("SuperTokens OAuth2Provider", function () {
     let browser;
     let page;
     let consoleLogs = [];
-    let skipped = false;
 
     before(async function () {
+        await backendHook("before");
         // Skip these tests if running in React 16
         if (isReact16() || !(await isOauth2Supported())) {
-            skipped = true;
             this.skip();
         }
 
-        await backendBeforeEach();
-
-        await fetch(`${TEST_SERVER_BASE_URL}/startst`, {
-            method: "POST",
-            headers: { "content-type": "application/json" },
-            body: JSON.stringify({
-                coreConfig: {
-                    access_token_validity: 5, // 5 seconds
-                },
-            }),
-        }).catch(console.error);
+        const coreUrl = await setupCoreApp({
+            coreConfig: {
+                access_token_validity: 5, // 5 seconds
+            },
+        });
+        await setupST({ coreUrl });
 
         browser = await setupBrowser();
     });
 
-    after(async function () {
-        if (skipped) {
-            return;
-        }
-        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(function () {
-        return screenshotOnFailure(this, browser);
-    });
-
     beforeEach(async function () {
+        await backendHook("beforeEach");
+
         page = await browser.newPage();
         page.on("console", (consoleObj) => {
             const log = consoleObj.text();
@@ -117,6 +91,17 @@ describe("SuperTokens OAuth2Provider", function () {
         consoleLogs = await clearBrowserCookiesWithoutAffectingConsole(page, []);
     });
 
+    afterEach(async function () {
+        await screenshotOnFailure(this, browser);
+        await page?.close();
+        await backendHook("afterEach");
+    });
+
+    after(async function () {
+        await browser?.close();
+        await backendHook("after");
+    });
+
     describe("Generic OAuth2 Client Library", function () {
         afterEach(async function () {
             await removeOAuth2ClientInfo(page);