Skip to content

Commit 6627536

Browse files
porcellusporcellus
committed
test: fix compose entrypoint/tests
1 parent cf0597c commit 6627536

34 files changed

+880
-870
lines changed

‎compose.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,16 @@ services:
22
core:
33
# Uses `$SUPERTOKENS_CORE_VERSION` when available, else latest
44
image: supertokens/supertokens-dev-postgresql:${SUPERTOKENS_CORE_VERSION:-master}
5+
entrypoint:
6+
[
7+
"/usr/lib/supertokens/jre/bin/java",
8+
"-classpath",
9+
"/usr/lib/supertokens/core/*:/usr/lib/supertokens/plugin-interface/*:/usr/lib/supertokens/ee/*",
10+
"io.supertokens.Main",
11+
"/usr/lib/supertokens/",
12+
"DEV",
13+
"test_mode",
14+
]
515
ports:
616
# Uses `$SUPERTOKENS_CORE_PORT` when available, else 3567 for local port
717
- ${SUPERTOKENS_CORE_PORT:-3567}:3567

‎test/config.test.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1478,7 +1478,7 @@ describe(`configTest: ${printPath("[test/config.test.js]")}`, function () {
14781478
});
14791479

14801480
let res = extractInfoFromResponse(
1481-
await new Promise((resolve) =>
1481+
await new Promise((resolve, reject) =>
14821482
request(app)
14831483
.post("/create")
14841484
.expect(200)
@@ -1492,7 +1492,7 @@ describe(`configTest: ${printPath("[test/config.test.js]")}`, function () {
14921492
)
14931493
);
14941494

1495-
let res2 = await new Promise((resolve) =>
1495+
let res2 = await new Promise((resolve, reject) =>
14961496
request(app)
14971497
.post("/auth/session/refresh")
14981498
.set("Cookie", ["sRefreshToken=" + res.refreshToken])
@@ -1538,7 +1538,7 @@ describe(`configTest: ${printPath("[test/config.test.js]")}`, function () {
15381538
});
15391539

15401540
let res = extractInfoFromResponse(
1541-
await new Promise((resolve) =>
1541+
await new Promise((resolve, reject) =>
15421542
request(app)
15431543
.post("/create")
15441544
.expect(200)
@@ -1552,7 +1552,7 @@ describe(`configTest: ${printPath("[test/config.test.js]")}`, function () {
15521552
)
15531553
);
15541554

1555-
let res2 = await new Promise((resolve) =>
1555+
let res2 = await new Promise((resolve, reject) =>
15561556
request(app)
15571557
.post("/hello/session/refresh")
15581558
.set("Cookie", ["sRefreshToken=" + res.refreshToken])
@@ -1598,7 +1598,7 @@ describe(`configTest: ${printPath("[test/config.test.js]")}`, function () {
15981598
});
15991599

16001600
let res = extractInfoFromResponse(
1601-
await new Promise((resolve) =>
1601+
await new Promise((resolve, reject) =>
16021602
request(app)
16031603
.post("/create")
16041604
.expect(200)
@@ -1612,7 +1612,7 @@ describe(`configTest: ${printPath("[test/config.test.js]")}`, function () {
16121612
)
16131613
);
16141614

1615-
let res2 = await new Promise((resolve) =>
1615+
let res2 = await new Promise((resolve, reject) =>
16161616
request(app)
16171617
.post("/hello/session/refresh")
16181618
.set("Cookie", ["sRefreshToken=" + res.refreshToken])

‎test/emailpassword/emailExists.test.js‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
7373
assert(signUpResponse.status === 200);
7474
assert(JSON.parse(signUpResponse.text).status === "OK");
7575

76-
let response = await new Promise((resolve) =>
76+
let response = await new Promise((resolve, reject) =>
7777
request(app)
7878
.get("/auth/emailpassword/email/exists")
7979
.query({
@@ -82,7 +82,7 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
8282
.expect(200)
8383
.end((err, res) => {
8484
if (err) {
85-
resolve(undefined);
85+
reject(err);
8686
} else {
8787
resolve(JSON.parse(res.text));
8888
}
@@ -126,15 +126,15 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
126126

127127
app.use(errorHandler());
128128

129-
let response = await new Promise((resolve) =>
129+
let response = await new Promise((resolve, reject) =>
130130
request(app)
131131
.get("/auth/signup/email/exists")
132132
.query({
133133
email: "[email protected]",
134134
})
135135
.end((err, res) => {
136136
if (err) {
137-
resolve(undefined);
137+
reject(err);
138138
} else {
139139
resolve(res);
140140
}
@@ -169,7 +169,7 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
169169
assert(signUpResponse.status === 200);
170170
assert(JSON.parse(signUpResponse.text).status === "OK");
171171

172-
let response = await new Promise((resolve) =>
172+
let response = await new Promise((resolve, reject) =>
173173
request(app)
174174
.get("/auth/signup/email/exists")
175175
.query({
@@ -178,7 +178,7 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
178178
.expect(200)
179179
.end((err, res) => {
180180
if (err) {
181-
resolve(undefined);
181+
reject(err);
182182
} else {
183183
resolve(JSON.parse(res.text));
184184
}
@@ -211,7 +211,7 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
211211

212212
app.use(errorHandler());
213213

214-
let response = await new Promise((resolve) =>
214+
let response = await new Promise((resolve, reject) =>
215215
request(app)
216216
.get("/auth/signup/email/exists")
217217
.query({
@@ -220,7 +220,7 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
220220
.expect(200)
221221
.end((err, res) => {
222222
if (err) {
223-
resolve(undefined);
223+
reject(err);
224224
} else {
225225
resolve(JSON.parse(res.text));
226226
}
@@ -257,7 +257,7 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
257257
assert(signUpResponse.status === 200);
258258
assert(JSON.parse(signUpResponse.text).status === "OK");
259259

260-
let response = await new Promise((resolve) =>
260+
let response = await new Promise((resolve, reject) =>
261261
request(app)
262262
.get("/auth/signup/email/exists")
263263
.query({
@@ -266,7 +266,7 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
266266
.expect(200)
267267
.end((err, res) => {
268268
if (err) {
269-
resolve(undefined);
269+
reject(err);
270270
} else {
271271
resolve(JSON.parse(res.text));
272272
}
@@ -303,7 +303,7 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
303303
assert(signUpResponse.status === 200);
304304
assert(JSON.parse(signUpResponse.text).status === "OK");
305305

306-
let response = await new Promise((resolve) =>
306+
let response = await new Promise((resolve, reject) =>
307307
request(app)
308308
.get("/auth/signup/email/exists")
309309
.query({
@@ -312,7 +312,7 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
312312
.expect(200)
313313
.end((err, res) => {
314314
if (err) {
315-
resolve(undefined);
315+
reject(err);
316316
} else {
317317
resolve(JSON.parse(res.text));
318318
}
@@ -345,14 +345,14 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
345345

346346
app.use(errorHandler());
347347

348-
let response = await new Promise((resolve) =>
348+
let response = await new Promise((resolve, reject) =>
349349
request(app)
350350
.get("/auth/signup/email/exists")
351351
.query()
352352
.expect(400)
353353
.end((err, res) => {
354354
if (err) {
355-
resolve(undefined);
355+
reject(err);
356356
} else {
357357
resolve(JSON.parse(res.text));
358358
}
@@ -386,7 +386,7 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
386386
assert(signUpResponse.status === 200);
387387
assert(JSON.parse(signUpResponse.text).status === "OK");
388388

389-
let response = await new Promise((resolve) =>
389+
let response = await new Promise((resolve, reject) =>
390390
request(app)
391391
.get("/auth/signup/email/exists")
392392
.query({
@@ -395,7 +395,7 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
395395
.expect(400)
396396
.end((err, res) => {
397397
if (err) {
398-
resolve(undefined);
398+
reject(err);
399399
} else {
400400
resolve(JSON.parse(res.text));
401401
}
@@ -432,7 +432,7 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
432432
assert(signUpResponse.status === 200);
433433
assert(JSON.parse(signUpResponse.text).status === "OK");
434434

435-
let response = await new Promise((resolve) =>
435+
let response = await new Promise((resolve, reject) =>
436436
request(app)
437437
.get("/auth/signup/email/exists")
438438
.query({
@@ -441,7 +441,7 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
441441
.expect(200)
442442
.end((err, res) => {
443443
if (err) {
444-
resolve(undefined);
444+
reject(err);
445445
} else {
446446
resolve(JSON.parse(res.text));
447447
}
@@ -481,7 +481,7 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
481481
assert(signUpResponse.status === 200);
482482
assert(JSON.parse(signUpResponse.text).status === "OK");
483483

484-
let response = await new Promise((resolve) =>
484+
let response = await new Promise((resolve, reject) =>
485485
request(app)
486486
.get("/auth/signup/email/exists")
487487
.query({
@@ -490,7 +490,7 @@ describe(`emailExists: ${printPath("[test/emailpassword/emailExists.test.js]")}`
490490
.expect(200)
491491
.end((err, res) => {
492492
if (err) {
493-
resolve(undefined);
493+
reject(err);
494494
} else {
495495
resolve(JSON.parse(res.text));
496496
}

‎test/emailpassword/emailverify.test.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@ describe(`emailverify: ${printPath("[test/emailpassword/emailverify.test.js]")}`
160160

161161
app.use(errorHandler());
162162

163-
let response = await new Promise((resolve) =>
163+
let response = await new Promise((resolve, reject) =>
164164
request(app)
165165
.post("/auth/user/email/verify/token")
166166
.end((err, res) => {
167167
if (err) {
168-
resolve(undefined);
168+
reject(undefined);
169169
} else {
170170
resolve(res);
171171
}
@@ -481,7 +481,7 @@ describe(`emailverify: ${printPath("[test/emailpassword/emailverify.test.js]")}`
481481
})
482482
.end((err, res) => {
483483
if (err) {
484-
resolve(undefined);
484+
reject(undefined);
485485
} else {
486486
resolve(res);
487487
}
@@ -699,12 +699,12 @@ describe(`emailverify: ${printPath("[test/emailpassword/emailverify.test.js]")}`
699699

700700
app.use(errorHandler());
701701

702-
let response = await new Promise((resolve) =>
702+
let response = await new Promise((resolve, reject) =>
703703
request(app)
704704
.get("/auth/user/email/verify")
705705
.end((err, res) => {
706706
if (err) {
707-
resolve(undefined);
707+
reject(undefined);
708708
} else {
709709
resolve(res);
710710
}
@@ -899,7 +899,7 @@ describe(`emailverify: ${printPath("[test/emailpassword/emailverify.test.js]")}`
899899
assert(response.body.status === "OK");
900900
assert(Object.keys(response.body).length === 1);
901901

902-
let response2 = await new Promise((resolve) =>
902+
let response2 = await new Promise((resolve, reject) =>
903903
request(app)
904904
.post("/auth/user/email/verify")
905905
.send({
@@ -909,7 +909,7 @@ describe(`emailverify: ${printPath("[test/emailpassword/emailverify.test.js]")}`
909909
.expect(200)
910910
.end((err, res) => {
911911
if (err) {
912-
resolve(err);
912+
reject(err);
913913
} else {
914914
resolve(res.body);
915915
}

0 commit comments

Comments
 (0)