From 5d7cfc1c1087ee8faebbc171a8f775ce731dfe74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Sat, 25 Mar 2017 19:00:36 -0300 Subject: [PATCH 1/5] test for modules set in modules/default/defaultmodules.js --- .../unit/global_vars/defaults_modules_spec.js | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 tests/unit/global_vars/defaults_modules_spec.js diff --git a/tests/unit/global_vars/defaults_modules_spec.js b/tests/unit/global_vars/defaults_modules_spec.js new file mode 100644 index 00000000..f3ef7fcb --- /dev/null +++ b/tests/unit/global_vars/defaults_modules_spec.js @@ -0,0 +1,60 @@ +var fs = require("fs"); +var path = require("path"); +var chai = require("chai"); +var expect = chai.expect; +var vm = require("vm"); + +before(function() { + var basedir = path.join(__dirname, "../../.."); + + var fileName = "js/app.js"; + var filePath = path.join(basedir, fileName); + var code = fs.readFileSync(filePath); + + this.sandbox = { + module: {}, + __dirname: path.dirname(filePath), + global: {}, + console: { + log: function() { /*console.log("console.log(", arguments, ")");*/ } + }, + process: { + on: function() { /*console.log("process.on called with: ", arguments);*/ }, + env: {} + } + }; + + this.sandbox.require = function(filename) { + // This modifies the global slightly, + // but supplies vm with essential code + return require(filename); + }; + + vm.runInNewContext(code, this.sandbox, fileName); +}); + +after(function() { + //console.log(global); +}); + +describe("Default modules set in modules/default/defaultmodules.js", function() { + + var expectedDefaultModules = [ + "alert", + "calendar", + "clock", + "compliments", + "currentweather", + "helloworld", + "newsfeed", + "weatherforecast", + "updatenotification" + ]; + + expectedDefaultModules.forEach(defaultModule => { + it(`contains default module "${defaultModule}"`, function() { + expect(this.sandbox.defaultModules).to.include(defaultModule); + }); + }); + +}); From f2c3fc20deb72aa4a3baef7c55fada3cd897acf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Mon, 3 Apr 2017 15:50:25 -0300 Subject: [PATCH 2/5] ignore git file for vim and patch --- .gitignore | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitignore b/.gitignore index e130a22e..ecb483e8 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,13 @@ Temporary Items # Ignore changes to the custom css files. /css/custom.css + +# Vim +## swap +[._]*.s[a-w][a-z] +[._]s[a-w][a-z] + +## diff patch +*.orig +*.rej +*.bak From 31609a8abac6175bdbcaa1f2dc5bf9228993271c Mon Sep 17 00:00:00 2001 From: Michael Teeuw Date: Thu, 6 Apr 2017 16:34:16 +0200 Subject: [PATCH 3/5] Add missing dependency. --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index a190f12d..0d3d9509 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "time-grunt": "latest" }, "dependencies": { + "body-parser": "^1.17.1", "colors": "^1.1.2", "electron": "^1.4.7", "express": "^4.14.0", From 7e9c4848fb7100a26e52c36276c2b862db16301e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Thu, 13 Apr 2017 08:40:37 -0300 Subject: [PATCH 4/5] Sort dependencies in the file package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c3bdae63..8157fed8 100644 --- a/package.json +++ b/package.json @@ -40,8 +40,8 @@ "grunt-markdownlint": "^1.0.13", "grunt-stylelint": "latest", "grunt-yamllint": "latest", - "jshint": "^2.9.4", "http-auth": "^3.1.3", + "jshint": "^2.9.4", "mocha": "^3.2.0", "spectron": "^3.4.1", "stylelint-config-standard": "latest", From 93965fd98b91eb753f7da9baf101506a8b3254b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Thu, 13 Apr 2017 23:44:37 -0300 Subject: [PATCH 5/5] Add changelog test modules/default/defaultmodules.js --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ece1e37..f6685ea3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Add test e2e `show title newsfeed` for newsfeed module. - Add task to check configuration file. - Add test check URLs of vendors. +- Add test default modules present modules/default/defaultmodules.js. ### Updated - Added missing keys to Polish translation.