Merge pull request #1703 from rejas/fix_eslint_errors_automatically

Fix tests

CHANGELOG.md

@@ -19,13 +19,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Add `broadcastPastEvents` config option for calendars to include events from the past `maximumNumberOfDays` in event broadcasts
 - Added feature to broadcast news feed items `NEWS_FEED` and updated news items `NEWS_FEED_UPDATED` in default [newsfeed](https://github.com/MichMich/MagicMirror/tree/develop/modules/default/newsfeed) module (when news is updated) with documented default and `config.js` options in [README.md](https://github.com/MichMich/MagicMirror/blob/develop/modules/default/newsfeed/README.md)
 - Added notifications to default `clock` module broadcasting `CLOCK_SECOND` and `CLOCK_MINUTE` for the respective time elapsed.
-
+- Added UK Met Office Datapoint feed as a provider in the default weather module.
-Added UK Met Office Datapoint feed as a provider in the default weather module.
 - added new provider class
 - added suncalc.js dependency to calculate sun times (not provided in UK Met Office feed)
 - added "tempUnits" and "windUnits" to allow, for example, temp in metric (i.e. celsius) and wind in imperial (i.e. mph). These will override "units" if specified, otherwise the "units" value will be used.
 - use Feels Like temp from feed if present
 - optionally display probability of precipitation (PoP) in current weather (UK Met Office data)
+- automatically try to fix eslint errors by passing `--fix` option to it
 
 ### Updated
 - English translation for "Feels" to "Feels like"

Gruntfile.js

@@ -4,6 +4,7 @@ module.exports = function(grunt) {
 		pkg: grunt.file.readJSON("package.json"),
 		eslint: {
 			options: {
+				fix: "true",
 				configFile: ".eslintrc.json"
 			},
 			target: [

modules/default/calendar/calendar.js

@@ -135,7 +135,7 @@ Module.register("calendar", {
 			}
 		} else if (notification === "FETCH_ERROR") {
 			Log.error("Calendar Error. Could not fetch calendar: " + payload.url);
-			this.loaded = true
+			this.loaded = true;
 		} else if (notification === "INCORRECT_URL") {
 			Log.error("Calendar Error. Incorrect url: " + payload.url);
 		} else {

modules/default/calendar/calendarfetcher.js

@@ -171,8 +171,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 					var geo = event.geo || false;
 					var description = event.description || false;
 
-
+					if (typeof event.rrule !== "undefined" && event.rrule !== null && !isFacebookBirthday) {
-					if (typeof event.rrule !== 'undefined' && event.rrule !== null && !isFacebookBirthday) {
 						var rule = event.rrule;
 						var addedEvents = 0;
 
@@ -210,7 +209,6 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 							}
 						}
 
-
 						// Loop through the set of date entries to see which recurrences should be added to our event list.
 						for (var d in dates) {
 							var date = dates[d];
@@ -246,7 +244,7 @@ var CalendarFetcher = function(url, reloadInterval, excludedEvents, maximumEntri
 
 							endDate  = moment(parseInt(startDate.format("x")) + duration, "x");
 							if (startDate.format("x") == endDate.format("x")) {
-								endDate = endDate.endOf("day")
+								endDate = endDate.endOf("day");
 							}
 
 							var recurrenceTitle = getTitleFromEvent(curEvent);

modules/default/calendar/node_helper.js

@@ -60,7 +60,7 @@ module.exports = NodeHelper.create({
 			});
 
 			fetcher.onError(function(fetcher, error) {
-				console.error("Calendar Error. Could not fetch calendar: ", fetcher.url(), error)
+				console.error("Calendar Error. Could not fetch calendar: ", fetcher.url(), error);
 				self.sendSocketNotification("FETCH_ERROR", {
 					url: fetcher.url(),
 					error: error

modules/default/newsfeed/newsfeed.js

@@ -273,13 +273,13 @@ Module.register("newsfeed",{
 		newsItems.forEach(value => {
 			if (this.newsItems.findIndex(value1 => value1 === value) === -1) {
 				// Add item to updated items list
-				updatedItems.push(value)
+				updatedItems.push(value);
 			}
 		});
 
 		// check if updated items exist, if so and if we should broadcast these updates, then lets do so
 		if (this.config.broadcastNewsUpdates && updatedItems.length > 0) {
-			this.sendNotification("NEWS_FEED_UPDATE", {items: updatedItems})
+			this.sendNotification("NEWS_FEED_UPDATE", {items: updatedItems});
 		}
 
 		this.newsItems = newsItems;

modules/default/weather/weather.js

@@ -211,7 +211,7 @@ Module.register("weather",{
 					value = "";
 				} else {
 				    if (this.config.weatherProvider === "ukmetoffice") {
-						value += "%"
+						value += "%";
 				    } else {
 						value = `${value.toFixed(2)} ${this.config.units === "imperial" ? "in" : "mm"}`;
 				    }

modules/default/weather/weatherobject.js

@@ -88,7 +88,7 @@ class WeatherObject {
 
 	feelsLike() {
 	  if (this.feelsLikeTemp) {
-		  return this.feelsLikeTemp
+		  return this.feelsLikeTemp;
 		}
 		const windInMph = (this.windUnits === "imperial") ? this.windSpeed : this.windSpeed * 2.23694;
 		const tempInF = this.tempUnits === "imperial" ? this.temperature : this.temperature * 9 / 5 + 32;