From 947c2e556d81287e06521a53b0975e2ae61fa3ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?=
Date: Sun, 9 Apr 2017 15:32:15 -0300
Subject: [PATCH 1/2] Add test e2e showWeek feature in spanish language.
---
CHANGELOG.md | 1 +
.../modules/clock/es/clock_showWeek.js | 38 +++++++++++++++++++
tests/e2e/modules/clock_es_spec.js | 23 +++++++++++
3 files changed, 62 insertions(+)
create mode 100644 tests/configs/modules/clock/es/clock_showWeek.js
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22aa51ad..ba54034c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Add in option to wrap long calendar events to multiple lines using `wrapEvents` configuration option.
- Add test e2e `show title newsfeed` for newsfeed module.
- Add task to check configuration file.
+- Add test e2e showWeek feature in spanish language.
### Updated
- Added missing keys to Polish translation.
diff --git a/tests/configs/modules/clock/es/clock_showWeek.js b/tests/configs/modules/clock/es/clock_showWeek.js
new file mode 100644
index 00000000..29550f04
--- /dev/null
+++ b/tests/configs/modules/clock/es/clock_showWeek.js
@@ -0,0 +1,38 @@
+
+/* Magic Mirror
+ *
+ * Test config for default clock module
+ * Language es for showWeek feature
+ *
+ * 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: "es",
+ timeFormat: 12,
+ units: "metric",
+ electronOptions: {
+ webPreferences: {
+ nodeIntegration: true,
+ },
+ },
+
+ modules: [
+ {
+ module: "clock",
+ position: "middle_center",
+ config: {
+ showWeek: true
+ }
+ }
+ ]
+};
+
+/*************** DO NOT EDIT THE LINE BELOW ***************/
+if (typeof module !== "undefined") {module.exports = config;}
diff --git a/tests/e2e/modules/clock_es_spec.js b/tests/e2e/modules/clock_es_spec.js
index f90263cf..09fadc7a 100644
--- a/tests/e2e/modules/clock_es_spec.js
+++ b/tests/e2e/modules/clock_es_spec.js
@@ -78,4 +78,27 @@ describe("Clock set to spanish language module", function () {
.getText(".clock .time").should.eventually.match(timeRegex);
});
});
+
+
+ describe("with showWeek config enabled", function() {
+ before(function() {
+ // Set config sample for use in test
+ process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/es/clock_showWeek.js";
+ });
+
+ beforeEach(function (done) {
+ app.start().then(function() { done(); } );
+ });
+
+ afterEach(function (done) {
+ app.stop().then(function() { done(); });
+ });
+
+ it("shows week with correct format", function() {
+ const weekRegex = /^Semana [0-9]{1,2}$/;
+ return app.client.waitUntilWindowLoaded()
+ .getText(".clock .week").should.eventually.match(weekRegex);
+ });
+ });
+
});
From d34b493b7d84d7909e55a153cde0cde79eeb360c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?=
Date: Sat, 5 Aug 2017 22:30:38 -0400
Subject: [PATCH 2/2] Fix clock_es_spec running before the clock_spec
---
tests/e2e/modules/clock_es_spec.js | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/tests/e2e/modules/clock_es_spec.js b/tests/e2e/modules/clock_es_spec.js
index f959e09b..455f3bed 100644
--- a/tests/e2e/modules/clock_es_spec.js
+++ b/tests/e2e/modules/clock_es_spec.js
@@ -74,21 +74,12 @@ describe("Clock set to spanish language module", function() {
});
});
-
describe("with showWeek config enabled", function() {
before(function() {
// Set config sample for use in test
process.env.MM_CONFIG_FILE = "tests/configs/modules/clock/es/clock_showWeek.js";
});
- beforeEach(function (done) {
- app.start().then(function() { done(); } );
- });
-
- afterEach(function (done) {
- app.stop().then(function() { done(); });
- });
-
it("shows week with correct format", function() {
const weekRegex = /^Semana [0-9]{1,2}$/;
return app.client.waitUntilWindowLoaded()