From 30efd02d22c0b47948c17b0554805c82db6696b8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 15 Sep 2017 15:57:37 +0100 Subject: [PATCH 1/2] Fix test for new behaviour of 'joining' flag It's no longer reset when the join request completes, so don't assert it. (The important test is later, asserting that the room object is non-null). --- test/app-tests/joining.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/app-tests/joining.js b/test/app-tests/joining.js index 9e0a84c773..c37fde6a7f 100644 --- a/test/app-tests/joining.js +++ b/test/app-tests/joining.js @@ -176,9 +176,6 @@ describe('joining a room', function () { return Promise.delay(1); }).then(() => { - // We've joined, expect this to false - expect(roomView.state.joining).toBe(false); - // now send the room down the /sync pipe httpBackend.when('GET', '/sync'). respond(200, { From c32e736754b2935b422a887c9e4b7fd0c9ad08c9 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 19 Sep 2017 10:23:12 +0100 Subject: [PATCH 2/2] Comment why we don't expect joining flag to reset --- test/app-tests/joining.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/app-tests/joining.js b/test/app-tests/joining.js index c37fde6a7f..29da3413b3 100644 --- a/test/app-tests/joining.js +++ b/test/app-tests/joining.js @@ -176,6 +176,10 @@ describe('joining a room', function () { return Promise.delay(1); }).then(() => { + // NB. we don't expect the 'joining' flag to reset at any point: + // it will stay set and we observe whether we have Room object for + // the room and whether our member event shows we're joined. + // now send the room down the /sync pipe httpBackend.when('GET', '/sync'). respond(200, {