Implemented requested change PR #2

Moved tests/e2e_new to tests/e2e folder
This commit is contained in:
Bas van Wetten
2017-07-24 22:08:12 +02:00
parent 318c8c68b0
commit 203e1cc9b9
29 changed files with 450 additions and 1260 deletions

View File

@@ -1,24 +1,31 @@
const globalSetup = require("./global-setup");
const app = globalSetup.app;
const helpers = require("./global-setup");
const path = require("path");
const request = require("request");
const chai = require("chai");
const expect = chai.expect;
const expect = require("chai").expect;
const describe = global.describe;
const it = global.it;
const beforeEach = global.beforeEach;
const afterEach = global.afterEach;
describe("ipWhitelist directive configuration", function () {
helpers.setupTimeout(this);
this.timeout(20000);
var app = null;
beforeEach(function (done) {
app.start().then(function() { done(); } );
beforeEach(function () {
return helpers.startApplication({
args: ["js/electron.js"]
}).then(function (startedApp) { app = startedApp; })
});
afterEach(function (done) {
app.stop().then(function() { done(); });
afterEach(function () {
return helpers.stopApplication(app);
});
describe("Set ipWhitelist without access", function () {
before(function() {
before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/noIpWhiteList.js";
});
@@ -31,7 +38,7 @@ describe("ipWhitelist directive configuration", function () {
});
describe("Set ipWhitelist []", function () {
before(function() {
before(function () {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/empty_ipWhiteList.js";
});