@@ -26,8 +26,7 @@ CollectionTest.FIXTURES = CollectionTest.FIXTURES.concat([ { guid: '1', type: 'Employee', name: "Anne", - sex: "Female", - + sex: "Female" }, { guid: '2', @@ -108,50 +107,50 @@ Test.context("Test basic functions of a collection", { }, "Collection should initially be empty": function() { - assertNull(this.employees.get('records')) + assertNull(this.employees.get('records')); }, "Collection should have 7 records upon refresh": function() { - this.employees.refresh() - this.employees.get('records').length.shouldEqual(7) + this.employees.refresh(); + this.employees.get('records').length.shouldEqual(7); }, "Collections should NOT contain records that have NOT been added to the store": function() { - this.employees.refresh() - var originalLength = this.employees.get('records').length - var newEmployee = CollectionTest.Employee.create({name: "Joe"}) - this.employees.get('records').length.shouldEqual(originalLength) + this.employees.refresh(); + var originalLength = this.employees.get('records').length; + var newEmployee = CollectionTest.Employee.create({name: "Joe"}); + this.employees.get('records').length.shouldEqual(originalLength); }, "Collections should contain records that have been added to the store": function() { - this.employees.refresh() - var originalLength = this.employees.get('records').length - var newEmployee = CollectionTest.Employee.newRecord({name: "Joe"}) - this.employees.get('records').length.shouldEqual(originalLength + 1) - newEmployee.destroy() + this.employees.refresh(); + var originalLength = this.employees.get('records').length; + var newEmployee = CollectionTest.Employee.newRecord({name: "Joe"}); + this.employees.get('records').length.shouldEqual(originalLength + 1); + newEmployee.destroy(); }, "Collections should be properly ordered": function() { - var employeesByName = CollectionTest.Employee.collection({orderBy: ['name']}) - employeesByName.refresh() - var names = employeesByName.get('records').map(function(e) { return e.get('name') }) - assertIdentical(["Alice", "Anne", "Barbara", "Bob", "Michael", "Rachel", "Richard"].join(""), names.join("")) + var employeesByName = CollectionTest.Employee.collection({orderBy: ['name']}); + employeesByName.refresh(); + var names = employeesByName.get('records').map(function(e) { return e.get('name') }); + assertIdentical(["Alice", "Anne", "Barbara", "Bob", "Michael", "Rachel", "Richard"].join(""), names.join("")); - var employeesBySex = CollectionTest.Employee.collection({orderBy: ['sex']}) - employeesBySex.refresh() - var sexes = employeesBySex.get('records').map(function(e) { return e.get('sex') }) - assertIdentical(["Female", "Female", "Female", "Female", "Male", "Male", "Male"].join(""), sexes.join("")) + var employeesBySex = CollectionTest.Employee.collection({orderBy: ['sex']}); + employeesBySex.refresh(); + var sexes = employeesBySex.get('records').map(function(e) { return e.get('sex') }); + assertIdentical(["Female", "Female", "Female", "Female", "Male", "Male", "Male"].join(""), sexes.join("")); }, "Collections should remain unchanged if a record is changed in a way that does not affect the order": function() { - var employeesBySex = CollectionTest.Employee.collection({orderBy: ['sex']}) - employeesBySex.refresh() - var employeesOriginal = employeesBySex.get('records').map(function(e) { return e.get('guid') }).join(", ") + var employeesBySex = CollectionTest.Employee.collection({orderBy: ['sex']}); + employeesBySex.refresh(); + var employeesOriginal = employeesBySex.get('records').map(function(e) { return e.get('guid') }).join(", "); - this.bob.set('name', 'Robert') - var employees = employeesBySex.get('records').map(function(e) { return e.get('guid') }).join(", ") + this.bob.set('name', 'Robert'); + var employees = employeesBySex.get('records').map(function(e) { return e.get('guid') }).join(", "); - assertIdentical(employeesOriginal, employees) + assertIdentical(employeesOriginal, employees); } }); tests/models/collection.rhtml @@ -1,6 +1,23 @@ <% content_for('final') do %> <script> +// create some item data... +[ + { guid: '1001', name: 'item one', group: '1' }, + { guid: '1002', name: 'item two', group: '1' }, + { guid: '1003', name: 'item three', group: '2' }, + { guid: '1004', name: 'item four', group: '3' }, + { guid: '1005', name: 'item five', group: '3' }, + { guid: '1006', name: 'item six', group: '3' } +].each(function(o){ SC.Store.addRecord(SC.Record.create(o)); }); + +// a collection to hold the items... +testCollection = SC.Record.collection(); +testCollection.refresh(); + +// a controller for the collection... +testController = SC.CollectionController.create(); + Test.context("A grouped SC.SourceListView with its content set to a SC.CollectionController", { "Item views should be the same width as the SC.CollectionView": function() @@ -27,56 +44,69 @@ Test.context("A grouped SC.SourceListView with its content set to a SC.Collectio widthOfFirstGroupView().shouldEqual(testSourceListView.get('frame').width) ; }, + // setup: function() + // { + // // add a scroll view wrapper. + // scrollView = SC.ScrollView.create() ; + // scrollView.set('frame', { x: 10, y: 10, width: 100, height: 100 }); + // SC.window.appendChild(scrollView); + // + // // create the view... + // testSourceListView = SC.ListView.extend({ + // contentValueKey: 'name', + // groupBy: 'group', + // contentBinding: 'testController.arrangedObjects', + // selectionBinding: 'testController.selection' + // }).create(); + // + // scrollView.set('content', testSourceListView) ; + // }, + // + // teardown: function() + // { + // // tell SC.Store to dump all the records... + // // otherwise, since SC.Store is shared across all tests (yuk!) we'll get shared fixtues + // testCollection.get('records').each(function(r){ SC.Store.removeRecord(r); }); + // + // // remove the view from SC.window... again, no shared fixtures... + // testSourceListView.removeFromParent(); + // scrollView.removeFromParent() ; + // + // delete testSourceListView; + // delete testCollection; + // delete testController; + // delete scrollView ; + // } + setup: function() { // add a scroll view wrapper. scrollView = SC.ScrollView.create() ; - scrollView.set('frame', { x: 10, y: 10, width: 100, height: 100 }); - SC.window.appendChild(scrollView); + scrollView.set('frame', { x: 10, y: 10, width: 100, height: 30 }) ; + SC.window.appendChild(scrollView) ; // create the view... - testSourceListView = SC.ListView.extend({ + testSourceListView = SC.SourceListView.create({ contentValueKey: 'name', - groupBy: 'group', + groupBy: 'group', contentBinding: 'testController.arrangedObjects', selectionBinding: 'testController.selection' - }).create(); - + }) ; scrollView.set('content', testSourceListView) ; - - // create some item data... - [ - { guid: '1001', name: 'item one', group: '1' }, - { guid: '1002', name: 'item two', group: '1' }, - { guid: '1003', name: 'item three', group: '2' }, - { guid: '1004', name: 'item four', group: '3' }, - { guid: '1005', name: 'item five', group: '3' }, - { guid: '1006', name: 'item six', group: '3' } - ].each(function(o){ SC.Store.addRecord(SC.Record.create(o)); }); - - // a collection to hold the items... - testCollection = SC.Record.collection(); - testCollection.refresh(); - // a controller for the collection... - testController = SC.CollectionController.create(); - testController.set('content', testCollection); - + testController.set('content', testCollection) ; }, + teardown: function() { - // tell SC.Store to dump all the records... - // otherwise, since SC.Store is shared across all tests (yuk!) we'll get shared fixtues - testCollection.get('records').each(function(r){ SC.Store.removeRecord(r); }); - - // remove the view from SC.window... again, no shared fixtures... - testSourceListView.removeFromParent(); + // remove the view from SC.window + testSourceListView.removeFromParent() ; scrollView.removeFromParent() ; - - delete testSourceListView; - delete testCollection; - delete testController; + + delete testSourceListView ; delete scrollView ; + + testController.set('content', null) ; } }); @@ -108,61 +138,92 @@ Test.context("A grouped SC.SourceListView with its content set to a SC.Collectio widthOfFirstGroupView().shouldEqual(testSourceListView.get('frame').width) ; }, + // setup: function() + // { + // // add a scroll view wrapper. + // scrollView = SC.ScrollView.create() ; + // scrollView.set('frame', { x: 10, y: 10, width: 100, height: 100 }); + // SC.window.appendChild(scrollView); + // + // // create the view... + // testSourceListView = SC.SourceListView.extend({ + // contentValueKey: 'name', + // groupBy: 'group', + // contentBinding: 'testController.arrangedObjects', + // selectionBinding: 'testController.selection' + // }).create(); + // + // scrollView.set('content', testSourceListView) ; + // + // // create some item data... + // [ + // { guid: '1001', name: 'item one', group: '1' }, + // { guid: '1002', name: 'item two', group: '1' }, + // { guid: '1003', name: 'item three', group: '2' }, + // { guid: '1004', name: 'item four', group: '3' }, + // { guid: '1005', name: 'item five', group: '3' }, + // { guid: '1006', name: 'item six', group: '3' } + // ].each(function(o){ SC.Store.addRecord(SC.Record.create(o)); }); + // + // // a collection to hold the items... + // testCollection = SC.Record.collection(); + // testCollection.refresh(); + // + // // a controller for the collection... + // testController = SC.CollectionController.create(); + // testController.set('content', testCollection); + // + // // resize the scroll view + // scrollView.viewFrameWillChange() + // scrollView.set('frame', {x: 10, y: 10, width: 200, height: 100}) + // scrollView.viewFrameDidChange() + // + // }, + // teardown: function() + // { + // // tell SC.Store to dump all the records... + // // otherwise, since SC.Store is shared across all tests (yuk!) we'll get shared fixtues + // testCollection.get('records').each(function(r){ SC.Store.removeRecord(r); }); + // + // // remove the view from SC.window... again, no shared fixtures... + // testSourceListView.removeFromParent(); + // scrollView.removeFromParent() ; + // + // delete testSourceListView; + // delete testCollection; + // delete testController; + // delete scrollView ; + // } + setup: function() { // add a scroll view wrapper. scrollView = SC.ScrollView.create() ; - scrollView.set('frame', { x: 10, y: 10, width: 100, height: 100 }); - SC.window.appendChild(scrollView); + scrollView.set('frame', { x: 10, y: 10, width: 100, height: 30 }) ; + SC.window.appendChild(scrollView) ; // create the view... - testSourceListView = SC.SourceListView.extend({ + testSourceListView = SC.SourceListView.create({ contentValueKey: 'name', - groupBy: 'group', + groupBy: 'group', contentBinding: 'testController.arrangedObjects', selectionBinding: 'testController.selection' - }).create(); - + }) ; scrollView.set('content', testSourceListView) ; - - // create some item data... - [ - { guid: '1001', name: 'item one', group: '1' }, - { guid: '1002', name: 'item two', group: '1' }, - { guid: '1003', name: 'item three', group: '2' }, - { guid: '1004', name: 'item four', group: '3' }, - { guid: '1005', name: 'item five', group: '3' }, - { guid: '1006', name: 'item six', group: '3' } - ].each(function(o){ SC.Store.addRecord(SC.Record.create(o)); }); - - // a collection to hold the items... - testCollection = SC.Record.collection(); - testCollection.refresh(); - - // a controller for the collection... - testController = SC.CollectionController.create(); - testController.set('content', testCollection); - // resize the scroll view - scrollView.viewFrameWillChange() - scrollView.set('frame', {x: 10, y: 10, width: 200, height: 100}) - scrollView.viewFrameDidChange() - + testController.set('content', testCollection) ; }, + teardown: function() { - // tell SC.Store to dump all the records... - // otherwise, since SC.Store is shared across all tests (yuk!) we'll get shared fixtues - testCollection.get('records').each(function(r){ SC.Store.removeRecord(r); }); - - // remove the view from SC.window... again, no shared fixtures... - testSourceListView.removeFromParent(); + // remove the view from SC.window + testSourceListView.removeFromParent() ; scrollView.removeFromParent() ; - - delete testSourceListView; - delete testCollection; - delete testController; + + delete testSourceListView ; delete scrollView ; + + testController.set('content', null) ; } }); tests/views/collection/source_list_rendering.rhtml fb3385ed93e2de6cc7bab2feac5870d7d3cc9fc0 Erich Ocean erich@atlasocean.com http://github.com/sproutit/sproutcore/commit/b606a714223a4bb97cc249e37d4021f2691ded8a b606a714223a4bb97cc249e37d4021f2691ded8a 2008-09-30T15:04:47-07:00 2008-09-30T15:04:47-07:00 test changes to accomodate IE7 quirks 1c87b565def316bea4842014d11fcade5e68cfdf Erich Ocean erich@atlasocean.com