Skip to content

Commit f4b5871

Browse files
committed
update: multitenancy.tenant_interactions tests use core apps
1 parent 6022c5f commit f4b5871

File tree

1 file changed

+14
-26
lines changed

1 file changed

+14
-26
lines changed

test/end-to-end/multitenancy.tenant_interactions.test.js

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
*/
1919

2020
import assert from "assert";
21-
import puppeteer from "puppeteer";
22-
import fetch from "isomorphic-fetch";
2321
import {
2422
screenshotOnFailure,
2523
getSignInOrSignUpSwitchLink,
@@ -45,14 +43,15 @@ import {
4543
addUserToTenant,
4644
removeUserFromTenant,
4745
removeTenant,
48-
backendBeforeEach,
4946
waitForUrl,
5047
setupBrowser,
48+
backendHook,
49+
setupCoreApp,
50+
setupST,
5151
} from "../helpers";
5252
import {
5353
TEST_CLIENT_BASE_URL,
5454
DEFAULT_WEBSITE_BASE_PATH,
55-
TEST_SERVER_BASE_URL,
5655
SOMETHING_WENT_WRONG_ERROR,
5756
ST_ROOT_SELECTOR,
5857
TEST_APPLICATION_SERVER_BASE_URL,
@@ -67,18 +66,20 @@ describe("SuperTokens Multitenancy tenant interactions", function () {
6766
let pageCrashed;
6867

6968
before(async function () {
69+
await backendHook("before");
7070
const isSupported = (await isMultitenancySupported()) && (await isMultitenancyManagementEndpointsSupported());
7171
if (!isSupported) {
7272
this.skip();
7373
}
74+
75+
browser = await setupBrowser();
7476
});
7577

7678
beforeEach(async function () {
77-
await backendBeforeEach();
78-
79-
await fetch(`${TEST_SERVER_BASE_URL}/startst`, {
80-
method: "POST",
81-
}).catch(console.error);
79+
await backendHook("beforeEach");
80+
81+
const coreUrl = await setupCoreApp();
82+
await setupST({ coreUrl });
8283

8384
page = await browser.newPage();
8485

@@ -105,26 +106,13 @@ describe("SuperTokens Multitenancy tenant interactions", function () {
105106

106107
afterEach(async function () {
107108
await screenshotOnFailure(this, browser);
108-
if (page) {
109-
await page.close();
110-
}
111-
await fetch(`${TEST_SERVER_BASE_URL}/after`, {
112-
method: "POST",
113-
}).catch(console.error);
114-
115-
await fetch(`${TEST_SERVER_BASE_URL}/stopst`, {
116-
method: "POST",
117-
}).catch(console.error);
118-
});
119-
120-
before(async () => {
121-
browser = await setupBrowser();
109+
await page?.close();
110+
await backendHook("afterEach");
122111
});
123112

124113
after(async function () {
125-
if (browser !== undefined) {
126-
await browser.close();
127-
}
114+
await browser?.close();
115+
await backendHook("after");
128116
});
129117

130118
describe("without user sharing", () => {

0 commit comments

Comments
 (0)