Tests

.travis.yml

@@ -1,8 +1,11 @@
+sudo: required
+services:
+  - docker
 language: node_js
 node_js:
-- '4.3.2'
-- '6.9.0'
+  - '4.3.2'
+  - '6.10.0'
 script:
-- npm run install-dependencies
-- npm run lint
-#- npm test
+  - npm run install-dependencies
+  - npm run lint
+  - npm test

README.md

@@ -126,4 +126,4 @@ To use Cognito User Pool as user database:
 
 * Install Docker and Docker Compose
 * Run `npm install` in project root directory
-* Run ./specs-docker.sh
+* Run ./run-tests.sh

authentication/lib/storage/dynamo/dynamoCache.js

@@ -1,13 +1,18 @@
 'use strict';
 
 const table = process.env.CACHE_DB_NAME;
-const config = { region: process.env.REGION };
-
-if (process.env.LOCAL_DDB_ENDPOINT) config.endpoint = process.env.LOCAL_DDB_ENDPOINT;
 
 // Common
 const AWS = require('aws-sdk');
 
+const config = {
+  region: AWS.config.region || process.env.REGION || 'eu-west-1',
+};
+
+if (process.env.LOCAL_DDB_ENDPOINT) {
+  Object.assign(config, { endpoint: process.env.LOCAL_DDB_ENDPOINT });
+}
+
 const dynamodb = new AWS.DynamoDB.DocumentClient(config);
 const crypto = require('crypto');
 const Promise = require('bluebird');

authentication/lib/storage/dynamo/dynamoUser.js

@@ -1,13 +1,18 @@
 'use strict';
 
 const table = process.env.USERS_DB_NAME;
-const config = { region: process.env.REGION };
-
-if (process.env.LOCAL_DDB_ENDPOINT) config.endpoint = process.env.LOCAL_DDB_ENDPOINT;
 
 // Common
 const AWS = require('aws-sdk');
 
