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

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

Browse Source
This commit is contained in:
Shannon
2013-08-23 18:10:49 +10:00
parent 59a8e03c79 3835b50a44
commit fbaaf7a6cb
3 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web.UI.Client/test/config/karma.conf.js
View File

@@ -24,8 +24,9 @@ module.exports = function(karma) {
*/
'lib/underscore/underscore.js',
'lib/umbraco/Extensions.js',
'lib/umbraco/Extensions.js',
'lib/yepnope/yepnope.min.js',
'test/config/app.unit.js',
'src/common/mocks/umbraco.servervariables.js',
@@ -62,7 +63,7 @@ module.exports = function(karma) {
// level of logging
// possible values: karma.LOG_DISABLE || karma.LOG_ERROR || karma.LOG_WARN || karma.LOG_INFO || karma.LOG_DEBUG
// CLI --log-level debug
logLevel: karma.LOG_INFO,
logLevel: karma.LOG_DEBUG,
// enable / disable watching file and executing tests whenever any file changes
// CLI --auto-watch --no-auto-watch

25
src/Umbraco.Web.UI.Client/test/unit/common/services/assets-service.spec.js Normal file
View File

@@ -0,0 +1,25 @@
describe('keyboard service tests', function () {
var assetsService, $window, $rootScope;
beforeEach(module('umbraco.services'));
beforeEach(inject(function ($injector) {
assetsService = $injector.get('assetsService');
$window = $injector.get("$window");
$rootScope = $injector.get('$rootScope');
}));
describe('Loading js assets', function () {
it('Loads a javascript file', function () {
assetsService.loadJs("NamespaceManager.js").then(function(){
console.log("loaded");
});
//this currently doesnt work, the test server returns 404
$rootScope.$digest();
});
});
});

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

@@ -1,8 +1,8 @@
describe('keyboard service tests', function () {
var keyboardService, $window;
var keyboardService, $window, $rootScope;
var createKeyEvent = function (mainKey, alt, ctrl, shift, meta) {
var keyEvent = jQuery.Event("keydown");
var keyEvent = jQuery.Event("keypress");
keyEvent.keyCode = mainKey.charCodeAt(0);
keyEvent.altKey = alt;
keyEvent.ctrlKey = ctrl;
@@ -17,6 +17,7 @@ describe('keyboard service tests', function () {
beforeEach(inject(function ($injector) {
keyboardService = $injector.get('keyboardService');
$window = $injector.get("$window");
$rootScope = $injector.get("$rootScope");
}));
@@ -26,9 +27,8 @@ describe('keyboard service tests', function () {
var ctrls = false;
var el = $("<span></span>");
var ev = createKeyEvent("s", false, true, false);
keyboardService.bind("ctrl+s", function(){
var ev = createKeyEvent("s", false, false, false);
keyboardService.bind("s", function(){
ctrls = true;
});
@@ -39,9 +39,11 @@ describe('keyboard service tests', function () {
//triggerEvent(el, "s", true);
el.trigger(ev);
$rootScope.$digest();
//it should now be true - this fails for some reason
//we will investigate some other time
//expect(ctrls).toBe(true);
// expect(ctrls).toBe(true);
});