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

Merg listview.controller.js

Browse Source
This commit is contained in:
Per Ploug Krogslund
2013-08-07 13:41:07 +02:00
parent aeedcae088 cbc841301b
commit 5cd197ffe0
118 changed files with 2197 additions and 14592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ module.exports = function(karma) {
// list of files / patterns to load in the browser
files: [
'lib/jquery/jquery-1.8.2.min.js',
'lib/jquery/jquery-2.0.3.min.js',
'lib/angular/angular.min.js',
'lib/angular/angular-cookies.min.js',
'lib/underscore/underscore.js',

2
src/Umbraco.Web.UI.Client/test/config/unit.js
View File

@@ -6,7 +6,7 @@ files = [
JASMINE,
JASMINE_ADAPTER,
'lib/jquery/jquery-1.8.2.min.js',
'lib/jquery/jquery-2.0.3.min.js',
'lib/angular/angular.min.js',
'lib/angular/angular-cookies.min.js',
'test/lib/angular/angular-mocks.js',

27
src/Umbraco.Web.UI.Client/test/unit/common/services/content-factory.spec.js
View File

@@ -41,17 +41,26 @@ describe('content factory tests', function () {
});
it('should return a content children collection given an id', function () {
var collection = contentFactory.getChildren(1234, undefined);
$rootScope.$digest();
$httpBackend.flush();
expect(collection.resultSet.length).toBe(10);
it('should return a all children collection given an id', function () {
collection = contentFactory.getChildren(1234,{take: 5, offset: 1, filter: ""});
var collection;
contentFactory.getChildren(1234, undefined).then(function (data) {
collection = data;
});
$rootScope.$digest();
$httpBackend.flush();
expect(collection.items.length).toBe(56);
});
it('should return paged children collection given an id', function () {
var collection;
contentFactory.getChildren(1234, { pageSize: 5, pageNumber: 1, filter: "" }).then(function (data) {
collection = data;
});
$rootScope.$digest();
$httpBackend.flush();
expect(collection.resultSet.length).toBe(5);
});
expect(collection.items.length).toBe(5);
});
});
});