From e1a98db503ff1706f234dfe17a0f3c3bc52e8834 Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Wed, 12 Jan 2022 12:46:16 -0800
Subject: [PATCH] Fix flaky test-release test

Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
---
 package.json                           | 4 ++--
 ts/{build => scripts}/test-electron.ts | 0
 ts/{build => scripts}/test-release.ts  | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)
 rename ts/{build => scripts}/test-electron.ts (100%)
 rename ts/{build => scripts}/test-release.ts (93%)

diff --git a/package.json b/package.json
index 6c11246e8..620484163 100644
--- a/package.json
+++ b/package.json
@@ -36,8 +36,8 @@
     "prepare-windows-cert": "node scripts/prepare_windows_cert.js",
     "publish-to-apt": "NAME=$npm_package_name VERSION=$npm_package_version ./aptly.sh",
     "test": "yarn test-node && yarn test-electron",
-    "test-electron": "node ts/build/test-electron.js",
-    "test-release": "node ts/build/test-release.js",
+    "test-electron": "node ts/scripts/test-electron.js",
+    "test-release": "node ts/scripts/test-release.js",
     "test-node": "electron-mocha --file test/setup-test-node.js --recursive test/app test/modules ts/test-node ts/test-both",
     "test-node-coverage": "nyc --reporter=lcov --reporter=text mocha --recursive test/app test/modules ts/test-node ts/test-both",
     "eslint": "eslint --cache .",
diff --git a/ts/build/test-electron.ts b/ts/scripts/test-electron.ts
similarity index 100%
rename from ts/build/test-electron.ts
rename to ts/scripts/test-electron.ts
diff --git a/ts/build/test-release.ts b/ts/scripts/test-release.ts
similarity index 93%
rename from ts/build/test-release.ts
rename to ts/scripts/test-release.ts
index 16b8bd91d..04a4043d4 100644
--- a/ts/build/test-release.ts
+++ b/ts/scripts/test-release.ts
@@ -66,7 +66,11 @@ const main = async () => {
 
   console.log('Waiting for a first window');
   const window = await app.firstWindow();
-  await window.waitForLoadState();
+
+  console.log('Waiting for app to fully load');
+  await window.waitForSelector(
+    '.App, .app-loading-screen:has-text("Optimizing")'
+  );
 
   console.log('Checking window title');
   assert.strictEqual(await window.title(), packageJson.productName);