10 Commits (1fcd462660a7d82bf4b610ba14f2bac3f73b5205)

Author	SHA1	Message	Date
Richard van der Hoff	584e4c04da	Merge pull request #4313 from vector-im/rav/deflakify_joining_test ... Attempts to deflakify the joining test	2017-06-15 16:29:37 +01:00
Richard van der Hoff	a28af8bcc6	Extend timeouts in joining tests again ... this seems to work? maybe?	2017-06-15 16:01:26 +01:00
Richard van der Hoff	98e694646c	Add a test for the login flow when there is a teamserver ... - just to check it keeps working.	2017-06-15 02:17:24 +01:00
Richard van der Hoff	6f2eee1f03	Attempts to deflakify the joining test ... Treat the waitTime passed into `flush` as a timeout rather than a time-between-loops, so that we can pass in bigger times and not slow the tests down too much. Bump the timeout when waiting for /publicRooms and /initialSync in the joining test.	2017-06-14 22:58:12 +01:00
Richard van der Hoff	27d5704978	Improve logging in mock-request ... Try to make it a bit more obvious what's been going on in mock-request: add timestamps to lines, and an identifier so that where we have two flushes in parallel, we can see what's what.	2017-06-14 16:59:46 +01:00
Richard van der Hoff	f60773ae1f	mock-request: improve logging ... attempt to make the logging a bit more comprehensible	2017-05-18 13:37:23 +01:00
Richard van der Hoff	a39a7c8334	Update to more recent mock-request ... Just copy-and-paste the updated version from js-sdk in here.	2017-05-18 12:18:57 +01:00
Richard van der Hoff	322af6513d	Run some tests under karma ... Including a regression test for https://github.com/vector-im/vector-web/issues/1314	2016-04-13 17:20:06 +01:00
Richard van der Hoff	69ce3c43cf	Revert "Merge branch 'develop' into rav/karma" ... The karma tests don't pass yet, and aren't ready to land on develop. This reverts commit 438453e61a, reversing changes made to 50f94eb040.	2016-04-13 17:17:45 +01:00
Richard van der Hoff	429d110212	Run some tests under karma ... Including a regression test for https://github.com/vector-im/vector-web/issues/1314	2016-04-13 10:15:04 +01:00