kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-25 23:55:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into feature/automated-weather-tests

Browse Source 
# Conflicts:
#	modules/default/weather/weather.js
#	package-lock.json
#	package.json
This commit is contained in:
fewieden
2019-09-11 13:07:31 +02:00
parent 230accd31e a77128d5f7
commit ec6d9e3521
121 changed files with 6959 additions and 4195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/e2e/modules/calendar_spec.js
View File

@@ -1,10 +1,6 @@
const helpers = require("../global-setup");
const path = require("path");
const request = require("request");
const serverBasicAuth = require("../../servers/basic-auth.js");
const expect = require("chai").expect;
const describe = global.describe;
const it = global.it;
const beforeEach = global.beforeEach;
@@ -72,7 +68,7 @@ describe("Calendar module", function() {
});
});
describe("Basic auth backward compatibilty configuration: DEPRECATED", function() {
describe("Basic auth backward compatibility configuration: DEPRECATED", function() {
before(function() {
serverBasicAuth.listen(8012);
// Set config sample for use in test

5
tests/e2e/modules/clock_es_spec.js
View File

@@ -1,8 +1,4 @@
const helpers = require("../global-setup");
const path = require("path");
const request = require("request");
const expect = require("chai").expect;
const describe = global.describe;
const it = global.it;
@@ -86,5 +82,4 @@ describe("Clock set to spanish language module", function() {
.getText(".clock .week").should.eventually.match(weekRegex);
});
});
});

4
tests/e2e/modules/clock_spec.js
View File

@@ -1,8 +1,4 @@
const helpers = require("../global-setup");
const path = require("path");
const request = require("request");
const expect = require("chai").expect;
const describe = global.describe;
const it = global.it;

3
tests/e2e/modules/compliments_spec.js
View File

@@ -1,7 +1,4 @@
const helpers = require("../global-setup");
const path = require("path");
const request = require("request");
const expect = require("chai").expect;
const describe = global.describe;

6
tests/e2e/modules/helloworld_spec.js
View File

@@ -1,8 +1,4 @@
const helpers = require("../global-setup");
const path = require("path");
const request = require("request");
const expect = require("chai").expect;
const describe = global.describe;
const it = global.it;
@@ -24,7 +20,6 @@ describe("Test helloworld module", function() {
});
});
afterEach(function() {
return helpers.stopApplication(app);
});
@@ -52,5 +47,4 @@ describe("Test helloworld module", function() {
.getText(".helloworld").should.eventually.equal("Hello World!");
});
});
});

4
tests/e2e/modules/newsfeed_spec.js
View File

@@ -1,8 +1,4 @@
const helpers = require("../global-setup");
const path = require("path");
const request = require("request");
const expect = require("chai").expect;
const describe = global.describe;
const it = global.it;