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

puts angular.js source back in repo as it is good for debugging/learning. Fixed editContentController tests, but now there's other test issues which I'm not sure how to fix ?

Browse Source
This commit is contained in:
Shannon
2013-07-04 15:16:02 +10:00
parent 15f0503a99
commit 7e345fda70
4 changed files with 17000 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16876
src/Umbraco.Web.UI.Client/lib/angular/angular.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

43
src/Umbraco.Web.UI.Client/src/common/services/utill.service.js
View File

@@ -8,7 +8,7 @@
* @description
* Some angular helper/extension methods
*/
function angularHelper() {
function angularHelper($log) {
return {
/**
@@ -39,33 +39,39 @@ function angularHelper() {
* Returns the current form object applied to the scope or null if one is not found
*/
getCurrentForm: function (scope) {
//NOTE: There isn't a way in angular to get a reference to the current form object since the form object
// is just defined as a property of the scope when it is named but you'll always need to know the name which
// isn't very convenient. If we want to watch for validation changes we need to get a form reference.
// The way that we detect the form object is a bit hackerific in that we detect all of the required properties
// that exist on a form object.
//
//The other way to do it in a directive is to require "^form", but in a controller the only other way to do it
// is to inject the $element object and use: $element.inheritedData('$formController');
var form = null;
var requiredFormProps = ["$error", "$name", "$dirty", "$pristine", "$valid", "$invalid", "$addControl", "$removeControl", "$setValidity", "$setDirty"];
//var requiredFormProps = ["$error", "$name", "$dirty", "$pristine", "$valid", "$invalid", "$addControl", "$removeControl", "$setValidity", "$setDirty"];
var requiredFormProps = ["$addControl", "$removeControl", "$setValidity", "$setDirty", "$setPristine"];
// a method to check that the collection of object prop names contains the property name expected
var propertyExists = function (objectPropNames) {
function propertyExists(objectPropNames) {
//ensure that every required property name exists on the current scope property
return _.every(requiredFormProps, function (item) {
return _.contains(objectPropNames, item);
});
};
}
for (var p in scope) {
if (_.isObject(scope[p]) && p.substr(0, 1) !== "$") {
if (_.isObject(scope[p]) && p !== "this" && p.substr(0, 1) !== "$") {
//get the keys of the property names for the current property
var props = _.keys(scope[p]);
//if the length isn't correct, try the next prop
if (props.length < requiredFormProps.length) {
continue;
}
//ensure that every required property name exists on the current scope property
var containProperty = propertyExists(props);
@@ -95,6 +101,31 @@ function angularHelper() {
throw "The current scope requires a current form object (or ng-form) with a name assigned to it";
}
return currentForm;
},
/**
* @ngdoc function
* @name getNullForm
* @methodOf angularHelper
* @function
*
* @description
* Returns a null angular FormController, mostly for use in unit tests
* NOTE: This is actually the same construct as angular uses internally for creating a null form but they don't expose
* any of this publicly to us, so we need to create our own.
*
* @param formName {string} The form name to assign
*/
getNullForm: function(formName) {
return {
$addControl: angular.noop,
$removeControl: angular.noop,
$setValidity: angular.noop,
$setDirty: angular.noop,
$setPristine: angular.noop,
$name: formName
//NOTE: we don't include the 'properties', just the methods.
};
}
};
}

53
src/Umbraco.Web.UI.Client/test/unit/app/content/editContentController.ignored.js
View File

@@ -1,53 +0,0 @@
describe('edit content controller tests', function () {
var scope, controller, routeParams;
routeParams = {id: 1234, create: false};
beforeEach(module('umbraco'));
beforeEach(inject(function($rootScope, $controller) {
scope = $rootScope.$new();
controller = $controller('Umbraco.Editors.ContentEditController', {
$scope: scope,
$routeParams : routeParams
});
}));
describe('content edit controller save and publish', function () {
it('it should have an content object', function () {
expect(scope.content).toNotBe(undefined);
expect(scope.content.id).toBe(1234);
});
it('it should have a tabs collection', function () {
expect(scope.content.tabs.length).toBe(5);
});
it('it should have a properties collection on each tab', function () {
$(scope.content.tabs).each(function(i, tab){
expect(tab.properties.length).toBeGreaterThan(0);
});
});
it('it should change updateDate on save', function () {
var currentUpdateDate = scope.content.updateDate;
setTimeout(function(){
scope.save(scope.content);
expect(scope.content.updateDate).toBeGreaterThan(currentUpdateDate);
}, 1000);
});
it('it should change publishDate on publish', function () {
var currentPublishDate = scope.content.publishDate;
//wait a sec before you publish
setTimeout(function(){
scope.saveAndPublish(scope.content);
expect(scope.content.publishDate).toBeGreaterThan(currentPublishDate);
}, 1000);
});
});
});

87
src/Umbraco.Web.UI.Client/test/unit/app/content/editContentController.spec.js Normal file
View File

@@ -0,0 +1,87 @@
describe('edit content controller tests', function () {
var scope, controller, routeParams, httpBackend;
routeParams = {id: 1234, create: false};
beforeEach(module('umbraco'));
beforeEach(inject(function ($rootScope, $controller, angularHelper, $httpBackend) {
httpBackend = $httpBackend;
scope = $rootScope.$new();
//this controller requires an angular form controller applied to it
scope.contentForm = angularHelper.getNullForm("contentForm");
controller = $controller('Umbraco.Editors.ContentEditController', {
$scope: scope,
$routeParams: routeParams
});
}));
describe('content edit controller save and publish', function () {
it('it should define the default properties on construction', function () {
expect(scope.files).toNotBe(undefined);
});
it('adding a file adds to the collection', function () {
scope.addFiles(123, ["testFile"]);
expect(scope.files.length).toBe(1);
});
it('adding a file with the same property id replaces the existing one', function () {
scope.addFiles(123, ["testFile"]);
scope.addFiles(123, ["testFile2"]);
expect(scope.files.length).toBe(1);
expect(scope.files[0].file).toBe("testFile2");
});
//it('it should have an content object', function() {
/*
NOTE: I cannot figure out how to make this work... I've followed along with a few sources like:
http://stackoverflow.com/questions/15833462/angularjs-need-help-to-unit-test-a-factory-with-promise
http://www.benlesh.com/2013/05/angularjs-unit-testing-controllers.html
But it tells me that there is no pending request to flush, so dunno what is going on there?
*/
// httpBackend.flush();
// rootScope.$apply();
// expect(scope.content).toNotBe(undefined);
// //expect(scope.content.id).toBe(1234);
//});
//it('it should have a tabs collection', function () {
// expect(scope.content.tabs.length).toBe(5);
//});
//it('it should have a properties collection on each tab', function () {
// $(scope.content.tabs).each(function(i, tab){
// expect(tab.properties.length).toBeGreaterThan(0);
// });
//});
//it('it should change updateDate on save', function () {
// var currentUpdateDate = scope.content.updateDate;
// setTimeout(function(){
// scope.save(scope.content);
// expect(scope.content.updateDate).toBeGreaterThan(currentUpdateDate);
// }, 1000);
// });
//it('it should change publishDate on publish', function () {
// var currentPublishDate = scope.content.publishDate;
// //wait a sec before you publish
// setTimeout(function(){
// scope.saveAndPublish(scope.content);
// expect(scope.content.publishDate).toBeGreaterThan(currentPublishDate);
// }, 1000);
//});
});
});