Skip to content
This repository was archived by the owner on Dec 13, 2021. It is now read-only.

Commit b4a7618

Browse files
MattIPv4MattIPv4
committed
Condense auth tests
1 parent 2805aaa commit b4a7618

4 files changed

Lines changed: 20 additions & 133 deletions

File tree

‎test/Routes/Lists.js‎

Lines changed: 13 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -474,13 +474,7 @@ describe('/lists/:id/edit', () => {
474474
const listId = 'botlist.space';
475475
describe(`GET (:id = ${listId})`, () => {
476476
const test = () => request().get(`/lists/${listId}/edit`);
477-
it('returns a Forbidden status code', done => {
478-
test().end((err, res) => {
479-
expect(res).to.have.status(403);
480-
done();
481-
});
482-
});
483-
it('renders the authentication required message', done => {
477+
it('returns the authentication required message', done => {
484478
test().end((err, res) => {
485479
checks.authRequired(res);
486480
done();
@@ -490,13 +484,7 @@ describe('/lists/:id/edit', () => {
490484

491485
describe(`POST (:id = ${listId})`, () => {
492486
const test = () => request().post(`/lists/${listId}/edit`);
493-
it('returns a Forbidden status code', done => {
494-
test().end((err, res) => {
495-
expect(res).to.have.status(403);
496-
done();
497-
});
498-
});
499-
it('renders the authentication required message', done => {
487+
it('returns the authentication required message', done => {
500488
test().end((err, res) => {
501489
checks.authRequired(res);
502490
done();
@@ -509,13 +497,7 @@ describe('/lists/:id/icon', () => {
509497
const listId = 'botlist.space';
510498
describe(`GET (:id = ${listId})`, () => {
511499
const test = () => request().get(`/lists/${listId}/icon`);
512-
it('returns a Forbidden status code', done => {
513-
test().end((err, res) => {
514-
expect(res).to.have.status(403);
515-
done();
516-
});
517-
});
518-
it('renders the authentication required message', done => {
500+
it('returns the authentication required message', done => {
519501
test().end((err, res) => {
520502
checks.authRequired(res);
521503
done();
@@ -527,13 +509,7 @@ describe('/lists/:id/icon', () => {
527509
describe('/lists/add', () => {
528510
describe('GET', () => {
529511
const test = () => request().get('/lists/add');
530-
it('returns a Forbidden status code', done => {
531-
test().end((err, res) => {
532-
expect(res).to.have.status(403);
533-
done();
534-
});
535-
});
536-
it('renders the authentication required message', done => {
512+
it('returns the authentication required message', done => {
537513
test().end((err, res) => {
538514
checks.authRequired(res);
539515
done();
@@ -543,13 +519,7 @@ describe('/lists/add', () => {
543519

544520
describe('POST', () => {
545521
const test = () => request().post('/lists/add');
546-
it('returns a Forbidden status code', done => {
547-
test().end((err, res) => {
548-
expect(res).to.have.status(403);
549-
done();
550-
});
551-
});
552-
it('renders the authentication required message', done => {
522+
it('returns the authentication required message', done => {
553523
test().end((err, res) => {
554524
checks.authRequired(res);
555525
done();
@@ -561,13 +531,7 @@ describe('/lists/add', () => {
561531
describe('/lists/legacy-ids', () => {
562532
describe('GET', () => {
563533
const test = () => request().get('/lists/legacy-ids');
564-
it('returns a Forbidden status code', done => {
565-
test().end((err, res) => {
566-
expect(res).to.have.status(403);
567-
done();
568-
});
569-
});
570-
it('renders the authentication required message', done => {
534+
it('returns the authentication required message', done => {
571535
test().end((err, res) => {
572536
checks.authRequired(res);
573537
done();
@@ -577,13 +541,7 @@ describe('/lists/legacy-ids', () => {
577541

578542
describe('POST', () => {
579543
const test = () => request().post('/lists/legacy-ids');
580-
it('returns a Forbidden status code', done => {
581-
test().end((err, res) => {
582-
expect(res).to.have.status(403);
583-
done();
584-
});
585-
});
586-
it('renders the authentication required message', done => {
544+
it('returns the authentication required message', done => {
587545
test().end((err, res) => {
588546
checks.authRequired(res);
589547
done();
@@ -595,13 +553,7 @@ describe('/lists/legacy-ids', () => {
595553
describe('/lists/features/manage', () => {
596554
describe('GET', () => {
597555
const test = () => request().get('/lists/features/manage');
598-
it('returns a Forbidden status code', done => {
599-
test().end((err, res) => {
600-
expect(res).to.have.status(403);
601-
done();
602-
});
603-
});
604-
it('renders the authentication required message', done => {
556+
it('returns the authentication required message', done => {
605557
test().end((err, res) => {
606558
checks.authRequired(res);
607559
done();
@@ -613,13 +565,7 @@ describe('/lists/features/manage', () => {
613565
describe('/lists/features/manage/add', () => {
614566
describe('GET', () => {
615567
const test = () => request().get('/lists/features/manage/add');
616-
it('returns a Forbidden status code', done => {
617-
test().end((err, res) => {
618-
expect(res).to.have.status(403);
619-
done();
620-
});
621-
});
622-
it('renders the authentication required message', done => {
568+
it('returns the authentication required message', done => {
623569
test().end((err, res) => {
624570
checks.authRequired(res);
625571
done();
@@ -629,13 +575,7 @@ describe('/lists/features/manage/add', () => {
629575

630576
describe('POST', () => {
631577
const test = () => request().post('/lists/features/manage/add');
632-
it('returns a Forbidden status code', done => {
633-
test().end((err, res) => {
634-
expect(res).to.have.status(403);
635-
done();
636-
});
637-
});
638-
it('renders the authentication required message', done => {
578+
it('returns the authentication required message', done => {
639579
test().end((err, res) => {
640580
checks.authRequired(res);
641581
done();
@@ -647,13 +587,7 @@ describe('/lists/features/manage/add', () => {
647587
describe('/lists/features/manage/:id', () => {
648588
describe('GET', () => {
649589
const test = () => request().get('/lists/features/manage/1');
650-
it('returns a Forbidden status code', done => {
651-
test().end((err, res) => {
652-
expect(res).to.have.status(403);
653-
done();
654-
});
655-
});
656-
it('renders the authentication required message', done => {
590+
it('returns the authentication required message', done => {
657591
test().end((err, res) => {
658592
checks.authRequired(res);
659593
done();
@@ -663,13 +597,7 @@ describe('/lists/features/manage/:id', () => {
663597

664598
describe('POST', () => {
665599
const test = () => request().post('/lists/features/manage/1');
666-
it('returns a Forbidden status code', done => {
667-
test().end((err, res) => {
668-
expect(res).to.have.status(403);
669-
done();
670-
});
671-
});
672-
it('renders the authentication required message', done => {
600+
it('returns the authentication required message', done => {
673601
test().end((err, res) => {
674602
checks.authRequired(res);
675603
done();
@@ -681,13 +609,7 @@ describe('/lists/features/manage/:id', () => {
681609
describe('/lists/features/manage/:id/delete', () => {
682610
describe('GET', () => {
683611
const test = () => request().get('/lists/features/manage/1/delete');
684-
it('returns a Forbidden status code', done => {
685-
test().end((err, res) => {
686-
expect(res).to.have.status(403);
687-
done();
688-
});
689-
});
690-
it('renders the authentication required message', done => {
612+
it('returns the authentication required message', done => {
691613
test().end((err, res) => {
692614
checks.authRequired(res);
693615
done();

‎test/Routes/Tasks.js‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@ const { describe, it, expect, request, checks } = require('../base');
33
describe('/tasks', () => {
44
describe('GET', () => {
55
const test = () => request().get('/tasks');
6-
it('returns a Forbidden status code', done => {
7-
test().end((err, res) => {
8-
expect(res).to.have.status(403);
9-
done();
10-
});
11-
});
12-
it('renders the authentication required message', done => {
6+
it('returns the authentication required message', done => {
137
test().end((err, res) => {
148
checks.authRequired(res);
159
done();
@@ -21,13 +15,7 @@ describe('/tasks', () => {
2115
describe('/tasks/run/:id', () => {
2216
describe('POST', () => {
2317
const test = () => request().post('/tasks/run/0');
24-
it('returns a Forbidden status code', done => {
25-
test().end((err, res) => {
26-
expect(res).to.have.status(403);
27-
done();
28-
});
29-
});
30-
it('renders the authentication required message', done => {
18+
it('returns the authentication required message', done => {
3119
test().end((err, res) => {
3220
checks.authRequired(res);
3321
done();

‎test/Routes/Test.js‎

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,7 @@ const { describe, it, expect, request, checks } = require('../base');
33
describe('/test', () => {
44
describe('GET', () => {
55
const test = () => request().get('/test');
6-
it('returns a Forbidden status code', done => {
7-
test().end((err, res) => {
8-
expect(res).to.have.status(403);
9-
done();
10-
});
11-
});
12-
it('renders the authentication required message', done => {
6+
it('returns the authentication required message', done => {
137
test().end((err, res) => {
148
checks.authRequired(res);
159
done();
@@ -21,13 +15,7 @@ describe('/test', () => {
2115
describe('/test/start', () => {
2216
describe('GET', () => {
2317
const test = () => request().get('/test/start');
24-
it('returns a Forbidden status code', done => {
25-
test().end((err, res) => {
26-
expect(res).to.have.status(403);
27-
done();
28-
});
29-
});
30-
it('renders the authentication required message', done => {
18+
it('returns the authentication required message', done => {
3119
test().end((err, res) => {
3220
checks.authRequired(res);
3321
done();
@@ -39,13 +27,7 @@ describe('/test/start', () => {
3927
describe('/test/restart', () => {
4028
describe('GET', () => {
4129
const test = () => request().get('/test/restart');
42-
it('returns a Forbidden status code', done => {
43-
test().end((err, res) => {
44-
expect(res).to.have.status(403);
45-
done();
46-
});
47-
});
48-
it('renders the authentication required message', done => {
30+
it('returns the authentication required message', done => {
4931
test().end((err, res) => {
5032
checks.authRequired(res);
5133
done();
@@ -57,13 +39,7 @@ describe('/test/restart', () => {
5739
describe('/test/progress', () => {
5840
describe('GET', () => {
5941
const test = () => request().get('/test/progress');
60-
it('returns a Forbidden status code', done => {
61-
test().end((err, res) => {
62-
expect(res).to.have.status(403);
63-
done();
64-
});
65-
});
66-
it('renders the authentication required message', done => {
42+
it('returns the authentication required message', done => {
6743
test().end((err, res) => {
6844
checks.authRequired(res);
6945
done();

‎test/helpers/checks.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const ratelimit = (context, limit, test, done, status = 200) => {
1616
};
1717

1818
const authRequired = res => {
19+
expect(res).to.have.status(403);
1920
expect(res).to.be.html;
2021
expect(res.text).to.include('This page requires authentication to access');
2122
expect(res.text).to.include(`Sign in to ${locale('site_name')}`);

0 commit comments

Comments
 (0)