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

View file

@ -1,4 +1,4 @@
xdescribe('mRoomName filter', function() { describe('mRoomName filter', function() {
var filter, mRoomName, mUserDisplayName; var filter, mRoomName, mUserDisplayName;
var roomId = "!weufhewifu:matrix.org"; var roomId = "!weufhewifu:matrix.org";
@ -29,27 +29,33 @@ xdescribe('mRoomName filter', function() {
beforeEach(function() { beforeEach(function() {
// inject mocked dependencies // inject mocked dependencies
module(function ($provide, $filterProvider) { module(function ($provide) {
$provide.value('matrixService', matrixService); $provide.value('matrixService', matrixService);
$provide.value('modelService', modelService); $provide.value('modelService', modelService);
$provide.value('mUserDisplayNameFilter', function(a,b){return "boo";});
}); });
module('matrixFilter'); module('matrixFilter');
});
beforeEach(inject(function($filter) {
filter = $filter;
mRoomName = filter("mRoomName");
// 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 // provide a fake filter
$filterProvider.register('mUserDisplayName', function() {
spyOn($filter, "mUserDisplayName").and.callFake(function(user_id, room_id) { return function(user_id, room_id) {
if (user_id === testUserId) { if (user_id === testUserId) {
return testDisplayName; return testDisplayName;
} }
return testOtherDisplayName; return testOtherDisplayName;
};
}); });
});
});
beforeEach(inject(function($filter) {
filter = $filter;
mRoomName = filter("mRoomName");
// purge the previous test values // purge the previous test values
testUserId = undefined; testUserId = undefined;