yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '7.0.1' of https://github.com/umbraco/Umbraco-CMS into 7.0.1

Browse Source
This commit is contained in:
Shannon
2013-12-05 22:07:19 +11:00
parent 4346578160 cfe0b2f9e5
commit d7d800331b
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web.UI.Client/test/unit/common/services/events-service.spec.js
View File

@@ -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