Merge pull request from velesin/header_controller_test_fix

fixes HeaderController test
This commit is contained in:
Régis Hanol 2013-12-23 05:47:22 -08:00
commit 9ee404b0e6

@ -1,12 +1,4 @@
module("Discourse.HeaderController", { module("Discourse.HeaderController");
setup: function() {
sinon.stub(Discourse, "ajax");
},
teardown: function() {
Discourse.ajax.restore();
}
});
test("showNotifications action", function() { test("showNotifications action", function() {
var resolveRequestWith; var resolveRequestWith;
@ -19,10 +11,10 @@ test("showNotifications action", function() {
var viewSpy = { var viewSpy = {
showDropdownBySelector: sinon.spy() showDropdownBySelector: sinon.spy()
}; };
Discourse.User.current().set("unread_notifications", 1); this.stub(Discourse, "ajax").withArgs("/notifications").returns(request);
Ember.run(function() { this.stub(Discourse.User, "current").returns(Discourse.User.create({
Discourse.ajax.withArgs("/notifications").returns(request); unread_notifications: 1
}); }));
Ember.run(function() { Ember.run(function() {