+const config = {
+  region: AWS.config.region || process.env.REGION || 'eu-west-1',
+};
+
+if (process.env.LOCAL_DDB_ENDPOINT) {
+  Object.assign(config, { endpoint: process.env.LOCAL_DDB_ENDPOINT });
+}
+
 const dynamodb = new AWS.DynamoDB.DocumentClient(config);
 
 const saveUser = (profile) => {

docker-compose.yml

@@ -1,7 +1,9 @@
+---
 version: '2'
+
 services:
   dynamodb:
-    image: tray/dynamodb-local
+    image: dwmkerr/dynamodb
     ports:
-     - "8000:8000"
-    command: -sharedDb -inMemory -cors '*'
+      - "8000:8000"
+    command: -sharedDb -inMemory -cors '*'

package.json

@@ -34,6 +34,7 @@
   },
   "scripts": {
     "lint": "./node_modules/.bin/eslint .",
+    "test": "./run-tests.sh",
     "install-dependencies": "npm run install-authentication && npm run install-test-token",
     "install-authentication": "cd authentication && npm install",
     "install-test-token": "cd test-token && npm install",

run-tests.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+SERVERLESS_PROJECT="serverless-authentication"
+SERVERLESS_STAGE="dev"
+SERVERLESS_REGION="eu-west-1"
+LOCAL_DDB_ENDPOINT="http://127.0.0.1:8000"
+
+docker-compose up -d
+
+STAGE=$SERVERLESS_STAGE \
+  REGION=$SERVERLESS_REGION \
+  PROJECT=$SERVERLESS_PROJECT \
+  LOCAL_DDB_ENDPOINT=$LOCAL_DDB_ENDPOINT \
+  ./node_modules/.bin/mocha test/
+
+docker-compose down

specs/.eslintrc → test/.eslintrc

@@ -2,14 +2,16 @@
   "settings": {
     "import/core-modules": [
       "chai",
-      "dirty-chai",
       "serverless-authentication",
       "nock",
       "js-yaml",
       "aws-sdk",
       "async"
     ]
   },
+  "rules": {
+    "no-unused-expressions": "off"
+  },
   "env": {
     "node": true,
     "mocha": true

specs/_setup.js → test/_setup.js

@@ -1,17 +1,11 @@
 'use strict';
 
 const chai = require('chai');
-const dirtyChai = require('dirty-chai');
 const dynamo = require('./dynamo');
 
 const expect = chai.expect;
-chai.use(dirtyChai);
 
-process.env.STAGE = 'dev';
-process.env.CACHE_DB_NAME = '{stage}-serverless-authentication-cache';
-process.env.COGNITO_IDENTITY_POOL_ID = 'cognito-pool-id';
-process.env.COGNITO_REGION = 'eu-west-1';
-process.env.COGNITO_PROVIDER_NAME = 'serverless-authentication-boilerplate';
+process.env.CACHE_DB_NAME = 'dev-serverless-authentication-cache';
 process.env.REDIRECT_CLIENT_URI = 'http://127.0.0.1:3000/';
 process.env.TOKEN_SECRET = 'token-secret-123';
 process.env.PROVIDER_FACEBOOK_ID = 'fb-mock-id';
@@ -23,14 +17,8 @@ process.env.PROVIDER_MICROSOFT_SECRET = 'ms-mock-secret';
 process.env.PROVIDER_CUSTOM_GOOGLE_ID = 'cg-mock-id';
 process.env.PROVIDER_CUSTOM_GOOGLE_SECRET = 'cg-mock-secret';
 
-chai.config.includeStack = false;
-
-global.AssertionError = chai.AssertionError;
-global.Assertion = chai.Assertion;
-
 describe('Setup specs', () => {
   before(done => dynamo.init(done));
-
   it('Local DynamoDB should be ready', () =>
-    expect(dynamo.isReady()).to.be.true());
+    expect(dynamo.isReady()).to.be.equal(true));
 });

specs/authorization-spec.js → test/authorization.test.js

@@ -20,7 +20,7 @@ describe('Authorization', () => {
       };
 
       authorize(event, (error, data) => {
-        expect(error).to.be.null();
+        expect(error).to.be.null;
         expect(data.principalId).to.be.equal(payload.id);
         done(error);
       });

specs/custom-google-spec.js → test/custom-google.test.js

@@ -95,7 +95,7 @@ describe('Authentication Provider', () => {
       };
 
       refreshHandler(event, (error, data) => {
-        expect(error).to.be.null();
+        expect(error).to.be.null;
         expect(data.authorization_token).to.match(/[a-zA-Z0-9\-_]+?\.[a-zA-Z0-9\-_]+?\.([a-zA-Z0-9\-_]+)?/);
         expect(data.refresh_token).to.match(/[A-Fa-f0-9]{64}/);
         done(error);

specs/dynamo.js → test/dynamo.js

@@ -1,9 +1,9 @@
 'use strict';
 
 const endpoint = process.env.LOCAL_DDB_ENDPOINT;
-const project = process.env.SERVERLESS_PROJECT;
-const stage = process.env.SERVERLESS_STAGE;
-const region = process.env.SERVERLESS_REGION;
+const project = process.env.PROJECT;
+const stage = process.env.STAGE;
+const region = process.env.REGION;
 const table = [stage, project, 'cache'].join('-');
 
 const fs = require('fs');
@@ -20,15 +20,15 @@ const db = new DynamoDB({ endpoint, region });
 let ready = false;
 
 function init(cb) {
-  resources.Dynamo.Properties.TableName = table;
+  resources.CacheTable.Properties.TableName = table;
   async.waterfall([
     (callback) => {
       db.listTables({}, callback);
     },
     (data, callback) => {
       const tables = data.TableNames;
       if (tables.indexOf(table) < 0) {
-        db.createTable(resources.Dynamo.Properties, (err, created) => {
+        db.createTable(resources.CacheTable.Properties, (err, created) => {
           if (!err) {
             callback(null, `table ${created.TableDescription.TableName} created`);
           } else {

specs/facebook-spec.js → test/facebook.test.js

@@ -94,7 +94,7 @@ describe('Authentication Provider', () => {
       };
 
       refreshHandler(event, (error, data) => {
-        expect(error).to.be.null();
+        expect(error).to.be.null;
         expect(data.authorization_token).to.match(/[a-zA-Z0-9\-_]+?\.[a-zA-Z0-9\-_]+?\.([a-zA-Z0-9\-_]+)?/);
         expect(data.refresh_token).to.match(/[A-Fa-f0-9]{64}/);
         done(error);

specs/google-spec.js → test/google.test.js

@@ -94,7 +94,7 @@ describe('Authentication Provider', () => {
       };
 
       refreshHandler(event, (error, data) => {
-        expect(error).to.be.null();
+        expect(error).to.be.null;
         expect(data.authorization_token).to.match(/[a-zA-Z0-9\-_]+?\.[a-zA-Z0-9\-_]+?\.([a-zA-Z0-9\-_]+)?/);
         expect(data.refresh_token).to.match(/[A-Fa-f0-9]{64}/);
       });

specs/microsoft-spec.js → test/microsoft.test.js

@@ -90,7 +90,7 @@ describe('Authentication Provider', () => {
       };
 
       refreshHandler(event, (error, data) => {
-        expect(error).to.be.null();
+        expect(error).to.be.null;
         expect(data.authorization_token).to.match(/[a-zA-Z0-9\-_]+?\.[a-zA-Z0-9\-_]+?\.([a-zA-Z0-9\-_]+)?/);
         expect(data.refresh_token).to.match(/[A-Fa-f0-9]{64}/);
         expect(data.id).to.equal(event.id);