From a74efd285c92b0657a4b46c80ea6fd6eb5d0e596 Mon Sep 17 00:00:00 2001 From: fewieden Date: Mon, 3 Apr 2017 10:37:23 +0200 Subject: [PATCH 1/2] fix typo + eslint --- Gruntfile.js | 30 ++++++++++++++++------- modules/node_modules/node_helper/index.js | 11 +++++---- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 06fed2d5..4951f5c7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -6,12 +6,12 @@ module.exports = function(grunt) { options: { configFile: ".eslintrc.json" }, - target: ["js/*.js", "modules/default/*.js", "modules/default/*/*.js", + target: [ + "js/*.js", "modules/default/*.js", "modules/default/*/*.js", "serveronly/*.js", "*.js", "tests/*/*.js", "!modules/default/alert/notificationFx.js", "!modules/default/alert/modernizr.custom.js", "!modules/default/alert/classie.js", - "config/*", - "translations/translations.js", "vendor/vendor.js" - + "config/*", "translations/translations.js", "vendor/vendor.js", + "modules/node_modules/node_helper/index.js" ] }, stylelint: { @@ -19,14 +19,21 @@ module.exports = function(grunt) { options: { configFile: ".stylelintrc" }, - src: ["css/main.css", "modules/default/calendar/calendar.css", "modules/default/clock/clock_styles.css", "modules/default/currentweather/currentweather.css", "modules/default/weatherforcast/weatherforcast.css"] + src: [ + "css/main.css", "modules/default/calendar/calendar.css", + "modules/default/clock/clock_styles.css", + "modules/default/currentweather/currentweather.css", + "modules/default/weatherforcast/weatherforcast.css" + ] } }, jsonlint: { main: { - src: ["package.json", ".eslintrc.json", ".stylelintrc", "translations/*.json", + src: [ + "package.json", ".eslintrc.json", ".stylelintrc", "translations/*.json", "modules/default/*/translations/*.json", "installers/pm2_MagicMirror.json", - "vendor/package.js"], + "vendor/package.js" + ], options: { reporter: "jshint" } @@ -58,11 +65,16 @@ module.exports = function(grunt) { "MD038": false } }, - src: ["README.md", "CHANGELOG.md", "LICENSE.md", "modules/README.md", "modules/default/**/*.md", "!modules/default/calendar/vendor/ical.js/readme.md"] + src: [ + "README.md", "CHANGELOG.md", "LICENSE.md", "modules/README.md", + "modules/default/**/*.md", "!modules/default/calendar/vendor/ical.js/readme.md" + ] } }, yamllint: { - all: [".travis.yml"] + all: [ + ".travis.yml" + ] } }); grunt.loadNpmTasks("grunt-eslint"); diff --git a/modules/node_modules/node_helper/index.js b/modules/node_modules/node_helper/index.js index 8d0372bd..37c3e2cb 100644 --- a/modules/node_modules/node_helper/index.js +++ b/modules/node_modules/node_helper/index.js @@ -20,7 +20,7 @@ NodeHelper = Class.extend({ }, start: function() { - console.log("Staring module helper: " + this.name); + console.log("Starting module helper: " + this.name); }, /* socketNotificationReceived(notification, payload) @@ -45,7 +45,7 @@ NodeHelper = Class.extend({ /* setPath(path) * Set the module path. * - * argument name string - Module name. + * argument path string - Module path. */ setPath: function(path) { this.path = path; @@ -98,9 +98,10 @@ NodeHelper = Class.extend({ // register catch all. socket.on("*", function(notification, payload) { - if (notification !== "*") - //console.log('received message in namespace: ' + namespace); - self.socketNotificationReceived(notification, payload); + if (notification !== "*") { + //console.log('received message in namespace: ' + namespace); + self.socketNotificationReceived(notification, payload); + } }); }); From 636dbe5b95110cc2f9c86e3262915b2984fbeb1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Mon, 3 Apr 2017 11:47:22 -0300 Subject: [PATCH 2/2] Globing pattern test grunt (#1) * Fix Matching patterns tests directories Grunt task of eslint * Fix eslint errors in testsuite. * Format one line per file in src section in Gruntfile.js --- Gruntfile.js | 35 ++++++++++++++----- .../compliments/compliments_parts_day.js | 2 +- tests/configs/modules/positions.js | 4 +-- tests/unit/global_vars/root_path_spec.js | 4 +-- 4 files changed, 31 insertions(+), 14 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 4951f5c7..8d069c82 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -7,10 +7,18 @@ module.exports = function(grunt) { configFile: ".eslintrc.json" }, target: [ - "js/*.js", "modules/default/*.js", "modules/default/*/*.js", - "serveronly/*.js", "*.js", "tests/*/*.js", "!modules/default/alert/notificationFx.js", - "!modules/default/alert/modernizr.custom.js", "!modules/default/alert/classie.js", - "config/*", "translations/translations.js", "vendor/vendor.js", + "js/*.js", + "modules/default/*.js", + "modules/default/*/*.js", + "serveronly/*.js", + "*.js", + "tests/**/*.js", + "!modules/default/alert/notificationFx.js", + "!modules/default/alert/modernizr.custom.js", + "!modules/default/alert/classie.js", + "config/*", + "translations/translations.js", + "vendor/vendor.js", "modules/node_modules/node_helper/index.js" ] }, @@ -20,7 +28,8 @@ module.exports = function(grunt) { configFile: ".stylelintrc" }, src: [ - "css/main.css", "modules/default/calendar/calendar.css", + "css/main.css", + "modules/default/calendar/calendar.css", "modules/default/clock/clock_styles.css", "modules/default/currentweather/currentweather.css", "modules/default/weatherforcast/weatherforcast.css" @@ -30,8 +39,12 @@ module.exports = function(grunt) { jsonlint: { main: { src: [ - "package.json", ".eslintrc.json", ".stylelintrc", "translations/*.json", - "modules/default/*/translations/*.json", "installers/pm2_MagicMirror.json", + "package.json", + ".eslintrc.json", + ".stylelintrc", + "translations/*.json", + "modules/default/*/translations/*.json", + "installers/pm2_MagicMirror.json", "vendor/package.js" ], options: { @@ -66,8 +79,12 @@ module.exports = function(grunt) { } }, src: [ - "README.md", "CHANGELOG.md", "LICENSE.md", "modules/README.md", - "modules/default/**/*.md", "!modules/default/calendar/vendor/ical.js/readme.md" + "README.md", + "CHANGELOG.md", + "LICENSE.md", + "modules/README.md", + "modules/default/**/*.md", + "!modules/default/calendar/vendor/ical.js/readme.md" ] } }, diff --git a/tests/configs/modules/compliments/compliments_parts_day.js b/tests/configs/modules/compliments/compliments_parts_day.js index 8d47fe22..b4443567 100644 --- a/tests/configs/modules/compliments/compliments_parts_day.js +++ b/tests/configs/modules/compliments/compliments_parts_day.js @@ -1,4 +1,4 @@ -/* Magic Mirror Test config for default compliments +/* Magic Mirror Test config for default compliments * * By Rodrigo Ramírez Norambuena https://rodrigoramirez.com * MIT Licensed. diff --git a/tests/configs/modules/positions.js b/tests/configs/modules/positions.js index 7d0188c2..60e6dd04 100644 --- a/tests/configs/modules/positions.js +++ b/tests/configs/modules/positions.js @@ -24,8 +24,8 @@ var config = { // Using exotic content. This is why dont accept go to JSON configuration file (function() { var positions = ["top_bar", "top_left", "top_center", "top_right", "upper_third", - "middle_center", "lower_third", "bottom_left", "bottom_center", "bottom_right", - "bottom_bar", "fullscreen_above", "fullscreen_below"]; + "middle_center", "lower_third", "bottom_left", "bottom_center", "bottom_right", + "bottom_bar", "fullscreen_above", "fullscreen_below"]; var modules = Array(); for (idx in positions) { modules.push({ diff --git a/tests/unit/global_vars/root_path_spec.js b/tests/unit/global_vars/root_path_spec.js index 197ee6a7..ef7ce3e9 100644 --- a/tests/unit/global_vars/root_path_spec.js +++ b/tests/unit/global_vars/root_path_spec.js @@ -63,8 +63,8 @@ describe("'global.root_path' set in js/app.js", function() { }); it("should expect the global.version equals package.json file", function() { - version_package = JSON.parse(fs.readFileSync("package.json", "utf8")).version; - expect(this.sandbox.global.version).to.equal(version_package); + versionPackage = JSON.parse(fs.readFileSync("package.json", "utf8")).version; + expect(this.sandbox.global.version).to.equal(versionPackage); }); });