update: signin-rrdv5/6 tests use core apps

Author: namsnath

test/end-to-end/refresherrors.test.js

@@ -17,15 +17,12 @@
  * Imports
  */
 import assert from "assert";
-import puppeteer from "puppeteer";
-
 import {
     clearBrowserCookiesWithoutAffectingConsole,
     getTextInDashboardNoAuth,
     screenshotOnFailure,
     setupBrowser,
 } from "../helpers";
-
 import { TEST_CLIENT_BASE_URL } from "../constants";
 
 describe("Refresh errors", function () {

test/end-to-end/routing.test.js

@@ -18,9 +18,6 @@
  */
 
 import assert from "assert";
-import { spawn } from "child_process";
-import puppeteer from "puppeteer";
-
 import { TEST_CLIENT_BASE_URL, DEFAULT_WEBSITE_BASE_PATH } from "../constants";
 import {
     getSubmitFormButtonLabel,

test/end-to-end/signin-rrdv5.test.js

@@ -18,7 +18,6 @@
  */
 
 import assert from "assert";
-import puppeteer from "puppeteer";
 import {
     clearBrowserCookiesWithoutAffectingConsole,
     clickForgotPasswordLink,
@@ -49,15 +48,15 @@ import {
     screenshotOnFailure,
     waitForText,
     waitForSTElement,
-    backendBeforeEach,
     setEnabledRecipes,
     waitForUrl,
     setupBrowser,
+    backendHook,
+    setupCoreApp,
+    setupST,
 } from "../helpers";
-import fetch from "isomorphic-fetch";
 import { SOMETHING_WENT_WRONG_ERROR } from "../constants";
-
-import { EMAIL_EXISTS_API, SIGN_IN_API, TEST_CLIENT_BASE_URL, TEST_SERVER_BASE_URL, SIGN_OUT_API } from "../constants";
+import { EMAIL_EXISTS_API, SIGN_IN_API, TEST_CLIENT_BASE_URL, SIGN_OUT_API } from "../constants";
 
 /*
  * Tests.
@@ -72,34 +71,14 @@ describe("SuperTokens SignIn with react router dom v5", function () {
             this.skip();
         }
 
-        await backendBeforeEach();
-
-        await fetch(`${TEST_SERVER_BASE_URL}/startst`, {
-            method: "POST",
-        }).catch(console.error);
-
+        await backendHook("beforeEach");
+        const coreUrl = await setupCoreApp();
+        await setupST({ coreUrl });
         browser = await setupBrowser();
     });
 
-    after(async function () {
-        if (browser) {
-            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 () {
+        backendHook("beforeEach");
         page = await browser.newPage();
         // we set react-router-domv5 to true in localstorage
         await Promise.all([
@@ -119,6 +98,17 @@ describe("SuperTokens SignIn with react router dom v5", 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("SignIn test ", function () {
         it("Should contain email and password fields only", async function () {
             const inputNames = await getInputNames(page);
@@ -651,16 +641,26 @@ describe("SuperTokens SignIn => Server Error", function () {
     let page;
     let consoleLogs;
 
+    const appConfig = {
+        enabledRecipes: ["emailpassword"],
+        enabledProviders: [],
+    };
+
     before(async function () {
-        await setEnabledRecipes(["emailpassword"], []);
+        await backendHook("before");
+        const coreUrl = await setupCoreApp();
+        appConfig.coreUrl = coreUrl;
+        await setupST(appConfig);
         browser = await setupBrowser();
     });
 
     after(async function () {
+        await backendHook("after");
         await browser.close();
     });
 
     beforeEach(async function () {
+        await backendHook("beforeEach");
         page = await browser.newPage();
         consoleLogs = await clearBrowserCookiesWithoutAffectingConsole(page, []);
         page.on("console", (consoleObj) => {

test/end-to-end/signin-rrdv6.test.js

@@ -18,7 +18,6 @@
  */
 
 import assert from "assert";
-import puppeteer from "puppeteer";
 import {
     clearBrowserCookiesWithoutAffectingConsole,
     clickForgotPasswordLink,
@@ -49,16 +48,16 @@ import {
     screenshotOnFailure,
     waitForText,
     waitForSTElement,
-    backendBeforeEach,
     getInvalidClaimsJSON,
     expectErrorThrown,
     waitForUrl,
     setupBrowser,
+    backendHook,
+    setupCoreApp,
+    setupST,
 } from "../helpers";
-import fetch from "isomorphic-fetch";
 import { SOMETHING_WENT_WRONG_ERROR } from "../constants";
-
-import { EMAIL_EXISTS_API, SIGN_IN_API, TEST_CLIENT_BASE_URL, TEST_SERVER_BASE_URL, SIGN_OUT_API } from "../constants";
+import { EMAIL_EXISTS_API, SIGN_IN_API, TEST_CLIENT_BASE_URL, SIGN_OUT_API } from "../constants";
 
 /*
  * Tests.
@@ -69,32 +68,14 @@ describe("SuperTokens SignIn with react router dom v6", function () {
     let consoleLogs = [];
 
     before(async function () {
-        await backendBeforeEach();
-
-        await fetch(`${TEST_SERVER_BASE_URL}/startst`, {
-            method: "POST",
-        }).catch(console.error);
-
+        await backendHook("beforeEach");
+        const coreUrl = await setupCoreApp();
+        await setupST({ coreUrl });
         browser = await setupBrowser();
     });
 
-    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(function () {
-        return screenshotOnFailure(this, browser);
-    });
-
     beforeEach(async function () {
+        backendHook("beforeEach");
         page = await browser.newPage();
         await Promise.all([
             page.goto(`${TEST_CLIENT_BASE_URL}/auth`),
@@ -112,6 +93,17 @@ describe("SuperTokens SignIn with react router dom v6", 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("SignIn test ", function () {
         it("Should contain email and password fields only", async function () {
             const inputNames = await getInputNames(page);