OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4252 from vector-im/luke/fix-joining-test 

Expect to see HTTP /join/#some:alias when we the view knows it
pull/4236/merge
Luke Barnard 2017-06-08 18:11:23 +01:00 committed by GitHub
parent caeb675672 de334cccfd
commit f2b89acfec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/app-tests/joining.js
View File

@ -158,7 +158,7 @@ describe('joining a room', function () {
ReactTestUtils.Simulate.click(joinLink);
httpBackend.when('POST', '/join/'+encodeURIComponent(ROOM_ID))
httpBackend.when('POST', '/join/'+encodeURIComponent(ROOM_ALIAS))
.respond(200, {room_id: ROOM_ID});
}).then(() => {
// wait for the join request to be made
@ -180,7 +180,7 @@ describe('joining a room', function () {
roomView, "mx_Spinner");
// flush it through
return httpBackend.flush('/join/'+encodeURIComponent(ROOM_ID));
return httpBackend.flush('/join/'+encodeURIComponent(ROOM_ALIAS));
}).then(() => {
httpBackend.verifyNoOutstandingExpectation();