Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade devDependencies, test Hapi 12, lint update with tests/examples #178

Merged
merged 1 commit into from Jan 31, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -8,6 +8,7 @@ node_js:
env:
- HAPI_VERSION="10"
- HAPI_VERSION="11"
- HAPI_VERSION="12"

install:
- npm install
Expand Down
3 changes: 3 additions & 0 deletions examples/arcgisonline.js
Expand Up @@ -3,6 +3,7 @@
// Load modules

const Hapi = require('hapi');
const Hoek = require('hoek');
const Bell = require('../');


Expand All @@ -11,6 +12,7 @@ server.connection({ port: 8000 });

server.register(Bell, (err) => {

Hoek.assert(!err, err);
server.auth.strategy('arcgisonline', 'bell', {
provider: 'arcgisonline',
password: 'password',
Expand Down Expand Up @@ -39,6 +41,7 @@ server.register(Bell, (err) => {

server.start((err) => {

Hoek.assert(!err, err);
console.log('Server started at:', server.info.uri);
});
});
3 changes: 3 additions & 0 deletions examples/facebook.js
Expand Up @@ -3,6 +3,7 @@
// Load modules

const Hapi = require('hapi');
const Hoek = require('hoek');
const Bell = require('../');


Expand All @@ -11,6 +12,7 @@ server.connection({ host: 'localhost', port: 3456 });

server.register(Bell, (err) => {

Hoek.assert(!err, err);
server.auth.strategy('facebook', 'bell', {
provider: 'facebook',
password: 'password',
Expand Down Expand Up @@ -45,6 +47,7 @@ server.register(Bell, (err) => {

server.start((err) => {

Hoek.assert(!err, err);
console.log('Server started at:', server.info.uri);
});
});
3 changes: 3 additions & 0 deletions examples/google.js
Expand Up @@ -3,6 +3,7 @@
// Load modules

const Hapi = require('hapi');
const Hoek = require('hoek');
const Bell = require('../');


Expand All @@ -11,6 +12,7 @@ server.connection({ host: 'localhost', port: 4567 });

server.register(Bell, (err) => {

Hoek.assert(!err, err);
server.auth.strategy('google', 'bell', {
provider: 'google',
password: 'password',
Expand Down Expand Up @@ -48,6 +50,7 @@ server.register(Bell, (err) => {

server.start((err) => {

Hoek.assert(!err, err);
console.log('Server started at:', server.info.uri);
});
});
3 changes: 3 additions & 0 deletions examples/linkedin.js
Expand Up @@ -3,6 +3,7 @@
// Load modules

const Hapi = require('hapi');
const Hoek = require('hoek');
const Bell = require('../');


Expand All @@ -11,6 +12,7 @@ server.connection({ port: 8000 });

server.register(Bell, (err) => {

Hoek.assert(!err, err);
server.auth.strategy('linkedin', 'bell', {
provider: 'linkedin',
password: 'password',
Expand Down Expand Up @@ -38,6 +40,7 @@ server.register(Bell, (err) => {

server.start((err) => {

Hoek.assert(!err, err);
console.log('Server started at:', server.info.uri);
});
});
3 changes: 3 additions & 0 deletions examples/meetup.js
Expand Up @@ -3,6 +3,7 @@
// Load modules

const Hapi = require('hapi');
const Hoek = require('hoek');
const Bell = require('../');


Expand All @@ -11,6 +12,7 @@ server.connection({ port: 8000 });

server.register(Bell, (err) => {

Hoek.assert(!err, err);
server.auth.strategy('meetup', 'bell', {
provider: 'meetup',
password: 'cookie_encryption_password',
Expand Down Expand Up @@ -38,6 +40,7 @@ server.register(Bell, (err) => {

server.start((err) => {

Hoek.assert(!err, err);
console.log('Server started at:', server.info.uri);
});
});
3 changes: 3 additions & 0 deletions examples/nest.js
Expand Up @@ -3,6 +3,7 @@
// Load modules

const Hapi = require('hapi');
const Hoek = require('hoek');
const Bell = require('../');


Expand All @@ -11,6 +12,7 @@ server.connection({ port: 8000 });

server.register(Bell, (err) => {

Hoek.assert(!err, err);
server.auth.strategy('nest', 'bell', {
provider: 'nest',
password: 'password',
Expand All @@ -34,6 +36,7 @@ server.register(Bell, (err) => {

server.start((err) => {

Hoek.assert(!err, err);
console.log('Server started at:', server.info.uri);
});
});
3 changes: 3 additions & 0 deletions examples/twitter.js
Expand Up @@ -3,6 +3,7 @@
// Load modules

const Hapi = require('hapi');
const Hoek = require('hoek');
const Bell = require('../');


Expand All @@ -11,6 +12,7 @@ server.connection({ port: 8000 });

server.register(Bell, (err) => {

Hoek.assert(!err, err);
server.auth.strategy('twitter', 'bell', {
provider: 'twitter',
password: 'password',
Expand All @@ -36,6 +38,7 @@ server.register(Bell, (err) => {

server.start((err) => {

Hoek.assert(!err, err);
console.log('Server started at:', server.info.uri);
});
});
6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -43,9 +43,9 @@
"hapi": ">=10.x.x"
},
"devDependencies": {
"hapi": "11.x.x",
"hawk": "3.x.x",
"lab": "7.x.x",
"hapi": "12.x.x",
"hawk": "4.x.x",
"lab": "8.x.x",
"code": "2.x.x",
"sinon": "1.x.x"
},
Expand Down
1 change: 1 addition & 0 deletions test/index.js
Expand Up @@ -338,6 +338,7 @@ describe('Bell', () => {
server.connection({ host: 'localhost', port: 80 });
server.register(Bell, (err) => {

expect(err).to.not.exist();
expect(server.plugins.bell.oauth.Client).to.be.function();
done();
});
Expand Down