kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 12:12:20 +00:00
Code Issues Projects Releases Wiki Activity

Fix calendar test

Browse Source
This commit is contained in:
rejas 2021-05-02 14:43:12 +02:00 committed by veeck
parent 4c8508b0a9
commit bdfd6e5e9f
5 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/node_helper.js
View File

@ -126,6 +126,8 @@ NodeHelper.checkFetchError = function (error) {
let error_type = "MODULE_ERROR_UNSPECIFIED"; let error_type = "MODULE_ERROR_UNSPECIFIED";
if (error.code === "EAI_AGAIN") { if (error.code === "EAI_AGAIN") {
error_type = "MODULE_ERROR_NO_CONNECTION"; error_type = "MODULE_ERROR_NO_CONNECTION";
} else if (error.message === "Unauthorized") {
error_type = "MODULE_ERROR_UNAUTHORIZED";
} }
return error_type; return error_type;
}; };

3
modules/default/calendar/calendar.js
View File

@ -147,7 +147,8 @@ Module.register("calendar", {
} }
} }
} else if (notification === "CALENDAR_ERROR") { } else if (notification === "CALENDAR_ERROR") {
this.error = this.translate("MODULE_CONFIG_ERROR", { MODULE_NAME: this.name, ERROR: payload.error }); let error_message = this.translate(payload.error_type);
this.error = this.translate("MODULE_CONFIG_ERROR", { MODULE_NAME: this.name, ERROR: error_message });
this.loaded = true; this.loaded = true;
} }

1
modules/default/calendar/node_helper.js
View File

@ -58,6 +58,7 @@ module.exports = NodeHelper.create({
Log.error("Calendar Error. Could not fetch calendar: ", fetcher.url(), error); Log.error("Calendar Error. Could not fetch calendar: ", fetcher.url(), error);
let error_type = NodeHelper.checkFetchError(error); let error_type = NodeHelper.checkFetchError(error);
this.sendSocketNotification("CALENDAR_ERROR", { this.sendSocketNotification("CALENDAR_ERROR", {
id: identifier,
error_type error_type
}); });
}); });

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

@ -150,7 +150,7 @@ describe("Calendar module", function () {
}); });
it("should show Unauthorized error", function () { it("should show Unauthorized error", function () {
return app.client.waitUntilTextExists(".calendar", "Error in the calendar module. Unauthorized", 10000); return app.client.waitUntilTextExists(".calendar", "Error in the calendar module. Authorization failed", 10000);
}); });
}); });
}); });

1
translations/en.json
View File

@ -32,6 +32,7 @@
"MODULE_CONFIG_ERROR": "Error in the {MODULE_NAME} module. {ERROR}", "MODULE_CONFIG_ERROR": "Error in the {MODULE_NAME} module. {ERROR}",
"MODULE_ERROR_MALFORMED_URL": "Malformed url.", "MODULE_ERROR_MALFORMED_URL": "Malformed url.",
"MODULE_ERROR_NO_CONNECTION": "No internet connection.", "MODULE_ERROR_NO_CONNECTION": "No internet connection.",
"MODULE_ERROR_UNAUTHORIZED": "Authorization failed.",
"MODULE_ERROR_UNSPECIFIED": "Check logs for more details.", "MODULE_ERROR_UNSPECIFIED": "Check logs for more details.",
"UPDATE_NOTIFICATION": "MagicMirror² update available.", "UPDATE_NOTIFICATION": "MagicMirror² update available.",