6 commits

Author	SHA1	Message	Date
David Baker	0635a6f562	Fix karma tests ... As we now use draft-js: https://github.com/facebook/fbjs/issues/133#event-617440260	2016-06-14 16:32:07 +01:00
Richard van der Hoff	29ff9c11a8	Final karma tweaks ... * fix a comment * drop redundant import	2016-04-13 18:22:05 +01:00
Richard van der Hoff	bf31d6d5fa	Karma test tweaks ... * Make sure we only get one js-sdk (and update runtime config to match) * Don't verifyNoOutstandingRequests (since it is hard to be certain which we will get, and makes the tests too dependent on implementation-specifics). * Disable color for npm test, to avoid confusing Jenkins	2016-04-13 17:41:23 +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