Skip to content

Commit a8fff6d

Browse files
simovsimov
committed
Update config tests
1 parent 721033e commit a8fff6d

1 file changed

Lines changed: 60 additions & 36 deletions

File tree

‎test/config.js‎

Lines changed: 60 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,24 @@ describe('config', () => {
1515
})
1616
})
1717

18-
it('consumer_key and consumer_secret', () => {
19-
var provider = {consumer_key: 'key', consumer_secret: 'secret', oauth: 1}
20-
var options = {}, server = {}, name = 'grant'
21-
var result = config.merge({provider, options, server, name})
22-
t.deepEqual(result, {
23-
consumer_key: 'key', consumer_secret: 'secret', oauth: 1,
24-
grant: true, name: 'grant', key: 'key', secret: 'secret'
18+
describe('oauth app credentials', () => {
19+
it('consumer_key, consumer_secret', () => {
20+
var provider = {consumer_key: 'key', consumer_secret: 'secret', oauth: 1}
21+
var options = {}, server = {}, name = 'grant'
22+
var result = config.merge({provider, options, server, name})
23+
t.deepEqual(result, {
24+
consumer_key: 'key', consumer_secret: 'secret', oauth: 1,
25+
grant: true, name: 'grant', key: 'key', secret: 'secret'
26+
})
2527
})
26-
})
27-
it('client_id and client_secret', () => {
28-
var provider = {client_id: 'key', client_secret: 'secret', oauth: 2}
29-
var options = {}, server = {}, name = 'grant'
30-
var result = config.merge({provider, options, server, name})
31-
t.deepEqual(result, {
32-
client_id: 'key', client_secret: 'secret', oauth: 2,
33-
grant: true, name: 'grant', key: 'key', secret: 'secret'
28+
it('client_id, client_secret', () => {
29+
var provider = {client_id: 'key', client_secret: 'secret', oauth: 2}
30+
var options = {}, server = {}, name = 'grant'
31+
var result = config.merge({provider, options, server, name})
32+
t.deepEqual(result, {
33+
client_id: 'key', client_secret: 'secret', oauth: 2,
34+
grant: true, name: 'grant', key: 'key', secret: 'secret'
35+
})
3436
})
3537
})
3638

@@ -145,11 +147,33 @@ describe('config', () => {
145147
var result = config.merge({provider, options, server, name})
146148
t.deepEqual(result, {
147149
scope: 'scope', callback: '/callback', grant: true, name: 'grant',
148-
overrides: {sub1: {
149-
scope: 'scope1', callback: '/callback', grant: true, name: 'grant'
150-
}, sub2: {
151-
scope: 'scope2', callback: '/callback', grant: true, name: 'grant'
152-
}}
150+
overrides: {
151+
sub1: {
152+
scope: 'scope1', callback: '/callback', grant: true, name: 'grant'
153+
},
154+
sub2: {
155+
scope: 'scope2', callback: '/callback', grant: true, name: 'grant'
156+
}
157+
}
158+
})
159+
})
160+
it('deep - not accessible through /connect/:provider/:override?', () => {
161+
var provider = {scope: ['scope'], callback: '/callback'}
162+
var options = {sub1: {scope: ['scope1'], sub2: {scope: ['scope2']}}}
163+
var server = {}, name = 'grant'
164+
var result = config.merge({provider, options, server, name})
165+
t.deepEqual(result, {
166+
scope: 'scope', callback: '/callback', grant: true, name: 'grant',
167+
overrides: {
168+
sub1: {
169+
scope: 'scope1', callback: '/callback', grant: true, name: 'grant',
170+
overrides: {
171+
sub2: {
172+
scope: 'scope2', callback: '/callback', grant: true, name: 'grant'
173+
}
174+
}
175+
}
176+
}
153177
})
154178
})
155179
})
@@ -309,6 +333,14 @@ describe('config', () => {
309333
custom_parameters: ['meta'], custom_params: {meta: {a: 'b'}}
310334
})
311335
})
336+
it('override static override', () => {
337+
var options = {grant: {
338+
callback: '/', overrides: {purest: {callback: '/callback'}}
339+
}}
340+
var session = {provider: 'grant', override: 'purest', dynamic: {state: 'purest'}}
341+
var result = config.provider(options, session)
342+
t.deepEqual(result, {callback: '/callback', state: 'purest'})
343+
})
312344
})
313345

314346
describe('state', () => {
@@ -334,18 +366,14 @@ describe('config', () => {
334366
it('using new', () => {
335367
var grant1 = new Grant({grant1: {}})
336368
var grant2 = new Grant({grant2: {}})
337-
t.deepEqual(grant1.config,
338-
{grant1: {grant1: true, name: 'grant1'}})
339-
t.deepEqual(grant2.config,
340-
{grant2: {grant2: true, name: 'grant2'}})
369+
t.deepEqual(grant1.config, {grant1: {grant1: true, name: 'grant1'}})
370+
t.deepEqual(grant2.config, {grant2: {grant2: true, name: 'grant2'}})
341371
})
342372
it('without using new', () => {
343373
var grant1 = Grant({grant1: {}})
344374
var grant2 = Grant({grant2: {}})
345-
t.deepEqual(grant1.config,
346-
{grant1: {grant1: true, name: 'grant1'}})
347-
t.deepEqual(grant2.config,
348-
{grant2: {grant2: true, name: 'grant2'}})
375+
t.deepEqual(grant1.config, {grant1: {grant1: true, name: 'grant1'}})
376+
t.deepEqual(grant2.config, {grant2: {grant2: true, name: 'grant2'}})
349377
})
350378
})
351379

@@ -361,8 +389,7 @@ describe('config', () => {
361389
var server = new Hapi.Server()
362390
server.connection({host: 'localhost', port: 5000})
363391
server.register([{register: grant, options: config}], () => {
364-
t.deepEqual(grant.config,
365-
{grant: {grant: true, name: 'grant'}})
392+
t.deepEqual(grant.config, {grant: {grant: true, name: 'grant'}})
366393
done()
367394
})
368395
})
@@ -372,8 +399,7 @@ describe('config', () => {
372399
var server = new Hapi.Server()
373400
server.connection({host: 'localhost', port: 5000})
374401
server.register([{register: grant}], () => {
375-
t.deepEqual(grant.config,
376-
{grant: {grant: true, name: 'grant'}})
402+
t.deepEqual(grant.config, {grant: {grant: true, name: 'grant'}})
377403
done()
378404
})
379405
})
@@ -384,8 +410,7 @@ describe('config', () => {
384410
var grant = new Grant()
385411
var server = new Hapi.Server({host: 'localhost', port: 5000})
386412
server.register([{plugin: grant, options: config}]).then(() => {
387-
t.deepEqual(grant.config,
388-
{grant: {grant: true, name: 'grant'}})
413+
t.deepEqual(grant.config, {grant: {grant: true, name: 'grant'}})
389414
done()
390415
})
391416
})
@@ -394,8 +419,7 @@ describe('config', () => {
394419
var grant = new Grant(config)
395420
var server = new Hapi.Server({host: 'localhost', port: 5000})
396421
server.register([{plugin: grant}]).then(() => {
397-
t.deepEqual(grant.config,
398-
{grant: {grant: true, name: 'grant'}})
422+
t.deepEqual(grant.config, {grant: {grant: true, name: 'grant'}})
399423
done()
400424
})
401425
})

0 commit comments

Comments
 (0)