From 5ef077840f5d0ce24e16404e7cbaf6d8fa25226f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Mon, 30 Jul 2018 00:07:16 +0200
Subject: [PATCH] Improve test duration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Reincrement network idle to 3 s

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 tests/ui-regression/config.js           |  1 -
 tests/ui-regression/helper.js           | 11 +----------
 tests/ui-regression/test/installSpec.js |  8 ++++----
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/tests/ui-regression/config.js b/tests/ui-regression/config.js
index bb0f20240b..c40efd722d 100644
--- a/tests/ui-regression/config.js
+++ b/tests/ui-regression/config.js
@@ -31,7 +31,6 @@ module.exports = {
 		{title: 'normal', w: 1024, h: 768},
 		{title: 'wide', w: 1920, h: 1080},
 		{title: 'qhd', w: 2560, h: 1440},
-		{title: 'uhd', w: 3840, h: 2160},
 	],
 
 	/**
diff --git a/tests/ui-regression/helper.js b/tests/ui-regression/helper.js
index fd9a074f15..149c4059e9 100644
--- a/tests/ui-regression/helper.js
+++ b/tests/ui-regression/helper.js
@@ -138,15 +138,6 @@ module.exports = {
 			]);
 		}
 
-		await this.pageBase.$eval('body', function (e) {
-			// force relative timestamp to fixed value, since it breaks screenshot diffing
-			$('.live-relative-timestamp').removeClass('live-relative-timestamp').text('5 minutes ago');
-		});
-		await this.pageCompare.$eval('body', function (e) {
-			// force relative timestamp to fixed value, since it breaks screenshot diffing
-			$('.live-relative-timestamp').removeClass('live-relative-timestamp').text('5 minutes ago');
-		});
-
 		var failed = null;
 		try {
 			await this.pageBase.bringToFront();
@@ -156,7 +147,6 @@ 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();
@@ -165,6 +155,7 @@ 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`,
diff --git a/tests/ui-regression/test/installSpec.js b/tests/ui-regression/test/installSpec.js
index d2107cdb61..ffb4854f1b 100644
--- a/tests/ui-regression/test/installSpec.js
+++ b/tests/ui-regression/test/installSpec.js
@@ -44,15 +44,15 @@ describe('install', function () {
 			// (test, route, prepare, action, options
 			return helper.takeAndCompare(this, undefined, async (page) => {
 				await page.click('#showAdvanced');
-				await helper.delay(500);
-			});
+				await helper.delay(300);
+			}, { waitUntil: 'networkidle0', viewport: resolution});
 		});
 		it('show-advanced-mysql.' + resolution.title, async function () {
 			// (test, route, prepare, action, options
 			return helper.takeAndCompare(this, undefined, async (page) => {
 				await page.click('label.mysql');
-				await helper.delay(500);
-			});
+				await helper.delay(300);
+			}, { waitUntil: 'networkidle0', viewport: resolution});
 		});
 	});