From 2509c864e071683fe24dcd1e3066bd37eb3cd301 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 13 Aug 2021 13:46:08 +0100
Subject: [PATCH] tweak order of e2e tests

---
 test/end-to-end-tests/src/scenario.js               | 3 ++-
 test/end-to-end-tests/src/scenarios/lazy-loading.js | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/end-to-end-tests/src/scenario.js b/test/end-to-end-tests/src/scenario.js
index 7d3c5f1cd9..bf7bad309a 100644
--- a/test/end-to-end-tests/src/scenario.js
+++ b/test/end-to-end-tests/src/scenario.js
@@ -41,10 +41,11 @@ module.exports = async function scenario(createSession, restCreator) {
     await toastScenarios(alice, bob);
     await roomDirectoryScenarios(alice, bob);
     await e2eEncryptionScenarios(alice, bob);
-    await spacesScenarios(alice, bob);
     console.log("create REST users:");
     const charlies = await createRestUsers(restCreator);
     await lazyLoadingScenarios(alice, bob, charlies);
+    // do spaces scenarios last as the rest of the tests may get confused by spaces
+    await spacesScenarios(alice, bob);
 };
 
 async function createRestUsers(restCreator) {
diff --git a/test/end-to-end-tests/src/scenarios/lazy-loading.js b/test/end-to-end-tests/src/scenarios/lazy-loading.js
index aeb0be8bd5..406f7b24a3 100644
--- a/test/end-to-end-tests/src/scenarios/lazy-loading.js
+++ b/test/end-to-end-tests/src/scenarios/lazy-loading.js
@@ -29,7 +29,6 @@ const assert = require('assert');
 
 module.exports = async function lazyLoadingScenarios(alice, bob, charlies) {
     console.log(" creating a room for lazy loading member scenarios:");
-    await alice.delay(1000); // let dialogs close and the app settle
     const charly1to5 = charlies.slice("charly-1..5", 0, 5);
     const charly6to10 = charlies.slice("charly-6..10", 5);
     assert(charly1to5.sessions.length, 5);