Added boilerplate for running end-to-end tests.\nThis is done using Protractor, which looks for a .gitignored file environment-protractor.js which contains the selenium endpoint url.

This commit is contained in:
Kegan Dougal 2014-09-22 14:29:12 +01:00
parent e68dc04900
commit e3152188ef
5 changed files with 30 additions and 6 deletions

View file

@ -21,13 +21,12 @@ describe("UserCtrl", function() {
getDisplayName: function(uid) {
var d = $q.defer();
// FIXME: everything goes into fire here
d.resolve({
data: {
displayname: displayName
}
});
return d;
return d.promise;
},
getProfilePictureUrl: function(uid) {
@ -37,7 +36,7 @@ describe("UserCtrl", function() {
avatar_url: avatarUrl
}
});
return d;
return d.promise;
}
};
scope = $rootScope.$new();
@ -49,7 +48,6 @@ describe("UserCtrl", function() {
'$routeParams': routeParams,
'matrixService': matrixService
});
console.log("end inject");
});
});