From f7a26ddb915143918e93a0fea89a0b7d0394355d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sun, 19 Nov 2017 20:46:40 +0000
Subject: [PATCH] fix (race?) broken tests

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/app-tests/joining.js | 5 +++++
 test/app-tests/loading.js | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/test/app-tests/joining.js b/test/app-tests/joining.js
index 29da3413b3..fc380e7d58 100644
--- a/test/app-tests/joining.js
+++ b/test/app-tests/joining.js
@@ -16,6 +16,9 @@ limitations under the License.
 
 /* joining.js: tests for the various paths when joining a room */
 
+import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
+import Platform from '../../src/vector/platform';
+
 require('skin-sdk');
 
 var jssdk = require('matrix-js-sdk');
@@ -85,6 +88,8 @@ describe('joining a room', function () {
             localStorage.setItem("mx_access_token", ACCESS_TOKEN );
             localStorage.setItem("mx_user_id", USER_ID);
 
+            PlatformPeg.set(new Platform());
+
             var mc = (
                 <MatrixChat config={{}}
                     makeRegistrationUrl={()=>{throw new Error("unimplemented");}}
diff --git a/test/app-tests/loading.js b/test/app-tests/loading.js
index a7e7c9851b..dab616577a 100644
--- a/test/app-tests/loading.js
+++ b/test/app-tests/loading.js
@@ -16,6 +16,9 @@ limitations under the License.
 
 /* loading.js: test the myriad paths we have for loading the application */
 
+import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
+import Platform from '../../src/vector/platform';
+
 import 'skin-sdk';
 
 import React from 'react';
@@ -137,6 +140,8 @@ describe('loading:', function () {
             default_is_url: DEFAULT_IS_URL,
         }, opts.config || {});
 
+        PlatformPeg.set(new Platform());
+
         var params = parseQs(windowLocation);
         matrixChat = ReactDOM.render(
             <MatrixChat