sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/render.js

@@ -31,12 +31,6 @@ module("SC.ListView.render", {
         return { left: 0, right: 0, top: idx * 50, height: 50 };
       },
       
-      didReload: CoreTest.stub("didReload"),
-      
-      _cv_isVisibleInWindowDidChange: CoreTest.stub("_cv_isVisibleInWindowDidChange", function() {
-        SC.ListView.prototype._cv_isVisibleInWindowDidChange.apply(this, arguments) ;
-      }),
-      
       _cv_nowShowingDidChange: CoreTest.stub("_cv_nowShowingDidChange", function() {
         SC.ListView.prototype._cv_nowShowingDidChange.apply(this, arguments) ;
       }),
@@ -47,8 +41,6 @@ module("SC.ListView.render", {
       
       // reset stubs
       reset: function() {
-        this.didReload.reset();
-        this._cv_isVisibleInWindowDidChange.reset();
         this._cv_nowShowingDidChange.reset();
         renderFunc.reset();
       }
@@ -64,9 +56,10 @@ module("SC.ListView.render", {
   
   teardown: function() {
     SC.RunLoop.begin();
+    view.reset();
     pane.remove();
+    pane.destroy();
     SC.RunLoop.end();
-    view.reset();
   }
   
 });
@@ -75,14 +68,6 @@ module("SC.ListView.render", {
 // BASIC TESTS
 // 
 
-test("didReload() should only be called once with a static content array", function() {
-  view.didReload.expect(1);
-});
-
-test("_cv_isVisibleInWindowDidChange() should only be called once with a static content array", function() {
-  view._cv_isVisibleInWindowDidChange.expect(1);
-});
-
 test("list item render() should only be called once per item view a static content array", function() {
   renderFunc.expect(10);
 });

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/rowHeightForContentIndex.js

@@ -12,16 +12,16 @@ var Delegate = SC.Object.extend(SC.CollectionRowDelegate, {
   contentIndexRowHeight: function(view, content, index) {
     return this.get('customRowHeightIndexes').contains(index) ? view.get('customRowHeight') : this.get('rowHeight');
   },
-  
+
   expected: function(view) {
     var ret = [],
         content = view.get('content'),
         loc = view.get('length');
-        
+
     while(--loc>=0) {
       ret[loc] = this.contentIndexRowHeight(view,content,loc);
     }
-    
+
     return ret ;
   }
 });
@@ -31,103 +31,135 @@ module("SC.ListView.rowHeightForContentIndex", {
     content = "1 2 3 4 5 6 7 8 9 0".w().map(function(x) {
       return SC.Object.create({ value: x });
     }, this);
-    
+
     // set this delegate if you want custom row heights
     delegate = Delegate.create();
-    
+
   }
 });
 
 function verifyRowHeights(view, rowHeight, expected) {
-  var loc = view.get('length'), actual;
-  
+  var loc = view.get('length'), actual, totalExpected = 0,
+    rowSpacing = view.get('rowSpacing') || 0;
+
   ok(loc>0, 'content should have some length');
   equals(view.rowHeightForContentIndex(loc+1), rowHeight, 'content.rowHeightForContentIndex(length+1) should be rowHeight');
-  
+
   while(--loc>=0) {
     actual = view.rowHeightForContentIndex(loc);
     if (expected) {
+      totalExpected += expected[loc];
       equals(actual, expected[loc], "content.rowHeightForContentIndex(%@) should be custom row height".fmt(loc));
     } else {
+      totalExpected += rowHeight;
       equals(actual, rowHeight, 'content.rowHeightForContentIndex(%@) should be rowHeight'.fmt(loc));
     }
+
+    totalExpected += rowSpacing;
   }
+
+  equals(totalExpected, view.get('layout').minHeight, "The minimum height of the list should match the total height of the rows.")
 }
 
 // ..........................................................
 // BASIC TESTS
-// 
+//
 
 test("constant row heights", function() {
-  var view = SC.ListView.create({ content: content, rowHeight: 40, customRowHeightIndexes: null });
+  var view;
+  SC.run(function() {
+    view = SC.ListView.create({ content: content, rowHeight: 40, customRowHeightIndexes: null });
+  });
   verifyRowHeights(view, 40);
 });
 
 test("constant row heights with rowSpacing", function() {
-  var view = SC.ListView.create({ content: content, rowHeight: 40, rowSpacing: 2, customRowHeightIndexes: null });
+  var view;
+  SC.run(function() {
+    view = SC.ListView.create({ content: content, rowHeight: 40, rowSpacing: 2, customRowHeightIndexes: null });
+  });
   verifyRowHeights(view, 40);
 });
 
 test("custom row heights", function() {
-  var view = SC.ListView.create({
-    content: content,
-    customRowHeight: 50,
-    delegate: delegate
+  var view;
+  SC.run(function() {
+    view = SC.ListView.create({
+      content: content,
+      customRowHeight: 50,
+      delegate: delegate
+    });
   });
+
   verifyRowHeights(view, 40, delegate.expected(view));
 });
 
 test("adding delegate should update calculation", function() {
-  var view = SC.ListView.create({
-    content: content,
-    rowHeight: 30,
-    customRowHeight: 50
+  var view;
+  SC.run(function() {
+    view = SC.ListView.create({
+      content: content,
+      rowHeight: 30,
+      customRowHeight: 50
+    });
   });
 
   verifyRowHeights(view, 30);
-  
-  view.set('delegate', delegate);
+
+  SC.run(function() {
+    view.set('delegate', delegate);
+  });
   verifyRowHeights(view, 40, delegate.expected(view));
 });
 
 test("changing delegate from custom to not custom should update", function() {
-  var view = SC.ListView.create({
-    content: content,
-    rowHeight: 30,
-    customRowHeight: 50,
-    delegate: delegate
+  var view;
+  SC.run(function() {
+    view = SC.ListView.create({
+      content: content,
+      rowHeight: 30,
+      customRowHeight: 50,
+      delegate: delegate
+    });
   });
   verifyRowHeights(view, 40, delegate.expected(view));
-  
-  delegate.set('customRowHeightIndexes', null);
+
+  SC.run(function() {
+    delegate.set('customRowHeightIndexes', null);
+  });
   verifyRowHeights(view, 40);
 });
 
 // ..........................................................
 // SPECIAL CASES
-// 
+//
 
 test("computed custom row height indexes", function() {
-  
+
   delegate = Delegate.create({
     indexes: Delegate.prototype.customRowHeightIndexes,
     useIndexes: NO,
-    
+
     customRowHeightIndexes: function() {
       return this.get('useIndexes') ? this.get('indexes') : null;
     }.property('useIndexes').cacheable()
   });
 
-  var view = SC.ListView.create({
-    content: content,
-    rowHeight: 15,
-    customRowHeight: 50,
-    delegate: delegate
+  var view;
+  SC.run(function() {
+    view = SC.ListView.create({
+      content: content,
+      rowHeight: 15,
+      customRowHeight: 50,
+      delegate: delegate
+    });
   });
   verifyRowHeights(view, 40);
 
 
-  delegate.set('useIndexes', YES);
-  verifyRowHeights(view, 40, delegate.expected(view));  
+  SC.run(function() {
+    delegate.set('useIndexes', YES);
+  });
+  verifyRowHeights(view, 40, delegate.expected(view));
 });
 

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_alternatingrows.js

@@ -9,27 +9,26 @@
   This test evaluates the creation of list item views with alternating rows
 */
 
-module("SC.ListView - alternating rows");
 
 // create a fake content array.  Generates a list with whatever length you
 // want of objects with a title based on the index.  Cannot mutate.
 var ContentArray = SC.Object.extend(SC.Array, {
-  
+
   length: 0,
-  
+
   objectAt: function(idx) {
     if (idx >= this.get('length')) return undefined;
-    
+
     var content = this._content, ret ;
     if (!content) content = this._content = [];
-    
+
     ret = content[idx];
     if (!ret) {
-      ret = content[idx] = SC.Object.create({ 
+      ret = content[idx] = SC.Object.create({
         title: "ContentItem %@".fmt(idx)
       });
     }
-    
+
     return ret ;
   }
 });
@@ -53,9 +52,6 @@ var pane = SC.ControlTestPane.design()
       rowHeight: 20
     })
   }));
-  
-pane.show(); // add a test to show the test pane
-window.pane = pane ;
 
 function verifyClasses(views) {
   var evens = SC.IndexSet.create(0).addEach([2,4,6,8,10]);
@@ -76,10 +72,12 @@ function verifyClasses(views) {
   });
 }
 
+module("SC.ListView - alternating rows", pane.standardSetup());
+
 test("alternating class set on list view", function() {
   var listView = pane.view("basic-even").contentView;
   var cq = listView.$();
-  
+
   ok(cq.hasClass('alternating'), "ListView instance should have 'alternating' CSS class");
 });
 
@@ -97,17 +95,17 @@ test("even/odd classes with incremental rendering - even", function() {
   var scrollView = pane.view("basic-even"),
       listView = scrollView.contentView,
       item = listView.childViews;
-  
+
   SC.run(function() {
     scrollView.scrollTo(0,21);
   });
-  
+
   verifyClasses(items);
-  
+
   SC.run(function() {
     scrollView.scrollTo(0,0);
   });
-  
+
   verifyClasses(items);
 });
 
@@ -115,16 +113,16 @@ test("even/odd classes with incremental rendering - odd", function() {
   var scrollView = pane.view("basic-odd"),
       listView = scrollView.contentView,
       item = listView.childViews;
-  
+
   SC.run(function() {
     scrollView.scrollTo(0,21);
   });
-  
+
   verifyClasses(items);
-  
+
   SC.run(function() {
     scrollView.scrollTo(0,0);
   });
-  
+
   verifyClasses(items);
 });

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_outline.js

@@ -6,29 +6,27 @@
 // ==========================================================================
 
 /*
-  This test evaluates a plain list with no custom row heights, outlines, 
+  This test evaluates a plain list with no custom row heights, outlines,
   group views or any other non-standard behavior.
 */
 
-module("SC.ListView - outline list");
-
 var TreeItem = SC.Object.extend(SC.TreeItemContent, {
 
   length: 10,
-  
+
   title: "TREE ITEM",
-  
+
   depth: 0,
-  
+
   treeItemChildren: function() {
     var ret = [], loc = this.get('length'), depth = this.get('depth')+1;
     if (depth>3) loc = loc*3
     while(--loc>=0) ret[loc] = TreeItem.create({ parent: this, unread: loc, depth: depth, treeItemIsExpanded: (depth<2) });
     return ret ;
-  }.property().cacheable(),  
-  
+  }.property().cacheable(),
+
   treeItemIsExpanded: YES,
-  
+
   treeItemBranchIndexes: function() {
     return this.depth<3 ? SC.IndexSet.create(0, this.get('length')) : null;
   }
@@ -48,9 +46,8 @@ var pane = SC.ControlTestPane.design()
       contentCheckboxKey: "isDone",
       contentUnreadCountKey: "unread",
       rowHeight: 20
-      
+
     })
   }));
-  
-pane.show(); // add a test to show the test pane
-window.pane = pane ;
+
+module("SC.ListView - outline list", pane.standardSetup());

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/list/ui_row_heights.js

@@ -4,33 +4,34 @@
 //            portions copyright @2011 Apple Inc.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
+/*globals module, test, ok, same, equals */
 
 /*
-  This test evaluates a list with custom row heights, outlines, 
+  This test evaluates a list with custom row heights, outlines,
   group views or any other non-standard behavior.
 */
 
 // create a fake content array.  Generates a list with whatever length you
 // want of objects with a title based on the index.  Cannot mutate.
 var ContentArray = SC.Object.extend(SC.Array, {
-  
+
   length: 0,
-  
+
   objectAt: function(idx) {
     if (idx >= this.get('length')) return undefined;
-    
+
     var content = this._content, ret ;
     if (!content) content = this._content = [];
-    
+
     ret = content[idx];
     if (!ret) {
-      ret = content[idx] = SC.Object.create({ 
+      ret = content[idx] = SC.Object.create({
         title: "ContentItem %@".fmt(idx),
         isDone: (idx % 3)===0,
         unread: (Math.random() > 0.5) ? Math.floor(Math.random() * 100) : 0
       });
     }
-    
+
     return ret ;
   }
 });
@@ -42,17 +43,17 @@ var pane = SC.ControlTestPane.design()
     contentView: SC.ListView.design({
       content: ContentArray.create({ length: 100001 }),
       customRowHeightIndexes: SC.IndexSet.create(2,5).add(10000,100),
-      
+
       // used for testing
       adjustableRows: SC.IndexSet.create(0,5),
       altRowHeight: 10,
-      
+
       contentIndexRowHeight: function(view, content, index) {
         var ret =this.get('rowHeight');
         if (!this.customRowHeightIndexes.contains(index)) return ret;
         return this.adjustableRows.contains(index) ? this.get('altRowHeight') : ret*2;
       },
-      
+
       contentValueKey: "title",
       contentCheckboxKey: "isDone",
       contentUnreadCountKey: "unread",
@@ -68,7 +69,7 @@ var pane2 = SC.ControlTestPane.design()
     contentView: SC.ListView.design({
       content: ContentArray.create({ length: 100 }),
       customRowHeightIndexes: SC.IndexSet.create(0,1000),
-      
+
       contentIndexRowHeight: function(view, content, index) {
         if (index % 2 === 0) {
           return 17;
@@ -77,7 +78,7 @@ var pane2 = SC.ControlTestPane.design()
           return 48;
         }
       },
-      
+
       contentValueKey: "title",
       contentCheckboxKey: "isDone",
       contentUnreadCountKey: "unread",
@@ -86,10 +87,6 @@ var pane2 = SC.ControlTestPane.design()
     })
   }));
 
-pane.show(); // add a test to show the test pane
-pane2.show();
-window.pane = pane ;
-
 function verifyChildViewsMatch(views, set) {
   var indexes = set.clone();
   views.forEach(function(view) {
@@ -101,7 +98,7 @@ function verifyChildViewsMatch(views, set) {
     }
     indexes.remove(idx);
   }, this);
-  
+
   if (indexes.get('length') === 0) {
     ok(YES, "all nowShowing indexes should have matching child views");
   } else {
@@ -109,30 +106,40 @@ function verifyChildViewsMatch(views, set) {
   }
 }
 
-module("SC.ListView - ui_row_heights", pane.standardSetup());
+module("SC.ListView - ui_row_heights", {
+  setup: function () {
+    pane.standardSetup().setup();
+    pane2.standardSetup().setup();
+  },
+
+  teardown: function () {
+    pane.standardSetup().teardown();
+    pane2.standardSetup().teardown();
+  }
+});
 
 // ..........................................................
 // BASIC RENDER TESTS
-// 
+//
 
 test("rendering only incremental portion", function() {
-  var listView = pane.view("Custom Row Heights").contentView; 
+  var listView = pane.view("Custom Row Heights").contentView;
   same(listView.get("nowShowing"), SC.IndexSet.create(0, 10), 'nowShowing should be smaller IndexSet');
-  equals(listView.get('childViews').length, listView.get('nowShowing').get('length'), 'should have same number of childViews as nowShowing length');  
+  equals(listView.get('childViews').length, listView.get('nowShowing').get('length'), 'should have same number of childViews as nowShowing length');
 });
 
 test("scrolling by small amount should update incremental rendering", function() {
   var scrollView = pane.view('Custom Row Heights'),
       listView   = scrollView.contentView,
       exp;
-  
+
   same(listView.get('nowShowing'), SC.IndexSet.create(0,10), 'precond - nowShowing has incremental range');
 
   // SCROLL DOWN ONE LINE
   SC.run(function() {
     scrollView.scrollTo(0,61);
   });
-  
+
   // top line should have scrolled out of view
   exp = SC.IndexSet.create(4,9);
   same(listView.get('nowShowing'), exp, 'nowShowing should change to reflect new clippingFrame');
@@ -143,7 +150,7 @@ test("scrolling by small amount should update incremental rendering", function()
   SC.run(function() {
     scrollView.scrollTo(0,83);
   });
-  
+
   // top line should have scrolled out of view
   exp = SC.IndexSet.create(5,9);
   same(listView.get('nowShowing'), exp, 'nowShowing should change to reflect new clippingFrame');
@@ -155,20 +162,20 @@ test("scrolling by small amount should update incremental rendering", function()
   SC.run(function() {
     scrollView.scrollTo(0,66);
   });
-  
+
   // top line should have scrolled out of view
   exp = SC.IndexSet.create(4,9);
   same(listView.get('nowShowing'), exp, 'nowShowing should change to reflect new clippingFrame');
 
   verifyChildViewsMatch(listView.childViews, exp);
-  
+
 });
 
 test("the 'nowShowing' property should be correct when scrolling", function() {
   var scrollView = pane2.view('Custom Row Heights 2'),
       listView   = scrollView.contentView,
       correctSet = SC.IndexSet.create(1, 7);
-  
+
   // Scroll to point 36, which demonstrates a problem with the older list view
   // contentIndexesInRect code.
   SC.run(function() {
@@ -179,7 +186,7 @@ test("the 'nowShowing' property should be correct when scrolling", function() {
 
 // ..........................................................
 // CHANGING ROW HEIGHTS
-// 
+//
 
 test("manually calling rowHeightDidChangeForIndexes()", function() {
   var scrollView = pane.view('Custom Row Heights'),
@@ -187,7 +194,7 @@ test("manually calling rowHeightDidChangeForIndexes()", function() {
       exp;
 
   same(listView.get('nowShowing'), SC.IndexSet.create(0,10), 'precond - nowShowing has incremental range');
-  
+
   // adjust row height and then invalidate a portion range
   SC.run(function() {
     listView.set('altRowHeight', 80);
@@ -196,7 +203,7 @@ test("manually calling rowHeightDidChangeForIndexes()", function() {
 
   // nowShowing should adjust
   same(listView.get('nowShowing'), SC.IndexSet.create(0,4), 'visible range should decrease since row heights for some rows doubled');
-  
+
   // as well as offset and heights for rows - spot check
   var view = listView.itemViewForContentIndex(3);
   same(view.get('layout'), { top: 120, left: 0, right: 0, height: 80 });