Fix unit and integration tests

Gruntfile.js

@@ -180,8 +180,8 @@ module.exports = function (grunt) {
   grunt.registerTask('compile-server', ['run:lint-server', 'run:compile-server'])
   grunt.registerTask('compile-client', ['run:lint-client', 'run:compile-client'])
 
-  grunt.registerTask('test-server', ['env:env-test-server-unit', 'run:test-server-unit'])
+  grunt.registerTask('test-server', ['run:test-server-unit'])
-  grunt.registerTask('test-client', ['env:env-test-client-unit', 'run:test-client-unit'])
+  grunt.registerTask('test-client', ['run:test-client-unit'])
   grunt.registerTask('test-unit', ['test-server', 'test-client']);
   grunt.registerTask('test-int', ['run:test-int']);
 

config.template.yml

@@ -209,7 +209,8 @@ storage:
   
   # Settings to connect to mongo server
   mongo:
-    url: mongodb://mongo/authelia
+    url: mongodb://mongo
+    database: authelia
 
 # Configuration of the notification system.
 #

example/authelia/docker-compose.test.yml

@@ -3,3 +3,7 @@ services:
   authelia:
     volumes:
       - ./config.test.yml:/etc/authelia/config.yml:ro
+      - ./dist/server:/usr/src/server
+      - ./dist/shared:/usr/src/shared
+    networks:
+      - example-network

package-lock.json

@@ -5045,17 +5045,17 @@
       "optional": true
     },
     "mongodb": {
-      "version": "3.0.4",
+      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.0.5.tgz",
-      "integrity": "sha512-90YIIs7A4ko4kCGafxxXj3foexCAlJBC0YLwwIKgSLoE7Vni2IqUMz6HSsZ3zbXOfR1KWtxfnc0RyAMAY/ViLg==",
+      "integrity": "sha512-8ioTyyc8tkNwZCTDa1FPWvmpJFfvE484DnugC8KpVrw4AKAE03OOAlORl2yYTNtz3TX4Ab7FRo00vzgexB/67A==",
       "requires": {
-        "mongodb-core": "3.0.4"
+        "mongodb-core": "3.0.5"
       }
     },
     "mongodb-core": {
-      "version": "3.0.4",
+      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-3.0.5.tgz",
-      "integrity": "sha512-OTH267FjfwBdEufSnrgd+u8HuLWRuQ6p8DR0XirPl2BdlLEMh4XwjJf1RTlruILp5p2m1w8dDC8rCxibC3W8qQ==",
+      "integrity": "sha512-4A1nx/xAU5d/NPICjiyzVxzNrIdJQQsYRe3xQkV1O638t+fHHfAOLK+SQagqGnu1m0aeSxb1ixp/P0FGSQWIGA==",
       "requires": {
         "bson": "1.0.6",
         "require_optional": "1.0.1"

package.json

@@ -6,7 +6,7 @@
     "authelia": "./dist/server/src/index.js"
   },
   "scripts": {
-    "test": "./node_modules/.bin/grunt unit-tests",
+    "test": "./node_modules/.bin/grunt test-unit",
     "cover": "NODE_ENV=test nyc npm t",
     "serve": "node dist/server/index.js"
   },
@@ -33,7 +33,7 @@
     "express-request-id": "^1.4.0",
     "express-session": "^1.14.2",
     "ldapjs": "^1.0.2",
-    "mongodb": "^3.0.4",
+    "mongodb": "^3.0.5",
     "nedb": "^1.8.0",
     "nodemailer": "^4.0.1",
     "nodemailer-direct-transport": "^3.3.2",
@@ -53,7 +53,7 @@
     "@types/bootstrap": "^4.0.1",
     "@types/connect-redis": "0.0.7",
     "@types/cors": "^2.8.1",
-    "@types/cucumber": "^2.3.1",
+    "@types/cucumber": "^4.0.1",
     "@types/ejs": "^2.3.33",
     "@types/express": "^4.0.35",
     "@types/express-session": "1.15.8",

scripts/run-cucumber.sh

@@ -1,3 +1,5 @@
 #!/bin/bash
 
-./node_modules/.bin/cucumber-js --colors --compiler ts:ts-node/register $*
+REQ=`for f in test/features/step_definitions/*.ts; do echo "--require $f"; done;`
+
+./node_modules/.bin/cucumber-js --format-options '{"colorsEnabled": true}' --require-module ts-node/register --require test/features/support/world.ts $REQ $*

server/src/index.ts

@@ -20,7 +20,8 @@ const deps: GlobalDependencies = {
   winston: require("winston"),
   speakeasy: require("speakeasy"),
   nedb: require("nedb"),
-  ConnectRedis: require("connect-redis")
+  ConnectRedis: require("connect-redis"),
+  Redis: require("redis")
 };
 
 const server = new Server(deps);

server/src/lib/ServerVariablesInitializer.ts

@@ -52,7 +52,7 @@ class UserDataStoreFactory {
     else if (config.storage.mongo) {
       const mongoConnectorFactory = new MongoConnectorFactory();
       const mongoConnector = mongoConnectorFactory.create(config.storage.mongo.url);
-      return mongoConnector.connect()
+      return mongoConnector.connect(config.storage.mongo.database)
         .then(function (client: IMongoClient) {
           const collectionFactory = CollectionFactoryFactory.createMongo(client);
           return BluebirdPromise.resolve(new UserDataStore(collectionFactory));

server/src/lib/configuration/Configuration.d.ts

@@ -95,6 +95,7 @@ export interface NotifierConfiguration {
 
 export interface MongoStorageConfiguration {
   url: string;
+  database: string;
 }
 
 export interface LocalStorageConfiguration {

server/src/lib/configuration/SessionConfigurationBuilder.ts

@@ -2,7 +2,6 @@
 import ExpressSession = require("express-session");
 import { AppConfiguration } from "./Configuration";
 import { GlobalDependencies } from "../../../types/Dependencies";
-import Redis = require("redis");
 
 export class SessionConfigurationBuilder {
 
@@ -23,7 +22,7 @@ export class SessionConfigurationBuilder {
       let redisOptions;
       if (configuration.session.redis.host
         && configuration.session.redis.port) {
-        const client = Redis.createClient({
+        const client = deps.Redis.createClient({
           host: configuration.session.redis.host,
           port: configuration.session.redis.port
         });

server/src/lib/configuration/Validator.ts

@@ -13,7 +13,7 @@ function validateSchema(configuration: UserConfiguration): string[] {
     allErrors: true,
     missingRefs: "fail"
   });
-  ajv.addMetaSchema(require("ajv/lib/refs/json-schema-draft-04.json"));
+  ajv.addMetaSchema(require("ajv/lib/refs/json-schema-draft-06.json"));
   const valid = ajv.validate(schema, configuration);
   if (!valid)
     return ajv.errors.map(
@@ -21,14 +21,15 @@ function validateSchema(configuration: UserConfiguration): string[] {
   return [];
 }
 
+function diff(a: string[], b: string[]) {
+  return a.filter(function(i) {return b.indexOf(i) < 0; });
+}
+
 function validateUnknownKeys(path: string, obj: any, knownKeys: string[]) {
-  const keysSet = new Set(Object.keys(obj));
+  const keysSet = Object.keys(obj);
-  const knownKeysSet = new Set(knownKeys);
 
-  const unknownKeysSet = new Set(
+  const unknownKeysSet = diff(keysSet, knownKeys);
-    [...keysSet].filter(x => !knownKeysSet.has(x)));
+  if (unknownKeysSet.length > 0) {
-
-  if (unknownKeysSet.size > 0) {
     const unknownKeys = Array.from(unknownKeysSet);
     return unknownKeys.map((k: string) => { return Util.format("data.%s has unknown key '%s'", path, k); });
   }

server/src/lib/connectors/mongo/IMongoConnector.d.ts

@@ -2,5 +2,6 @@ import BluebirdPromise = require("bluebird");
 import { IMongoClient } from "./IMongoClient";
 
 export interface IMongoConnector {
-    connect(): BluebirdPromise<IMongoClient>;
+    connect(databaseName: string): BluebirdPromise<IMongoClient>;
+    close(): BluebirdPromise<void>;
 }

server/src/lib/connectors/mongo/MongoConnector.ts

@@ -7,16 +7,25 @@ import { MongoClient } from "./MongoClient";
 
 export class MongoConnector implements IMongoConnector {
   private url: string;
+  private client: MongoDB.MongoClient;
 
   constructor(url: string) {
     this.url = url;
   }
 
-  connect(): BluebirdPromise<IMongoClient> {
+  connect(databaseName: string): BluebirdPromise<IMongoClient> {
+    const that = this;
     const connectAsync = BluebirdPromise.promisify(MongoDB.MongoClient.connect);
     return connectAsync(this.url)
-      .then(function (db: MongoDB.Db) {
+      .then(function (client: MongoDB.MongoClient) {
+        that.client = client;
+        const db = client.db(databaseName);
         return BluebirdPromise.resolve(new MongoClient(db));
       });
   }
+
+  close(): BluebirdPromise<void> {
+    this.client.close();
+    return BluebirdPromise.resolve();
+  }
 }

server/test/ServerConfiguration.test.ts

@@ -75,6 +75,7 @@ describe("test server configuration", function () {
       .then(function () {
         Assert(sessionMock.calledOnce);
         Assert.equal(sessionMock.getCall(0).args[0].cookie.domain, "example.com");
+        server.stop();
       });
   });
 });

server/test/SessionConfigurationBuilder.test.ts

@@ -141,6 +141,7 @@ describe("test session configuration builder", function () {
     };
 
     const RedisStoreMock = Sinon.spy();
+    const redisClient = Sinon.mock().returns({ on: Sinon.spy() });
 
     const deps: GlobalDependencies = {
       ConnectRedis: Sinon.stub().returns(RedisStoreMock) as any,
@@ -149,7 +150,10 @@ describe("test session configuration builder", function () {
       session: Sinon.spy() as any,
       speakeasy: Sinon.spy() as any,
       u2f: Sinon.spy() as any,
-      winston: Sinon.spy() as any
+      winston: Sinon.spy() as any,
+      Redis: {
+        createClient: Sinon.mock().returns(redisClient)
+      } as any
     };
 
     const options = SessionConfigurationBuilder.build(configuration, deps);

server/test/connectors/mongo/MongoConnector.test.ts

@@ -7,6 +7,7 @@ import { MongoConnector } from "../../../src/lib/connectors/mongo/MongoConnector
 
 describe("MongoConnector", function () {
   let mongoClientConnectStub: Sinon.SinonStub;
+
   describe("create", function () {
     before(function () {
       mongoClientConnectStub = Sinon.stub(MongoDB.MongoClient, "connect");
@@ -17,11 +18,12 @@ describe("MongoConnector", function () {
     });
 
     it("should create a connector", function () {
-      mongoClientConnectStub.yields(undefined);
+      const client = { db: Sinon.mock() };
+      mongoClientConnectStub.yields(undefined, client);
 
       const url = "mongodb://test.url";
       const connector = new MongoConnector(url);
-      return connector.connect()
+      return connector.connect("database")
         .then(function (client: IMongoClient) {
           Assert(client);
           Assert(mongoClientConnectStub.calledWith(url));
@@ -33,7 +35,7 @@ describe("MongoConnector", function () {
 
       const url = "mongodb://test.url";
       const connector = new MongoConnector(url);
-      return connector.connect()
+      return connector.connect("database")
         .then(function () { return BluebirdPromise.reject(new Error("It should not be here")); })
         .error(function (client: IMongoClient) {
           Assert(client);

server/types/Dependencies.ts

@@ -6,6 +6,7 @@ import nedb = require("nedb");
 import ldapjs = require("ldapjs");
 import u2f = require("u2f");
 import RedisSession = require("connect-redis");
+import Redis = require("redis");
 
 export type Speakeasy = typeof speakeasy;
 export type Winston = typeof winston;
@@ -14,11 +15,13 @@ export type Nedb = typeof nedb;
 export type Ldapjs = typeof ldapjs;
 export type U2f = typeof u2f;
 export type ConnectRedis = typeof RedisSession;
+export type Redis = typeof Redis;
 
 export interface GlobalDependencies {
     u2f: U2f;
     ldapjs: Ldapjs;
     session: Session;
+    Redis: Redis;
     ConnectRedis: ConnectRedis;
     winston: Winston;
     speakeasy: Speakeasy;

test/features/access-control.feature

@@ -7,20 +7,16 @@ Feature: User has access restricted access to domains
     And I use "REGISTERED" as TOTP token handle
     And I click on "Sign in"
     And I'm redirected to "https://home.example.com:8080/"
-    Then I have access to:
+    Then I have access to "https://public.example.com:8080/secret.html"
-      | url                                                    |
+    And I have access to "https://dev.example.com:8080/groups/admin/secret.html"
-      | https://public.example.com:8080/secret.html             |
+    And I have access to "https://dev.example.com:8080/groups/dev/secret.html"
-      | https://dev.example.com:8080/groups/admin/secret.html   |
+    And I have access to "https://dev.example.com:8080/users/john/secret.html"
-      | https://dev.example.com:8080/groups/dev/secret.html     |
+    And I have access to "https://dev.example.com:8080/users/harry/secret.html"
-      | https://dev.example.com:8080/users/john/secret.html     |
+    And I have access to "https://dev.example.com:8080/users/bob/secret.html"
-      | https://dev.example.com:8080/users/harry/secret.html    |
+    And I have access to "https://admin.example.com:8080/secret.html"
-      | https://dev.example.com:8080/users/bob/secret.html      |
+    And I have access to "https://mx1.mail.example.com:8080/secret.html"
-      | https://admin.example.com:8080/secret.html              |
+    And I have access to "https://single_factor.example.com:8080/secret.html"
-      | https://mx1.mail.example.com:8080/secret.html           |
+    And I have no access to "https://mx2.mail.example.com:8080/secret.html"
-      | https://single_factor.example.com:8080/secret.html      |
-    And I have no access to:
-      | url                                                    |
-      | https://mx2.mail.example.com:8080/secret.html           |
 
   @need-registered-user-bob
   Scenario: User bob has restricted access
@@ -29,20 +25,16 @@ Feature: User has access restricted access to domains
     And I use "REGISTERED" as TOTP token handle
     And I click on "Sign in"
     And I'm redirected to "https://home.example.com:8080/"
-    Then I have access to:
+    Then I have access to "https://public.example.com:8080/secret.html"
-      | url                                                    |
+    And I have no access to "https://dev.example.com:8080/groups/admin/secret.html"
-      | https://public.example.com:8080/secret.html             |
+    And I have access to "https://dev.example.com:8080/groups/dev/secret.html"
-      | https://dev.example.com:8080/groups/dev/secret.html     |
+    And I have no access to "https://dev.example.com:8080/users/john/secret.html"
-      | https://dev.example.com:8080/users/bob/secret.html      |
+    And I have no access to "https://dev.example.com:8080/users/harry/secret.html"
-      | https://mx1.mail.example.com:8080/secret.html           |
+    And I have access to "https://dev.example.com:8080/users/bob/secret.html"
-      | https://mx2.mail.example.com:8080/secret.html           |
+    And I have no access to "https://admin.example.com:8080/secret.html"
-    And I have no access to:
+    And I have access to "https://mx1.mail.example.com:8080/secret.html"
-      | url                                                    |
+    And I have no access to "https://single_factor.example.com:8080/secret.html"
-      | https://dev.example.com:8080/groups/admin/secret.html   |
+    And I have access to "https://mx2.mail.example.com:8080/secret.html"
-      | https://admin.example.com:8080/secret.html              |
-      | https://dev.example.com:8080/users/john/secret.html     |
-      | https://dev.example.com:8080/users/harry/secret.html    |
-      | https://single_factor.example.com:8080/secret.html      |
 
   @need-registered-user-harry
   Scenario: User harry has restricted access
@@ -51,17 +43,13 @@ Feature: User has access restricted access to domains
     And I use "REGISTERED" as TOTP token handle
     And I click on "Sign in"
     And I'm redirected to "https://home.example.com:8080/"
-    Then I have access to:
+    Then I have access to "https://public.example.com:8080/secret.html"
-      | url                                                    |
+    And I have no access to "https://dev.example.com:8080/groups/admin/secret.html"
-      | https://public.example.com:8080/secret.html             |
+    And I have no access to "https://dev.example.com:8080/groups/dev/secret.html"
-      | https://dev.example.com:8080/users/harry/secret.html    |
+    And I have no access to "https://dev.example.com:8080/users/john/secret.html"
-    And I have no access to:
+    And I have access to "https://dev.example.com:8080/users/harry/secret.html"
-      | url                                                    |
+    And I have no access to "https://dev.example.com:8080/users/bob/secret.html"
-      | https://dev.example.com:8080/groups/dev/secret.html     |
+    And I have no access to "https://admin.example.com:8080/secret.html"
-      | https://dev.example.com:8080/users/bob/secret.html      |
+    And I have no access to "https://mx1.mail.example.com:8080/secret.html"
-      | https://dev.example.com:8080/groups/admin/secret.html   |
+    And I have no access to "https://single_factor.example.com:8080/secret.html"
-      | https://admin.example.com:8080/secret.html              |
+    And I have no access to "https://mx2.mail.example.com:8080/secret.html"
-      | https://dev.example.com:8080/users/john/secret.html     |
-      | https://mx1.mail.example.com:8080/secret.html           |
-      | https://mx2.mail.example.com:8080/secret.html           |
-      | https://single_factor.example.com:8080/secret.html      |

test/features/reset-password.feature

@@ -1,24 +1,24 @@
 Feature: User is able to reset his password
 
   Scenario: User is redirected to password reset page
-    Given I'm on https://login.example.com:8080
+    Given I'm on "https://login.example.com:8080"
     When I click on the link "Forgot password?"
     Then I'm redirected to "https://login.example.com:8080/password-reset/request"
 
   Scenario: User get an email with a link to reset password
-    Given I'm on https://login.example.com:8080/password-reset/request
+    Given I'm on "https://login.example.com:8080/password-reset/request"
     When I set field "username" to "james"
     And I click on "Reset Password"
     Then I get a notification of type "success" with message "An email has been sent to you. Follow the link to change your password."
 
   Scenario: Request password for unexisting user should behave like existing user
-    Given I'm on https://login.example.com:8080/password-reset/request
+    Given I'm on "https://login.example.com:8080/password-reset/request"
     When I set field "username" to "fake_user"
     And I click on "Reset Password"
     Then I get a notification of type "success" with message "An email has been sent to you. Follow the link to change your password."
 
   Scenario: User resets his password
-    Given I'm on https://login.example.com:8080/password-reset/request
+    Given I'm on "https://login.example.com:8080/password-reset/request"
     And I set field "username" to "james"
     And I click on "Reset Password"
     When I click on the link of the email
@@ -29,7 +29,7 @@ Feature: User is able to reset his password
 
 
   Scenario: User does not confirm new password
-    Given I'm on https://login.example.com:8080/password-reset/request
+    Given I'm on "https://login.example.com:8080/password-reset/request"
     And I set field "username" to "james"
     And I click on "Reset Password"
     When I click on the link of the email

test/features/resilience.feature

@@ -3,9 +3,7 @@ Feature: Authelia keeps user sessions despite the application restart
   @need-authenticated-user-john
   Scenario: Session is still valid after Authelia restarts
     When the application restarts
-    Then I have access to:
+    Then I have access to "https://admin.example.com:8080/secret.html"
-      | url                                          |
-      | https://admin.example.com:8080/secret.html   |
 
   @need-registered-user-john
   Scenario: Secrets are stored even when Authelia restarts

test/features/session-timeout.feature

@@ -3,18 +3,14 @@ Feature: Session is closed after a certain amount of time
 
   @need-authenticated-user-john
   Scenario: An authenticated user is disconnected after a certain inactivity period
-    Given I have access to:
+    Given I have access to "https://public.example.com:8080/secret.html"
-      | url                                                    |
-      | https://public.example.com:8080/secret.html             |
     When I sleep for 6 seconds
     And I visit "https://public.example.com:8080/secret.html"
     Then I'm redirected to "https://login.example.com:8080/?redirect=https%3A%2F%2Fpublic.example.com%3A8080%2Fsecret.html"
 
   @need-authenticated-user-john
   Scenario: An authenticated user is disconnected after session expiration period
-    Given I have access to:
+    Given I have access to "https://public.example.com:8080/secret.html"
-      | url                                                    |
-      | https://public.example.com:8080/secret.html             |
     When I sleep for 4 seconds
     And I visit "https://public.example.com:8080/secret.html"
     And I sleep for 4 seconds

test/features/step_definitions/access-control.ts

@@ -0,0 +1,17 @@
+import {Then} from "cucumber";
+
+Then("I have access to {string}", function(url: string) {
+  const that = this;
+  return this.driver.get(url)
+    .then(function () {
+      return that.waitUntilUrlContains(url);
+    });
+});
+
+Then("I have no access to {string}", function(url: string) {
+  const that = this;
+  return this.driver.get(url)
+    .then(function () {
+      return that.getErrorPage(403);
+    });
+});

test/features/step_definitions/authelia.ts

@@ -1,15 +1,10 @@
-import Cucumber = require("cucumber");
+import {Before, When, Then} from "cucumber";
 import seleniumWebdriver = require("selenium-webdriver");
 import Assert = require("assert");
 import Request = require("request-promise");
 import Bluebird = require("bluebird");
 
-Cucumber.defineSupportCode(function ({ Given, When, Then, Before, After }) {
+When("I query {string}", function (url: string) {
-  Before(function () {
-    this.jar = Request.jar();
-  })
-
-  When("I query {stringInDoubleQuotes}", function (url: string) {
   const that = this;
   return Request(url, { followRedirect: false })
     .then(function(response) {
@@ -19,9 +14,9 @@ Cucumber.defineSupportCode(function ({ Given, When, Then, Before, After }) {
     .catch(function(err: Error) {
       that.error = err;
     })
-  });
+});
 
-  Then("I get error code 401", function() {
+Then("I get error code 401", function() {
   const that = this;
   return new Bluebird(function(resolve, reject) {
     if(that.error && that.error.statusCode == 401) {
@@ -34,9 +29,9 @@ Cucumber.defineSupportCode(function ({ Given, When, Then, Before, After }) {
         reject(new Error("Error code != 401"));
     }
   });
-  });
+});
 
-  Then("I get redirected to {stringInDoubleQuotes}", function(url: string) {
+Then("I get redirected to {string}", function(url: string) {
   const that = this;
   return new Bluebird(function(resolve, reject) {
     if(that.error && that.error.statusCode == 302 
@@ -47,5 +42,4 @@ Cucumber.defineSupportCode(function ({ Given, When, Then, Before, After }) {
       reject(new Error("Not redirected"));
     }
   });
-  })
 });

test/features/step_definitions/authentication.ts

@@ -1,4 +1,4 @@
-import Cucumber = require("cucumber");
+import {Given, When, Then, TableDefinition} from "cucumber";
 import seleniumWebdriver = require("selenium-webdriver");
 import Assert = require("assert");
 import Fs = require("fs");
@@ -7,39 +7,38 @@ import CustomWorld = require("../support/world");
 import BluebirdPromise = require("bluebird");
 import Request = require("request-promise");
 
-Cucumber.defineSupportCode(function ({ Given, When, Then }) {
+When(/^I visit "(https:\/\/[a-zA-Z0-9:%&._\/=?-]+)"$/, function (link: string) {
-  When(/^I visit "(https:\/\/[a-zA-Z0-9:%&._\/=?-]+)"$/, function (link: string) {
   return this.visit(link);
-  });
+});
 
-  When("I wait for notification to disappear", function () {
+When("I wait for notification to disappear", function () {
   const that = this;
   const notificationEl = this.driver.findElement(seleniumWebdriver.By.className("notification"));
   return this.driver.wait(seleniumWebdriver.until.elementIsVisible(notificationEl), 15000)
     .then(function () {
       return that.driver.wait(seleniumWebdriver.until.elementIsNotVisible(notificationEl), 15000);
     })
-  })
+})
 
-  When("I set field {stringInDoubleQuotes} to {stringInDoubleQuotes}", function (fieldName: string, content: string) {
+When("I set field {string} to {string}", function (fieldName: string, content: string) {
   return this.setFieldTo(fieldName, content);
-  });
+});
 
-  When("I clear field {stringInDoubleQuotes}", function (fieldName: string) {
+When("I clear field {string}", function (fieldName: string) {
   return this.clearField(fieldName);
-  });
+});
 
-  When("I click on {stringInDoubleQuotes}", function (text: string) {
+When("I click on {string}", function (text: string) {
   return this.clickOnButton(text);
-  });
+});
 
-  Given("I login with user {stringInDoubleQuotes} and password {stringInDoubleQuotes}",
+Given("I login with user {string} and password {string}",
   function (username: string, password: string) {
     return this.loginWithUserPassword(username, password);
   });
 
-  Given("I login with user {stringInDoubleQuotes} and password {stringInDoubleQuotes} \
+Given("I login with user {string} and password {string} \
-and I use TOTP token handle {stringInDoubleQuotes}",
+and I use TOTP token handle {string}",
   function (username: string, password: string, totpTokenHandle: string) {
     const that = this;
     return this.loginWithUserPassword(username, password)
@@ -48,19 +47,19 @@ and I use TOTP token handle {stringInDoubleQuotes}",
       });
   });
 
-  Given("I register a TOTP secret called {stringInDoubleQuotes}", function (handle: string) {
+Given("I register a TOTP secret called {string}", function (handle: string) {
   return this.registerTotpSecret(handle);
-  });
+});
 
-  Given("I use {stringInDoubleQuotes} as TOTP token", function (token: string) {
+Given("I use {string} as TOTP token", function (token: string) {
   return this.useTotpToken(token);
-  });
+});
 
-  Given("I use {stringInDoubleQuotes} as TOTP token handle", function (handle) {
+Given("I use {string} as TOTP token handle", function (handle) {
   return this.useTotpTokenHandle(handle);
-  });
+});
 
-  When("I visit {stringInDoubleQuotes} and get redirected {stringInDoubleQuotes}",
+When("I visit {string} and get redirected {string}",
   function (url: string, redirectUrl: string) {
     const that = this;
     return this.driver.get(url)
@@ -69,44 +68,12 @@ and I use TOTP token handle {stringInDoubleQuotes}",
       });
   });
 
-  Given("I register TOTP and login with user {stringInDoubleQuotes} and password {stringInDoubleQuotes}",
+Given("I register TOTP and login with user {string} and password {string}",
   function (username: string, password: string) {
     return this.registerTotpAndSignin(username, password);
   });
 
-  function hasAccessToSecret(link: string, that: any) {
+function endpointReplyWith(context: any, link: string, method: string,
-    return that.driver.get(link)
-      .then(function () {
-        return that.waitUntilUrlContains(link);
-      });
-  }
-
-  function hasNoAccessToSecret(link: string, that: any) {
-    return that.driver.get(link)
-      .then(function () {
-        return that.getErrorPage(403);
-      });
-  }
-
-  Then("I have access to:", function (dataTable: Cucumber.TableDefinition) {
-    const promises: any = [];
-    for (let i = 0; i < dataTable.rows().length; i++) {
-      const url = (dataTable.hashes() as any)[i].url;
-      promises.push(hasAccessToSecret(url, this));
-    }
-    return BluebirdPromise.all(promises);
-  });
-
-  Then("I have no access to:", function (dataTable: Cucumber.TableDefinition) {
-    const promises = [];
-    for (let i = 0; i < dataTable.rows().length; i++) {
-      const url = (dataTable.hashes() as any)[i].url;
-      promises.push(hasNoAccessToSecret(url, this));
-    }
-    return BluebirdPromise.all(promises);
-  });
-
-  function endpointReplyWith(context: any, link: string, method: string,
   returnCode: number) {
   return Request(link, {
     method: method
@@ -118,9 +85,9 @@ and I use TOTP token handle {stringInDoubleQuotes}",
       Assert.equal(response.statusCode, returnCode);
       return BluebirdPromise.resolve();
     });
-  }
+}
 
-  Then("the following endpoints reply with:", function (dataTable: Cucumber.TableDefinition) {
+Then("the following endpoints reply with:", function (dataTable: TableDefinition) {
   const promises = [];
   for (let i = 0; i < dataTable.rows().length; i++) {
     const url: string = (dataTable.hashes() as any)[i].url;
@@ -129,5 +96,4 @@ and I use TOTP token handle {stringInDoubleQuotes}",
     promises.push(endpointReplyWith(this, url, method, code));
   }
   return BluebirdPromise.all(promises);
-  });
 });

test/features/step_definitions/forward-headers.ts

@@ -1,11 +1,10 @@
-import Cucumber = require("cucumber");
+import {Then} from "cucumber";
 import seleniumWebdriver = require("selenium-webdriver");
 import CustomWorld = require("../support/world");
 import Util = require("util");
 import BluebirdPromise = require("bluebird");
 
-Cucumber.defineSupportCode(function ({ Given, When, Then }) {
+Then("I see header {string} set to {string}",
-  Then("I see header {stringInDoubleQuotes} set to {stringInDoubleQuotes}",
   { timeout: 5000 },
   function (expectedHeaderName: string, expectedValue: string) {
     return this.driver.findElement(seleniumWebdriver.By.tagName("body")).getText()
@@ -17,4 +16,3 @@ Cucumber.defineSupportCode(function ({ Given, When, Then }) {
           return BluebirdPromise.reject(new Error(Util.format("No such header or with unexpected value.")));
       });
   })
-});

test/features/step_definitions/hooks.ts

@@ -1,4 +1,4 @@
-import Cucumber = require("cucumber");
+import {setDefaultTimeout, After, Before} from "cucumber";
 import fs = require("fs");
 import BluebirdPromise = require("bluebird");
 import ChildProcess = require("child_process");
@@ -8,50 +8,52 @@ import { MongoConnector } from "../../../server/src/lib/connectors/mongo/MongoCo
 import { IMongoClient } from "../../../server/src/lib/connectors/mongo/IMongoClient";
 import { TotpHandler } from "../../../server/src/lib/authentication/totp/TotpHandler";
 import Speakeasy = require("speakeasy");
+import Request = require("request-promise");
 
-Cucumber.defineSupportCode(function ({ setDefaultTimeout }) {
+setDefaultTimeout(20 * 1000);
-  setDefaultTimeout(20 * 1000);
+
+const exec = BluebirdPromise.promisify<any, any>(ChildProcess.exec);
+
+Before(function () {
+  this.jar = Request.jar();
+})
+
+After(function () {
+  return this.driver.quit();
 });
 
-Cucumber.defineSupportCode(function ({ After, Before }) {
+function createRegulationConfiguration(): BluebirdPromise<void> {
-  const exec = BluebirdPromise.promisify<any, any>(ChildProcess.exec);
-
-  After(function () {
-    return this.driver.quit();
-  });
-
-  function createRegulationConfiguration(): BluebirdPromise<void> {
   return exec("\
   cat config.template.yml | \
   sed 's/find_time: [0-9]\\+/find_time: 15/' | \
   sed 's/ban_time: [0-9]\\+/ban_time: 4/' > config.test.yml \
   ");
-  }
+}
 
-  function createInactivityConfiguration(): BluebirdPromise<void> {
+function createInactivityConfiguration(): BluebirdPromise<void> {
   return exec("\
   cat config.template.yml | \
   sed 's/expiration: [0-9]\\+/expiration: 10000/' | \
   sed 's/inactivity: [0-9]\\+/inactivity: 5000/' > config.test.yml \
   ");
-  }
+}
 
-  function createSingleFactorConfiguration(): BluebirdPromise<void> {
+function createSingleFactorConfiguration(): BluebirdPromise<void> {
   return exec("\
   cat config.template.yml | \
   sed 's/default_method: two_factor/default_method: single_factor/' > config.test.yml \
   ");
-  }
+}
 
-  function createCustomTotpIssuerConfiguration(): BluebirdPromise<void> {
+function createCustomTotpIssuerConfiguration(): BluebirdPromise<void> {
   return exec("\
   cat config.template.yml > config.test.yml && \
   echo 'totp:' >> config.test.yml && \
   echo '  issuer: custom.com' >> config.test.yml \
   ");
-  }
+}
 
-  function declareNeedsConfiguration(tag: string, cb: () => BluebirdPromise<void>) {
+function declareNeedsConfiguration(tag: string, cb: () => BluebirdPromise<void>) {
   Before({ tags: "@needs-" + tag + "-config", timeout: 20 * 1000 }, function () {
     return cb()
       .then(function () {
@@ -67,17 +69,17 @@ Cucumber.defineSupportCode(function ({ After, Before }) {
         return exec("./scripts/example-commit/dc-example.sh up -d authelia && sleep 1");
       });
   });
-  }
+}
 
-  declareNeedsConfiguration("regulation", createRegulationConfiguration);
+declareNeedsConfiguration("regulation", createRegulationConfiguration);
-  declareNeedsConfiguration("inactivity", createInactivityConfiguration);
+declareNeedsConfiguration("inactivity", createInactivityConfiguration);
-  declareNeedsConfiguration("single_factor", createSingleFactorConfiguration);
+declareNeedsConfiguration("single_factor", createSingleFactorConfiguration);
-  declareNeedsConfiguration("totp_issuer", createCustomTotpIssuerConfiguration);
+declareNeedsConfiguration("totp_issuer", createCustomTotpIssuerConfiguration);
 
-  function registerUser(context: any, username: string) {
+function registerUser(context: any, username: string) {
   let secret: Speakeasy.Key;
-    const mongoConnector = new MongoConnector("mongodb://localhost:27017/authelia");
+  const mongoConnector = new MongoConnector("mongodb://localhost:27017");
-    return mongoConnector.connect()
+  return mongoConnector.connect("authelia")
     .then(function (mongoClient: IMongoClient) {
       const collectionFactory = CollectionFactoryFactory.createMongo(mongoClient);
       const userDataStore = new UserDataStore(collectionFactory);
@@ -88,20 +90,22 @@ Cucumber.defineSupportCode(function ({ After, Before }) {
     })
     .then(function () {
       context.totpSecrets["REGISTERED"] = secret.base32;
+      return mongoConnector.close();
     });
-  }
+}
 
-  function declareNeedRegisteredUserHooks(username: string) {
+function declareNeedRegisteredUserHooks(username: string) {
   Before({ tags: "@need-registered-user-" + username, timeout: 15 * 1000 }, function () {
     return registerUser(this, username);
   });
 
   After({ tags: "@need-registered-user-" + username, timeout: 15 * 1000 }, function () {
     this.totpSecrets["REGISTERED"] = undefined;
+    return BluebirdPromise.resolve();
   });
-  }
+}
 
-  function needAuthenticatedUser(context: any, username: string): BluebirdPromise<void> {
+function needAuthenticatedUser(context: any, username: string): BluebirdPromise<void> {
   return context.visit("https://login.example.com:8080/logout")
     .then(function () {
       return context.visit("https://login.example.com:8080/");
@@ -118,23 +122,23 @@ Cucumber.defineSupportCode(function ({ After, Before }) {
     .then(function () {
       return context.clickOnButton("Sign in");
     });
-  }
+}
 
-  function declareNeedAuthenticatedUserHooks(username: string) {
+function declareNeedAuthenticatedUserHooks(username: string) {
   Before({ tags: "@need-authenticated-user-" + username, timeout: 15 * 1000 }, function () {
     return needAuthenticatedUser(this, username);
   });
 
   After({ tags: "@need-authenticated-user-" + username, timeout: 15 * 1000 }, function () {
     this.totpSecrets["REGISTERED"] = undefined;
+    return BluebirdPromise.resolve();
   });
-  }
+}
 
-  function declareHooksForUser(username: string) {
+function declareHooksForUser(username: string) {
   declareNeedRegisteredUserHooks(username);
   declareNeedAuthenticatedUserHooks(username);
-  }
+}
 
-  const users = ["harry", "john", "bob", "blackhat"];
+const users = ["harry", "john", "bob", "blackhat"];
-  users.forEach(declareHooksForUser);
+users.forEach(declareHooksForUser);
-});

test/features/step_definitions/notifications.ts

@@ -1,13 +1,11 @@
-import Cucumber = require("cucumber");
+import {Then} from "cucumber";
 import seleniumWebdriver = require("selenium-webdriver");
 import Assert = require("assert");
 import Fs = require("fs");
 import CustomWorld = require("../support/world");
 
-Cucumber.defineSupportCode(function ({ Given, When, Then }) {
+Then("I get a notification of type {string} with message {string}", { timeout: 10 * 1000 },
-  Then("I get a notification of type {stringInDoubleQuotes} with message {stringInDoubleQuotes}",
+function (notificationType: string, notificationMessage: string) {
-    { timeout: 10 * 1000 },
-    function (notificationType: string, notificationMessage: string) {
   const that = this;
   const notificationEl = this.driver.findElement(seleniumWebdriver.By.className("notification"));
   return this.driver.wait(seleniumWebdriver.until.elementIsVisible(notificationEl), 5000)
@@ -22,5 +20,4 @@ Cucumber.defineSupportCode(function ({ Given, When, Then }) {
       Assert(classes.indexOf(notificationType) > -1, "Class '" + notificationType + "' not found in notification element.");
       return that.driver.sleep(500);
     });
-    });
 });

test/features/step_definitions/redirection.ts

@@ -1,17 +1,15 @@
-import Cucumber = require("cucumber");
+import {Given, When, Then} from "cucumber";
 import seleniumWebdriver = require("selenium-webdriver");
 import Assert = require("assert");
 
-Cucumber.defineSupportCode(function ({ Given, When, Then }) {
+Given("I'm on {string}", function (link: string) {
-  Given("I'm on https://{string}", function (link: string) {
+  return this.driver.get(link);
-    return this.driver.get("https://" + link);
+});
-  });
+
-
+When("I click on the link to {string}", function (link: string) {
-  When("I click on the link to {string}", function (link: string) {
+  return this.driver.findElement(seleniumWebdriver.By.linkText(link)).click();
-    return this.driver.findElement(seleniumWebdriver.By.linkText(link)).click();
+});
-  });
+
-
+Then("I'm redirected to {string}", function (link: string) {
-  Then("I'm redirected to {stringInDoubleQuotes}", function (link: string) {
+  return this.waitUntilUrlContains(link);
-    return this.waitUntilUrlContains(link);
-  });
 });

test/features/step_definitions/registration.ts

@@ -1,10 +1,9 @@
-import Cucumber = require("cucumber");
+import {When} from "cucumber";
 import seleniumWebdriver = require("selenium-webdriver");
 import Assert = require("assert");
 
-Cucumber.defineSupportCode(function ({ Given, When, Then }) {
+When("the otpauth url has label {string} and issuer \
-  When("the otpauth url has label {stringInDoubleQuotes} and issuer \
+{string}", function (label: string, issuer: string) {
-{stringInDoubleQuotes}", function (label: string, issuer: string) {
     return this.driver.findElement(seleniumWebdriver.By.id("qrcode"))
       .getAttribute("title")
       .then(function (title: string) {
@@ -12,4 +11,3 @@ Cucumber.defineSupportCode(function ({ Given, When, Then }) {
         Assert(new RegExp(re).test(title));
       })
   });
-});

test/features/step_definitions/regulation.ts

@@ -1,11 +1,9 @@
-import Cucumber = require("cucumber");
+import {When} from "cucumber";
 import seleniumWebdriver = require("selenium-webdriver");
 import Assert = require("assert");
 import Fs = require("fs");
 import CustomWorld = require("../support/world");
 
-Cucumber.defineSupportCode(function ({ Given, When, Then }) {
+When("I wait {int} seconds", { timeout: 10 * 1000 }, function (seconds: number) {
-  When("I wait {number} seconds", { timeout: 10 * 1000 }, function (seconds: number) {
   return this.driver.sleep(seconds * 1000);
-  });
 });

test/features/step_definitions/reset-password.ts

@@ -1,18 +1,16 @@
-import Cucumber = require("cucumber");
+import {When} from "cucumber";
 import seleniumWebdriver = require("selenium-webdriver");
 import Assert = require("assert");
 import Fs = require("fs");
 
-Cucumber.defineSupportCode(function ({ Given, When, Then }) {
+When("I click on the link {string}", function (text: string) {
-  When("I click on the link {stringInDoubleQuotes}", function (text: string) {
   return this.driver.findElement(seleniumWebdriver.By.linkText(text)).click();
-  });
+});
 
-  When("I click on the link of the email", function () {
+When("I click on the link of the email", function () {
   const that = this;
   return this.retrieveLatestMail()
     .then(function (link: string) {
       return that.driver.get(link);
     });
-  });
 });

test/features/step_definitions/resilience.ts

@@ -1,12 +1,10 @@
-import Cucumber = require("cucumber");
+import {When} from "cucumber";
 import seleniumWebdriver = require("selenium-webdriver");
 import Assert = require("assert");
 import ChildProcess = require("child_process");
 import BluebirdPromise = require("bluebird");
 
-Cucumber.defineSupportCode(function ({ Given, When, Then }) {
+When(/^the application restarts$/, {timeout: 15 * 1000}, function () {
-  When(/^the application restarts$/, {timeout: 15 * 1000}, function () {
   const exec = BluebirdPromise.promisify(ChildProcess.exec);
   return exec("./scripts/example-commit/dc-example.sh restart authelia && sleep 1");
-  });
 });

test/features/step_definitions/restrictions.ts

@@ -1,25 +1,23 @@
-import Cucumber = require("cucumber");
+import {Before, When, Then, TableDefinition} from "cucumber";
 import seleniumWebdriver = require("selenium-webdriver");
 import Assert = require("assert");
 import Request = require("request-promise");
 import Bluebird = require("bluebird");
 
-Cucumber.defineSupportCode(function ({ Given, When, Then, Before, After }) {
+Before(function () {
-  Before(function () {
   this.jar = Request.jar();
-  })
+});
 
-  Then("I get an error {number}", function (code: number) {
+Then("I get an error {int}", function (code: number) {
   return this.getErrorPage(code);
-  });
+});
 
-  When("I request {stringInDoubleQuotes} with method {stringInDoubleQuotes}",
+When("I request {string} with method {string}",
   function (url: string, method: string) {
     const that = this;
+  });
 
-    })
+function requestAndExpectStatusCode(ctx: any, url: string, method: string,
-
-  function requestAndExpectStatusCode(ctx: any, url: string, method: string,
   expectedStatusCode: number) {
   return Request(url, {
     method: method,
@@ -41,10 +39,10 @@ Cucumber.defineSupportCode(function ({ Given, When, Then, Before, After }) {
         throw e;
       }
     })
-  }
+}
 
-  Then("I get the following status code when requesting:",
+Then("I get the following status code when requesting:",
-    function (dataTable: Cucumber.TableDefinition) {
+  function (dataTable: TableDefinition) {
     const promises: Bluebird<void>[] = [];
     for (let i = 0; i < dataTable.rows().length; i++) {
       const url: string = (dataTable.hashes() as any)[i].url;
@@ -55,8 +53,8 @@ Cucumber.defineSupportCode(function ({ Given, When, Then, Before, After }) {
     return Bluebird.all(promises);
   })
 
-  When("I post {stringInDoubleQuotes} with body:", function (url: string,
+When("I post {string} with body:", function (url: string,
-    dataTable: Cucumber.TableDefinition) {
+  dataTable: TableDefinition) {
   const body = {};
   for (let i = 0; i < dataTable.rows().length; i++) {
     const key = (dataTable.hashes() as any)[i].key;
@@ -68,5 +66,4 @@ Cucumber.defineSupportCode(function ({ Given, When, Then, Before, After }) {
     jar: this.jar,
     json: true
   });
-  })
 });

test/features/step_definitions/session-timeout.ts

@@ -1,8 +1,6 @@
-import Cucumber = require("cucumber");
+import {When} from "cucumber";
 import seleniumWebdriver = require("selenium-webdriver");
 
-Cucumber.defineSupportCode(function ({ Given, When, Then }) {
+When("I sleep for {int} seconds", function (seconds: number) {
-  When("I sleep for {number} seconds", function (seconds: number) {
   return this.driver.sleep(seconds * 1000);
-  });
 });

test/features/step_definitions/single-factor.ts

@@ -1,12 +1,11 @@
-import Cucumber = require("cucumber");
+import {When, Then} from "cucumber";
 import seleniumWebdriver = require("selenium-webdriver");
 import Request = require("request-promise");
 import BluebirdPromise = require("bluebird");
 import Util = require("util");
 
-Cucumber.defineSupportCode(function ({ Given, When, Then }) {
+When("I request {string} with username {string}" +
-  When("I request {stringInDoubleQuotes} with username {stringInDoubleQuotes}" +
+  " and password {string} using basic authentication",
-    " and password {stringInDoubleQuotes} using basic authentication",
   function (url: string, username: string, password: string) {
     const that = this;
     return Request(url, {
@@ -21,13 +20,13 @@ Cucumber.defineSupportCode(function ({ Given, When, Then }) {
       });
   });
 
-  Then("I receive the secret page", function () {
+Then("I receive the secret page", function () {
   if (this.response.body.match("This is a very important secret!"))
     return BluebirdPromise.resolve();
   return BluebirdPromise.reject(new Error("Secret page not received."));
-  });
+});
 
-  Then("I received header {stringInDoubleQuotes} set to {stringInDoubleQuotes}",
+Then("I received header {string} set to {string}",
   function (expectedHeaderName: string, expectedValue: string) {
     const expectedLine = Util.format("\"%s\": \"%s\"", expectedHeaderName,
       expectedValue);
@@ -35,5 +34,4 @@ Cucumber.defineSupportCode(function ({ Given, When, Then }) {
       return BluebirdPromise.resolve();
     return BluebirdPromise.reject(new Error(
       Util.format("No such header or with unexpected value.")));
-    })
+  });
-});

test/features/support/world.ts

@@ -1,6 +1,6 @@
 require("chromedriver");
 import seleniumWebdriver = require("selenium-webdriver");
-import Cucumber = require("cucumber");
+import {setWorldConstructor, After} from "cucumber";
 import Fs = require("fs");
 import Speakeasy = require("speakeasy");
 import Assert = require("assert");
@@ -63,7 +63,7 @@ function CustomWorld() {
   this.waitUntilUrlContains = function (url: string) {
     const that = this;
     return this.driver.wait(seleniumWebdriver.until.urlIs(url), 15000)
-      .then(function () { }, function (err: Error) {
+      .then(function () {return BluebirdPromise.resolve(); }, function (err: Error) {
         that.driver.getCurrentUrl()
           .then(function (current: string) {
             console.error("====> Error due to: %s (current) != %s (expected)", current, url);
@@ -176,6 +176,4 @@ function CustomWorld() {
   };
 }
 
-Cucumber.defineSupportCode(function ({ setWorldConstructor }) {
+setWorldConstructor(CustomWorld);
-  setWorldConstructor(CustomWorld);
-});