From a5092dc763bb2bc4edb7fe32a7fa04dfede69c1d Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 3 May 2019 00:11:51 -0600
Subject: [PATCH] Fix tests to use new server config options

---
 src/i18n/strings/en_EN.json |  2 +-
 test/app-tests/joining.js   | 12 +++++++++++-
 test/app-tests/loading.js   |  7 +++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index e84d87ac0d..10e57592b7 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1,7 +1,7 @@
 {
     "Unexpected error preparing the app. See console for details.": "Unexpected error preparing the app. See console for details.",
     "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.",
-    "Invalid configuration: no default server specified": "Invalid configuration: no default server specified",
+    "Invalid configuration: no default server specified.": "Invalid configuration: no default server specified.",
     "Riot Desktop on %(platformName)s": "Riot Desktop on %(platformName)s",
     "Unknown device": "Unknown device",
     "%(appName)s via %(browserName)s on %(osName)s": "%(appName)s via %(browserName)s on %(osName)s",
diff --git a/test/app-tests/joining.js b/test/app-tests/joining.js
index 16b29fcb84..1661e0e699 100644
--- a/test/app-tests/joining.js
+++ b/test/app-tests/joining.js
@@ -96,8 +96,18 @@ describe('joining a room', function() {
 
             PlatformPeg.set(new WebPlatform());
 
+            const config = {
+                validated_server_config: {
+                    hsUrl: HS_URL,
+                    hsName: "TEST_ENVIRONMENT",
+                    hsNameIsDifferent: false, // yes, we lie
+                    isUrl: IS_URL,
+                    identityEnabled: true,
+                },
+            };
+
             const mc = (
-                <MatrixChat config={{}}
+                <MatrixChat config={config}
                     makeRegistrationUrl={()=>{throw new Error("unimplemented");}}
                     initialScreenAfterLogin={{
                         screen: 'directory',
diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index b2df82e6e4..4199495fe7 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -146,6 +146,13 @@ describe('loading:', function() {
         const config = Object.assign({
             default_hs_url: DEFAULT_HS_URL,
             default_is_url: DEFAULT_IS_URL,
+            validated_server_config: {
+                hsUrl: DEFAULT_HS_URL,
+                hsName: "TEST_ENVIRONMENT",
+                hsNameIsDifferent: false, // yes, we lie
+                isUrl: DEFAULT_IS_URL,
+                identityEnabled: true,
+            },
             embeddedPages: {
                 homeUrl: 'data:text/html;charset=utf-8;base64,PGh0bWw+PC9odG1sPg==',
             },