From cfe0b2f9e578007ddd8508f432b60ba87aef2907 Mon Sep 17 00:00:00 2001 From: perploug Date: Thu, 5 Dec 2013 11:28:54 +0100 Subject: [PATCH] fixes failing eventsService tests --- .../unit/common/services/events-service.spec.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/events-service.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/events-service.spec.js index 37788a4cad..b714c02b50 100644 --- a/src/Umbraco.Web.UI.Client/test/unit/common/services/events-service.spec.js +++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/events-service.spec.js @@ -18,7 +18,7 @@ describe('angular event tests', function () { }; eventsService.on("testEvent", function (e, args) { - args.args.val = "changed"; + args.val = "changed"; }); eventsService.emit("testEvent", eventArgs); @@ -34,11 +34,11 @@ describe('angular event tests', function () { }; eventsService.on("testEvent", function (e, args) { - args.args.val = "changed"; + args.val = "changed"; }); eventsService.on("testEvent", function (e, args) { - args.args.val = "changed1"; + args.val = "changed1"; }); eventsService.emit("testEvent", eventArgs); @@ -55,14 +55,13 @@ describe('angular event tests', function () { eventsService.on("testEvent", function (e, msg) { $timeout(function () { - msg.args.val = "changed"; + msg.val = "changed"; //NOTE: We could resolve anything here - msg.resolve(msg.args); + msg.resolve(msg); }, 1000); }); - var promises = eventsService.emit("testEvent", eventArgs); - + //this won't be changed yet expect(eventArgs.val).toBe(""); @@ -73,7 +72,6 @@ describe('angular event tests', function () { });*/ $rootScope.$digest(); - $timeout.flush(); }); //NOTE: This logic has been merged into the eventsService