From afabf9d4b195e2512f339f488f7fba60ac527bb2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 20 Apr 2020 19:47:16 +0100
Subject: [PATCH 1/2] Fix tests post-js-sdk-filters change

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/app-tests/loading-test.js | 4 ----
 tsconfig.json                  | 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/test/app-tests/loading-test.js b/test/app-tests/loading-test.js
index 92c3b29340..5418382df1 100644
--- a/test/app-tests/loading-test.js
+++ b/test/app-tests/loading-test.js
@@ -312,7 +312,6 @@ describe('loading:', function() {
 
         it('shows the last known room by default', function() {
             httpBackend.when('GET', '/pushrules').respond(200, {});
-            httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
 
             loadApp();
 
@@ -332,7 +331,6 @@ describe('loading:', function() {
             localStorage.removeItem("mx_last_room_id");
 
             httpBackend.when('GET', '/pushrules').respond(200, {});
-            httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
 
             loadApp();
 
@@ -350,7 +348,6 @@ describe('loading:', function() {
 
         it('shows a room view if we followed a room link', function() {
             httpBackend.when('GET', '/pushrules').respond(200, {});
-            httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
 
             loadApp({
                 uriFragment: "#/room/!room:id",
@@ -663,7 +660,6 @@ describe('loading:', function() {
             return sleep(1);
         }).then(() => {
             httpBackend.when('GET', '/pushrules').respond(200, {});
-            httpBackend.when('POST', '/filter').respond(200, { filter_id: 'fid' });
             return expectAndAwaitSync().catch((e) => {
                 throw new Error("Never got /sync after login: did the client start?");
             });
diff --git a/tsconfig.json b/tsconfig.json
index d70e0a85f0..dc61d72419 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,6 +2,7 @@
   "compilerOptions": {
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
+    "resolveJsonModule": true,
     "module": "commonjs",
     "moduleResolution": "node",
     "target": "es2016",

From 1314a8d3f9b859b460ae3b0b93619a4d04acee48 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 20 Apr 2020 20:06:34 +0100
Subject: [PATCH 2/2] undo unrelated change.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 tsconfig.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tsconfig.json b/tsconfig.json
index dc61d72419..d70e0a85f0 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,7 +2,6 @@
   "compilerOptions": {
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
-    "resolveJsonModule": true,
     "module": "commonjs",
     "moduleResolution": "node",
     "target": "es2016",