Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unskip unit tests; fix filter dependency.

This commit is contained in:
Kegan Dougal 2014-11-14 09:20:36 +00:00
parent 633137d501
commit 656bf2c60c
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
syweb/webclient/test/unit/filters.spec.js
View File

@ -1,4 +1,4 @@
xdescribe('mRoomName filter', function() {
describe('mRoomName filter', function() {
var filter, mRoomName, mUserDisplayName;
var roomId = "!weufhewifu:matrix.org";
@ -29,28 +29,34 @@ xdescribe('mRoomName filter', function() {
beforeEach(function() {
// inject mocked dependencies
module(function ($provide, $filterProvider) {
module(function ($provide) {
$provide.value('matrixService', matrixService);
$provide.value('modelService', modelService);
$provide.value('mUserDisplayNameFilter', function(a,b){return "boo";});
});
module('matrixFilter');
// angular resolves dependencies with the same name via a 'last wins'
// rule, hence we need to have this mock filter impl AFTER module('matrixFilter')
// so it clobbers the actual mUserDisplayName implementation.
module(function ($filterProvider) {
// provide a fake filter
$filterProvider.register('mUserDisplayName', function() {
return function(user_id, room_id) {
if (user_id === testUserId) {
return testDisplayName;
}
return testOtherDisplayName;
};
});
});
});
beforeEach(inject(function($filter) {
filter = $filter;
mRoomName = filter("mRoomName");
// provide a fake filter
spyOn($filter, "mUserDisplayName").and.callFake(function(user_id, room_id) {
if (user_id === testUserId) {
return testDisplayName;
}
return testOtherDisplayName;
});
// purge the previous test values
testUserId = undefined;
testAlias = undefined;