59 Commits

Author	SHA1	Message	Date
David Baker	607923b58f	Fix test since we peek by room ID, not alias	2016-06-17 17:49:36 +01:00
Richard van der Hoff	121fe34180	Improve parsing of keyword notification rules ... For notification rules, the absence of a value on a 'highlight' tweak means that the highlight should happen; this was previously confusing us. Use the action parser from NotificationUtils to simplify the code. Fixes https://github.com/vector-im/vector-web/issues/1330	2016-04-14 22:45:00 +01:00
Richard van der Hoff	ff5dff45f5	Start Notifications component refactor ... Factor some things out of the mega Notifications component, and add a dummy unit test to show willing	2016-04-13 18:44:41 +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	181a6a61ff	tests: Don't add the div to the DOM	2016-04-13 17:20:06 +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	a512e600a7	tests: Don't add the div to the DOM	2016-04-13 11:16:38 +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