From 1e9b35d18f65a63ab85cc01d20ee6551f3fe2ad3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Thu, 26 Jan 2017 21:13:58 -0300 Subject: [PATCH 01/12] Fix bug validation when is not set MM_CONFIG_FILE enviroment variable --- js/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/app.js b/js/app.js index 9f992b29..6466fe3f 100644 --- a/js/app.js +++ b/js/app.js @@ -49,7 +49,7 @@ var App = function() { // For this check proposed to TestSuite // https://forum.magicmirror.builders/topic/1456/test-suite-for-magicmirror/8 var configFilename = path.resolve(global.root_path + "/config/config.js"); - if (typeof(global.configuration_file) === "undefined" ) { + if (typeof(global.configuration_file) !== "undefined") { configFilename = path.resolve(global.configuration_file); } From de69fe17457b6790014ea4af255e96f716d7155e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Fri, 27 Jan 2017 13:42:20 -0300 Subject: [PATCH 02/12] Show splash screen image on reboot and halt. --- CHANGELOG.md | 1 + splashscreen/MagicMirror.script | 17 +++++++++++------ splashscreen/splash_halt.png | Bin 0 -> 22304 bytes 3 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 splashscreen/splash_halt.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 706299cd..6a3d7332 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Replace HTML tables with markdown tables in README files. - Added `DAYAFTERTOMORROW`, `UPDATE_NOTIFICATION` and `UPDATE_NOTIFICATION_MODULE` to Finnish translations. - Run `npm test` on Travis automatically +- Show the splash screen image even when is reboot or halted. ### Added - Add loaded function to modules, providing an async callback. diff --git a/splashscreen/MagicMirror.script b/splashscreen/MagicMirror.script index 9b614389..6e2f5643 100644 --- a/splashscreen/MagicMirror.script +++ b/splashscreen/MagicMirror.script @@ -1,7 +1,15 @@ screen_width = Window.GetWidth(); screen_height = Window.GetHeight(); -theme_image = Image("splash.png"); +if (Plymouth.GetMode() != "shutdown") +{ + theme_image = Image("splash.png"); +} +else +{ + theme_image = Image("splash_halt.png"); +} + image_width = theme_image.GetWidth(); image_height = theme_image.GetHeight(); @@ -30,11 +38,8 @@ else image_y = (screen_height - image_height) / 2; } -if (Plymouth.GetMode() != "shutdown") -{ - sprite = Sprite (resized_image); - sprite.SetPosition (image_x, image_y, -100); -} +sprite = Sprite (resized_image); +sprite.SetPosition (image_x, image_y, -100); message_sprite = Sprite(); message_sprite.SetPosition(screen_width * 0.1, screen_height * 0.9, 10000); diff --git a/splashscreen/splash_halt.png b/splashscreen/splash_halt.png new file mode 100644 index 0000000000000000000000000000000000000000..dcf9d8be0de9cc11079c61ef6e57c5d52f9cab15 GIT binary patch literal 22304 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%0A(dduSt; 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 cwGPx# literal 0 HcmV?d00001 From d3c0b9a4385ca7542837df002e8ff7e27fea7726 Mon Sep 17 00:00:00 2001 From: Joseph Bethge Date: Sat, 28 Jan 2017 12:26:52 +0100 Subject: [PATCH 03/12] fix module hidden status --- CHANGELOG.md | 1 + js/main.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a3d7332..9f233c2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Fix an issue where the analog clock looked scrambled. ([#611](https://github.com/MichMich/MagicMirror/issues/611)) - If units is set to imperial, the showRainAmount option of weatherforecast will show the correct unit. - Module currentWeather: check if temperature received from api is defined. +- Fix an issue with module hidden status changing to `true` although lock string prevented showing it ## [2.1.0] - 2016-12-31 diff --git a/js/main.js b/js/main.js index 325a7efe..fde5564d 100644 --- a/js/main.js +++ b/js/main.js @@ -232,6 +232,8 @@ var MM = (function() { return; } + module.hidden = false; + // If forced show, clean current lockstrings. if (module.lockStrings.length !== 0 && options.force === true) { Log.log("Force show of module: " + module.name); @@ -504,7 +506,7 @@ var MM = (function() { * argument options object - Optional settings for the hide method. */ showModule: function(module, speed, callback, options) { - module.hidden = false; + // do not change module.hidden yet, only if we really show it later showModule(module, speed, callback, options); } }; From ebb2db17f35a83e0e20ba4a0607eea602af93691 Mon Sep 17 00:00:00 2001 From: snille Date: Sun, 29 Jan 2017 00:06:06 +0100 Subject: [PATCH 04/12] Fixed the Swedish translation. --- translations/sv.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/translations/sv.json b/translations/sv.json index 9643a07b..8db89752 100644 --- a/translations/sv.json +++ b/translations/sv.json @@ -5,6 +5,7 @@ /* CALENDAR */ "TODAY": "Idag", "TOMORROW": "Imorgon", + "DAYAFTERTOMORROW": "Iövermorgon", "RUNNING": "Slutar", "EMPTY": "Inga kommande händelser.", @@ -25,4 +26,9 @@ "WNW": "VNV", "NW": "NV", "NNW": "NNV" + + /* UPDATE INFO */ + "UPDATE_NOTIFICATION": "MagicMirror² uppdatering finns tillgänglig.", + "UPDATE_NOTIFICATION_MODULE": "Uppdatering finns tillgänglig av MODULE_NAME modulen.", + "UPDATE_INFO": "Denna installation ligger COMMIT_COUNT steg bakom BRANCH_NAME grenen." } From e738ee0812fb70fb7cb75c250ed6282a53d01201 Mon Sep 17 00:00:00 2001 From: Erik Pettersson Date: Sun, 29 Jan 2017 00:09:51 +0100 Subject: [PATCH 05/12] Added information about the sv.json update. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f233c2a..2aa0ec6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Added `DAYAFTERTOMORROW`, `UPDATE_NOTIFICATION` and `UPDATE_NOTIFICATION_MODULE` to Finnish translations. - Run `npm test` on Travis automatically - Show the splash screen image even when is reboot or halted. +- Added some missing translaton strings in the sv.json file. ### Added - Add loaded function to modules, providing an async callback. From bbdc43c750de3d6099b11198fb60fa266649cded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Sat, 28 Jan 2017 21:37:12 -0300 Subject: [PATCH 06/12] Use configuration file in index.html when is set MM_CONFIG_FILE --- index.html | 2 +- js/server.js | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 86a69a4a..606f5aac 100644 --- a/index.html +++ b/index.html @@ -33,7 +33,7 @@
- + diff --git a/js/server.js b/js/server.js index f1de2420..5c775f69 100644 --- a/js/server.js +++ b/js/server.js @@ -46,6 +46,12 @@ var Server = function(config, callback) { var html = fs.readFileSync(path.resolve(global.root_path + "/index.html"), {encoding: "utf8"}); html = html.replace("#VERSION#", global.version); + configFile = "config/config.js"; + if (typeof(global.configuration_file) !== "undefined") { + configFile = global.configuration_file; + } + html = html.replace("#CONFIG_FILE#", configFile); + res.send(html); }); From a0fa3a6063ef94b011a926ff083293d5f627a1f5 Mon Sep 17 00:00:00 2001 From: Jopyth Date: Mon, 30 Jan 2017 09:28:37 +0100 Subject: [PATCH 07/12] missing comma in sv.json translation --- translations/sv.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations/sv.json b/translations/sv.json index 8db89752..8a1440f0 100644 --- a/translations/sv.json +++ b/translations/sv.json @@ -25,7 +25,7 @@ "W": "V", "WNW": "VNV", "NW": "NV", - "NNW": "NNV" + "NNW": "NNV", /* UPDATE INFO */ "UPDATE_NOTIFICATION": "MagicMirror² uppdatering finns tillgänglig.", From 0d8d8f042692b249f046a1d488ca58782656373d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Sat, 28 Jan 2017 23:23:32 -0300 Subject: [PATCH 08/12] Add tests configs directory as express route. --- js/server.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/server.js b/js/server.js index 5c775f69..e7050021 100644 --- a/js/server.js +++ b/js/server.js @@ -37,6 +37,7 @@ var Server = function(config, callback) { app.use("/modules", express.static(path.resolve(global.root_path + "/modules"))); app.use("/vendor", express.static(path.resolve(global.root_path + "/vendor"))); app.use("/translations", express.static(path.resolve(global.root_path + "/translations"))); + app.use("/tests/confs", express.static(path.resolve(global.root_path + "/tests/confs"))); app.get("/version", function(req,res) { res.send(global.version); From 52b8dbcbb11d891c84c81df3c7d92c5f30331740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Sat, 28 Jan 2017 23:25:43 -0300 Subject: [PATCH 09/12] separate test type. Create directory for End-to-end testing. --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 9d94a012..927cd2bc 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "scripts": { "start": "sh run-start.sh", "postinstall": "sh installers/postinstall/postinstall.sh", - "test": "./node_modules/mocha/bin/mocha tests --recursive" + "test": "./node_modules/mocha/bin/mocha $(find tests -path '*js*' ! -ipath '*e2e*')", + "test:e2e": "./node_modules/mocha/bin/mocha tests/e2e --recursive" }, "repository": { "type": "git", From d474d518cae0882dffbb32638605a038d2a8c0ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Mon, 30 Jan 2017 12:24:49 -0300 Subject: [PATCH 10/12] test e2e module helloworld --- CHANGELOG.md | 1 + package.json | 1 + tests/confs/helloworld.js | 32 +++++++++++++++++++++++++ tests/e2e/modules/helloworld.js | 42 +++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 tests/confs/helloworld.js create mode 100644 tests/e2e/modules/helloworld.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 2aa0ec6b..9c6b1a48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Icelandic Translation. - Add use a script to prevent when is run by SSH session set DISPLAY enviroment. - Enable ability to set configuration file by the enviroment variable called MM_CONFIG_FILE. +- Add test e2e helloworld ### Fixed - Update .gitignore to not ignore default modules folder. diff --git a/package.json b/package.json index 927cd2bc..92202936 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "grunt-stylelint": "latest", "grunt-yamllint": "latest", "mocha": "^3.2.0", + "spectron": "^3.4.1", "stylelint-config-standard": "latest", "time-grunt": "latest" }, diff --git a/tests/confs/helloworld.js b/tests/confs/helloworld.js new file mode 100644 index 00000000..6b617cf2 --- /dev/null +++ b/tests/confs/helloworld.js @@ -0,0 +1,32 @@ +/* Magic Mirror Test config sample module hello world + * + * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com + * MIT Licensed. + */ + +var config = { + port: 8080, + ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], + + language: "en", + timeFormat: 24, + units: "metric", + electronOptions: { + webPreferences: { + nodeIntegration: true, + }, + }, + + modules: [ + { + module: "helloworld", + position: "bottom_bar", + config: { + text: "Test HelloWorld Module" + } + } + ] +}; + +/*************** DO NOT EDIT THE LINE BELOW ***************/ +if (typeof module !== "undefined") {module.exports = config;} diff --git a/tests/e2e/modules/helloworld.js b/tests/e2e/modules/helloworld.js new file mode 100644 index 00000000..960917c3 --- /dev/null +++ b/tests/e2e/modules/helloworld.js @@ -0,0 +1,42 @@ +const Application = require("spectron").Application; +const path = require('path'); +const chai = require('chai'); +const chaiAsPromised = require('chai-as-promised'); + +// Set config sample for use in test +process.env.MM_CONFIG_FILE = 'tests/confs/helloworld.js'; + +var electronPath = path.join(__dirname, '../../../', 'node_modules', '.bin', 'electron'); + +if (process.platform === 'win32') { + electronPath += '.cmd'; +} + +var appPath = path.join(__dirname, '../../../js/electron.js'); + +var app = new Application({ + path: electronPath, + args: [appPath] +}); + +global.before(function () { + chai.should(); + chai.use(chaiAsPromised); +}); + +describe('Test helloworld module', function () { + this.timeout(10000); + + beforeEach(function (done) { + app.start().then(function() { done(); } ); + }); + + afterEach(function (done) { + app.stop().then(function() { done(); }); + }); + + it('Test message helloworld module', function () { + return app.client.waitUntilWindowLoaded() + .getText('.helloworld').should.eventually.equal('Test HelloWorld Module'); + }); +}); From c75ee042a8cd58013cd7d739c85ddffee04144be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Mon, 30 Jan 2017 12:29:32 -0300 Subject: [PATCH 11/12] add e2e test enviroment --- CHANGELOG.md | 1 + tests/confs/env.js | 25 +++++++++++++++++++++++ tests/e2e/env.js | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 tests/confs/env.js create mode 100644 tests/e2e/env.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c6b1a48..17da5a9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add use a script to prevent when is run by SSH session set DISPLAY enviroment. - Enable ability to set configuration file by the enviroment variable called MM_CONFIG_FILE. - Add test e2e helloworld +- Add test e2e enviroment ### Fixed - Update .gitignore to not ignore default modules folder. diff --git a/tests/confs/env.js b/tests/confs/env.js new file mode 100644 index 00000000..252934d7 --- /dev/null +++ b/tests/confs/env.js @@ -0,0 +1,25 @@ +/* Magic Mirror Test config sample enviroment + * + * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com + * MIT Licensed. + */ + +var config = { + port: 8080, + ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], + + language: "en", + timeFormat: 24, + units: "metric", + electronOptions: { + webPreferences: { + nodeIntegration: true, + }, + }, + + modules: [ + ] +}; + +/*************** DO NOT EDIT THE LINE BELOW ***************/ +if (typeof module !== "undefined") {module.exports = config;} diff --git a/tests/e2e/env.js b/tests/e2e/env.js new file mode 100644 index 00000000..0046ddec --- /dev/null +++ b/tests/e2e/env.js @@ -0,0 +1,49 @@ +const Application = require("spectron").Application; +const path = require('path'); +const chai = require('chai'); +const chaiAsPromised = require('chai-as-promised'); + +// Set config sample for use in test +process.env.MM_CONFIG_FILE = 'tests/confs/env.js'; + +var electronPath = path.join(__dirname, '../../', 'node_modules', '.bin', 'electron'); + +if (process.platform === 'win32') { + electronPath += '.cmd'; +} + +var appPath = path.join(__dirname, '../../js/electron.js'); + +var app = new Application({ + path: electronPath, + args: [appPath] +}); + +global.before(function () { + chai.should(); + chai.use(chaiAsPromised); +}); + +describe('Test enviroment app electron', function () { + this.timeout(10000); + + beforeEach(function (done) { + app.start().then(function() { done(); } ); + }); + + afterEach(function (done) { + app.stop().then(function() { done(); }); + }); + + + it('open a window app and test if is open', function () { + return app.client.waitUntilWindowLoaded() + .getWindowCount().should.eventually.equal(1); + }); + + it('tests the title', function () { + return app.client.waitUntilWindowLoaded() + .getTitle().should.eventually.equal('Magic Mirror'); + }); + +}); From e2dc5ef4f2c14ac22ad69162a27206f71a119f4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Mon, 30 Jan 2017 12:42:04 -0300 Subject: [PATCH 12/12] fix eslint change single quote by double quote --- tests/e2e/env.js | 24 ++++++++++++------------ tests/e2e/modules/helloworld.js | 22 +++++++++++----------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tests/e2e/env.js b/tests/e2e/env.js index 0046ddec..41386499 100644 --- a/tests/e2e/env.js +++ b/tests/e2e/env.js @@ -1,18 +1,18 @@ const Application = require("spectron").Application; -const path = require('path'); -const chai = require('chai'); -const chaiAsPromised = require('chai-as-promised'); +const path = require("path"); +const chai = require("chai"); +const chaiAsPromised = require("chai-as-promised"); // Set config sample for use in test -process.env.MM_CONFIG_FILE = 'tests/confs/env.js'; +process.env.MM_CONFIG_FILE = "tests/confs/env.js"; -var electronPath = path.join(__dirname, '../../', 'node_modules', '.bin', 'electron'); +var electronPath = path.join(__dirname, "../../", "node_modules", ".bin", "electron"); -if (process.platform === 'win32') { - electronPath += '.cmd'; +if (process.platform === "win32") { + electronPath += ".cmd"; } -var appPath = path.join(__dirname, '../../js/electron.js'); +var appPath = path.join(__dirname, "../../js/electron.js"); var app = new Application({ path: electronPath, @@ -24,7 +24,7 @@ global.before(function () { chai.use(chaiAsPromised); }); -describe('Test enviroment app electron', function () { +describe("Test enviroment app electron", function () { this.timeout(10000); beforeEach(function (done) { @@ -36,14 +36,14 @@ describe('Test enviroment app electron', function () { }); - it('open a window app and test if is open', function () { + it("open a window app and test if is open", function () { return app.client.waitUntilWindowLoaded() .getWindowCount().should.eventually.equal(1); }); - it('tests the title', function () { + it("tests the title", function () { return app.client.waitUntilWindowLoaded() - .getTitle().should.eventually.equal('Magic Mirror'); + .getTitle().should.eventually.equal("Magic Mirror"); }); }); diff --git a/tests/e2e/modules/helloworld.js b/tests/e2e/modules/helloworld.js index 960917c3..ebf8a8d1 100644 --- a/tests/e2e/modules/helloworld.js +++ b/tests/e2e/modules/helloworld.js @@ -1,18 +1,18 @@ const Application = require("spectron").Application; -const path = require('path'); -const chai = require('chai'); -const chaiAsPromised = require('chai-as-promised'); +const path = require("path"); +const chai = require("chai"); +const chaiAsPromised = require("chai-as-promised"); // Set config sample for use in test -process.env.MM_CONFIG_FILE = 'tests/confs/helloworld.js'; +process.env.MM_CONFIG_FILE = "tests/confs/helloworld.js"; -var electronPath = path.join(__dirname, '../../../', 'node_modules', '.bin', 'electron'); +var electronPath = path.join(__dirname, "../../../", "node_modules", ".bin", "electron"); -if (process.platform === 'win32') { - electronPath += '.cmd'; +if (process.platform === "win32") { + electronPath += ".cmd"; } -var appPath = path.join(__dirname, '../../../js/electron.js'); +var appPath = path.join(__dirname, "../../../js/electron.js"); var app = new Application({ path: electronPath, @@ -24,7 +24,7 @@ global.before(function () { chai.use(chaiAsPromised); }); -describe('Test helloworld module', function () { +describe("Test helloworld module", function () { this.timeout(10000); beforeEach(function (done) { @@ -35,8 +35,8 @@ describe('Test helloworld module', function () { app.stop().then(function() { done(); }); }); - it('Test message helloworld module', function () { + it("Test message helloworld module", function () { return app.client.waitUntilWindowLoaded() - .getText('.helloworld').should.eventually.equal('Test HelloWorld Module'); + .getText(".helloworld").should.eventually.equal("Test HelloWorld Module"); }); });