Skip to content

Commit 81a6b63

Browse files
simovsimov
committed
Migrate tests to async/await
1 parent 8c1bdd2 commit 81a6b63

File tree

6 files changed

+439
-568
lines changed

6 files changed

+439
-568
lines changed

‎test/client.js‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,36 +32,24 @@ describe('client', () => {
3232
server.listen(5000, done)
3333
})
3434

35-
it('json', (done) => {
36-
request({url: 'http://localhost:5000/json'})
37-
.then(({body}) => {
38-
t.deepStrictEqual(body, {json: true})
39-
done()
40-
})
35+
it('json', async () => {
36+
var {body} = await request({url: 'http://localhost:5000/json'})
37+
t.deepStrictEqual(body, {json: true})
4138
})
4239

43-
it('querystring', (done) => {
44-
request({url: 'http://localhost:5000/qs'})
45-
.then(({body}) => {
46-
t.deepStrictEqual(body, {nested: {querystring: 'true'}})
47-
done()
48-
})
40+
it('querystring', async () => {
41+
var {body} = await request({url: 'http://localhost:5000/qs'})
42+
t.deepStrictEqual(body, {nested: {querystring: 'true'}})
4943
})
5044

51-
it('json as text', (done) => {
52-
request({url: 'http://localhost:5000/jsontext'})
53-
.then(({body}) => {
54-
t.deepStrictEqual(body, {json: true})
55-
done()
56-
})
45+
it('json as text', async () => {
46+
var {body} = await request({url: 'http://localhost:5000/jsontext'})
47+
t.deepStrictEqual(body, {json: true})
5748
})
5849

59-
it('querystring as text', (done) => {
60-
request({url: 'http://localhost:5000/qstext'})
61-
.then(({body}) => {
62-
t.deepStrictEqual(body, {nested: {querystring: 'true'}})
63-
done()
64-
})
50+
it('querystring as text', async () => {
51+
var {body} = await request({url: 'http://localhost:5000/qstext'})
52+
t.deepStrictEqual(body, {nested: {querystring: 'true'}})
6553
})
6654

6755
after((done) => {

‎test/consumer/error.js‎

Lines changed: 104 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,14 @@ describe('consumer - error', () => {
116116
](done)
117117
})
118118

119-
it('throw', (done) => {
120-
request({
121-
url: url('/connect/facebook'),
122-
cookie: {},
123-
})
124-
.catch(() => done())
119+
it('throw', async () => {
120+
try {
121+
await request({
122+
url: url('/connect/facebook'),
123+
cookie: {},
124+
})
125+
}
126+
catch (err) {}
125127
})
126128

127129
after((done) => {
@@ -172,13 +174,15 @@ describe('consumer - error', () => {
172174
](done)
173175
})
174176

175-
it('throw', (done) => {
176-
request({
177-
method: 'POST',
178-
url: url('/connect/facebook'),
179-
cookie: {},
180-
})
181-
.catch(() => done())
177+
it('throw', async () => {
178+
try {
179+
await request({
180+
method: 'POST',
181+
url: url('/connect/facebook'),
182+
cookie: {},
183+
})
184+
}
185+
catch (err) {}
182186
})
183187

184188
after((done) => {
@@ -301,29 +305,24 @@ describe('consumer - error', () => {
301305
](done)
302306
})
303307

304-
it('authorize', (done) => {
305-
var assert = (message, done) => {
306-
request({
308+
it('authorize', async () => {
309+
var assert = async (message) => {
310+
var {body} = await request({
307311
url: url('/connect/facebook'),
308312
cookie: {},
309313
})
310-
.then(({body}) => {
311-
t.deepEqual(
312-
body,
313-
{error: {error: {message: 'invalid', code: '500'}}},
314-
message
315-
)
316-
done()
317-
})
314+
t.deepEqual(
315+
body,
316+
{error: {error: {message: 'invalid', code: '500'}}},
317+
message
318+
)
318319
}
319320
delete grant.config.facebook.transport
320-
assert('no transport', () => {
321-
grant.config.facebook.transport = 'querystring'
322-
assert('querystring transport', () => {
323-
grant.config.facebook.transport = 'session'
324-
assert('session transport', done)
325-
})
326-
})
321+
await assert('no transport')
322+
grant.config.facebook.transport = 'querystring'
323+
await assert('querystring transport')
324+
grant.config.facebook.transport = 'session'
325+
await assert('session transport')
327326
})
328327

329328
after((done) => {
@@ -442,29 +441,24 @@ describe('consumer - error', () => {
442441
](done)
443442
})
444443

445-
it('authorize', (done) => {
446-
var assert = (message, done) => {
447-
request({
444+
it('authorize', async () => {
445+
var assert = async (message) => {
446+
var {body} = await request({
448447
url: url('/connect/facebook'),
449448
cookie: {},
450449
})
451-
.then(({body}) => {
452-
t.deepEqual(
453-
body,
454-
{error: {error: 'Grant: OAuth2 missing code parameter'}},
455-
message
456-
)
457-
done()
458-
})
450+
t.deepEqual(
451+
body,
452+
{error: {error: 'Grant: OAuth2 missing code parameter'}},
453+
message
454+
)
459455
}
460456
delete grant.config.facebook.transport
461-
assert('no transport', () => {
462-
grant.config.facebook.transport = 'querystring'
463-
assert('querystring transport', () => {
464-
grant.config.facebook.transport = 'session'
465-
assert('session transport', done)
466-
})
467-
})
457+
await assert('no transport')
458+
grant.config.facebook.transport = 'querystring'
459+
await assert('querystring transport')
460+
grant.config.facebook.transport = 'session'
461+
await assert('session transport')
468462
})
469463

470464
after((done) => {
@@ -591,29 +585,24 @@ describe('consumer - error', () => {
591585
](done)
592586
})
593587

594-
it('authorize', (done) => {
595-
var assert = (message, done) => {
596-
request({
588+
it('authorize', async () => {
589+
var assert = async (message) => {
590+
var {body} = await request({
597591
url: url('/connect/facebook'),
598592
cookie: {},
599593
})
600-
.then(({body}) => {
601-
t.deepEqual(
602-
body,
603-
{error: {error: 'Grant: OAuth2 state mismatch'}},
604-
message
605-
)
606-
done()
607-
})
594+
t.deepEqual(
595+
body,
596+
{error: {error: 'Grant: OAuth2 state mismatch'}},
597+
message
598+
)
608599
}
609600
delete grant.config.facebook.transport
610-
assert('no transport', () => {
611-
grant.config.facebook.transport = 'querystring'
612-
assert('querystring transport', () => {
613-
grant.config.facebook.transport = 'session'
614-
assert('session transport', done)
615-
})
616-
})
601+
await assert('no transport')
602+
grant.config.facebook.transport = 'querystring'
603+
await assert('querystring transport')
604+
grant.config.facebook.transport = 'session'
605+
await assert('session transport')
617606
})
618607

619608
after((done) => {
@@ -756,29 +745,24 @@ describe('consumer - error', () => {
756745
](done)
757746
})
758747

759-
it('access', (done) => {
760-
var assert = (message, done) => {
761-
request({
748+
it('access', async () => {
749+
var assert = async (message) => {
750+
var {body} = await request({
762751
url: url('/connect/facebook'),
763752
cookie: {},
764753
})
765-
.then(({body}) => {
766-
t.deepEqual(
767-
body,
768-
{error: {error: {message: 'invalid', code: '500'}}},
769-
message
770-
)
771-
done()
772-
})
754+
t.deepEqual(
755+
body,
756+
{error: {error: {message: 'invalid', code: '500'}}},
757+
message
758+
)
773759
}
774760
delete grant.config.facebook.transport
775-
assert('no transport', () => {
776-
grant.config.facebook.transport = 'querystring'
777-
assert('querystring transport', () => {
778-
grant.config.facebook.transport = 'session'
779-
assert('session transport', done)
780-
})
781-
})
761+
await assert('no transport')
762+
grant.config.facebook.transport = 'querystring'
763+
await assert('querystring transport')
764+
grant.config.facebook.transport = 'session'
765+
await assert('session transport')
782766
})
783767

784768
after((done) => {
@@ -878,82 +862,69 @@ describe('consumer - error', () => {
878862
](done)
879863
})
880864

881-
it('no flow - /connect + callback', (done) => {
865+
it('no flow - /connect + callback', async () => {
882866
delete grant.config.facebook.oauth
883-
var assert = (message, done) => {
884-
request({
867+
var assert = async (message) => {
868+
var {res, body} = await request({
885869
url: url('/connect/facebook'),
886870
cookie,
887871
})
888-
.then(({res, body}) => {
889-
t.equal(res.headers['x-test'], 'true')
890-
t.deepEqual(
891-
body,
892-
{error: 'Grant: missing or misconfigured provider'},
893-
message
894-
)
895-
done()
896-
})
872+
t.equal(res.headers['x-test'], 'true')
873+
t.deepEqual(
874+
body,
875+
{error: 'Grant: missing or misconfigured provider'},
876+
message
877+
)
897878
}
898879
delete grant.config.facebook.transport
899-
assert('no transport', () => {
900-
grant.config.facebook.transport = 'querystring'
901-
assert('querystring transport', () => {
902-
grant.config.facebook.transport = 'session'
903-
assert('session transport', done)
904-
})
905-
})
880+
await assert('no transport')
881+
grant.config.facebook.transport = 'querystring'
882+
await assert('querystring transport')
883+
grant.config.facebook.transport = 'session'
884+
await assert('session transport')
906885
})
907886

908-
it('no flow - /connect without callback', (done) => {
887+
it('no flow - /connect without callback', async () => {
909888
delete grant.config.facebook.callback
910-
request({
889+
var {res, body} = await request({
911890
url: url('/connect/facebook'),
912891
cookie,
913892
})
914-
.then(({res, body}) => {
915-
t.equal(res.headers['x-test'], undefined)
916-
t.deepEqual(qs.parse(body), {
917-
error: 'Grant: missing or misconfigured provider'})
918-
done()
893+
t.equal(res.headers['x-test'], undefined)
894+
t.deepEqual(qs.parse(body), {
895+
error: 'Grant: missing or misconfigured provider'
919896
})
920897
})
921898

922-
it('no flow - /callback + callback', (done) => {
899+
it('no flow - /callback + callback', async () => {
923900
grant.config.facebook.callback = '/'
924-
var assert = (message, done) => {
925-
request({
901+
var assert = async (message) => {
902+
var {res, body} = await request({
926903
url: url('/connect/facebook/callback'),
927904
cookie,
928905
})
929-
.then(({res, body}) => {
930-
t.equal(res.headers['x-test'], 'true')
931-
t.deepEqual(body, {
932-
error: 'Grant: missing session or misconfigured provider'})
933-
done()
906+
t.equal(res.headers['x-test'], 'true')
907+
t.deepEqual(body, {
908+
error: 'Grant: missing session or misconfigured provider'
934909
})
935910
}
936911
delete grant.config.facebook.transport
937-
assert('no transport', () => {
938-
grant.config.facebook.transport = 'querystring'
939-
assert('querystring transport', () => {
940-
grant.config.facebook.transport = 'session'
941-
assert('session transport', done)
942-
})
943-
})
912+
await assert('no transport')
913+
grant.config.facebook.transport = 'querystring'
914+
await assert('querystring transport')
915+
grant.config.facebook.transport = 'session'
916+
await assert('session transport')
944917
})
945918

946-
it('no flow - /callback without callback', (done) => {
919+
it('no flow - /callback without callback', async () => {
947920
delete grant.config.facebook.callback
948-
request({
921+
var {res, body} = await request({
949922
url: url('/connect/facebook/callback'),
950923
cookie,
951924
})
952-
.then(({res, body}) => {
953-
t.equal(res.headers['x-test'], undefined)
954-
t.deepEqual(qs.parse(body), {
955-
error: 'Grant: missing session or misconfigured provider'})
956-
done()
925+
t.equal(res.headers['x-test'], undefined)
926+
t.deepEqual(qs.parse(body), {
927+
error: 'Grant: missing session or misconfigured provider'
957928
})
958929
})
959930

0 commit comments

Comments
 (0)