From 412002906f9ced2fa1a73d99acb6e35c27d6c952 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Mon, 30 Jul 2018 12:12:36 +0200
Subject: [PATCH] Keep timestamp replacements at the beginning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
tests/ui-regression/helper.js | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tests/ui-regression/helper.js b/tests/ui-regression/helper.js
index 149c4059e99..1ec62728dc7 100644
--- a/tests/ui-regression/helper.js
+++ b/tests/ui-regression/helper.js
@@ -137,7 +137,14 @@ module.exports = {
this.pageCompare.goto(`${config.urlChange}${route}`, {waitUntil: options.waitUntil})
]);
}
-
+ await this.pageBase.$eval('body', function (e) {
+ $('.live-relative-timestamp').removeClass('live-relative-timestamp').text('5 minutes ago');
+ $(':focus').blur();
+ });
+ await this.pageCompare.$eval('body', function (e) {
+ $('.live-relative-timestamp').removeClass('live-relative-timestamp').text('5 minutes ago');
+ $(':focus').blur();
+ });
var failed = null;
try {
await this.pageBase.bringToFront();
@@ -147,6 +154,7 @@ module.exports = {
} catch (err) {
failed = err;
}
+ await this.awaitNetworkIdle(3);
await this.pageBase.$eval('body', function (e) {
$('.live-relative-timestamp').removeClass('live-relative-timestamp').text('5 minutes ago');
$(':focus').blur();
@@ -155,7 +163,6 @@ module.exports = {
$('.live-relative-timestamp').removeClass('live-relative-timestamp').text('5 minutes ago');
$(':focus').blur();
});
- await this.awaitNetworkIdle(3);
await Promise.all([
this.pageBase.screenshot({
path: `${this._outputDirectory}/${fileName}.base.png`,
--
GitLab