sproutcore 1.10.3.1 → 1.11.0.rc1

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/content.js

@@ -21,7 +21,7 @@ module("SC.CollectionView.content", {
       // ..........................................................
       // STUB: computeLayout
       //
-      computeLayout: CoreTest.stub('computeLayout'),
+      computeLayout: CoreTest.stub('computeLayout', SC.CollectionView.prototype.computeLayout),
 
       // ..........................................................
       // STUB: RELOAD
@@ -127,7 +127,9 @@ module("SC.CollectionView.content", {
 test("setting content for first time", function() {
   equals(view.get('content'), null, 'precond - view.content should be null');
 
-  view.set('content', content1);
+  SC.run(function () {
+    view.set('content', content1);
+  });
   view.reload.expect(YES, 2); // should reload everything
   view.contentPropertyDidChange.expect(0); // should not call
   view.computeLayout.expect(YES);
@@ -136,10 +138,14 @@ test("setting content for first time", function() {
 
 test("changing content with different size", function() {
 
-  view.set('content', "a b".w());
+  SC.run(function () {
+    view.set('content', "a b".w());
+  });
   view.reset();
 
-  view.set('content', content2);
+  SC.run(function () {
+    view.set('content', content2);
+  });
   view.reload.expect(YES, 2); // call twice?
   view.contentPropertyDidChange.expect(0); // should not call
   view.computeLayout.expect(YES);
@@ -148,10 +154,14 @@ test("changing content with different size", function() {
 
 test("changing content with same size", function() {
 
-  view.set('content', "a b".w());
+  SC.run(function () {
+    view.set('content', "a b".w());
+  });
   view.reset();
 
-  view.set('content', content2);
+  SC.run(function () {
+    view.set('content', content2);
+  });
   view.reload.expect(YES);
   view.contentPropertyDidChange.expect(0); // should not call
   view.computeLayout.expect(YES);
@@ -160,10 +170,14 @@ test("changing content with same size", function() {
 
 test("changing the content of a single item should reload that item", function() {
 
-  view.set('content', content1);
+  SC.run(function () {
+    view.set('content', content1);
+  });
   view.reset(); // don't care about this fire
 
-  content1.replace(1,1, ["X"]);
+  SC.run(function () {
+    content1.replace(1,1, ["X"]);
+  });
   view.reload.expect(SC.IndexSet.create(1));
   view.contentPropertyDidChange.expect(0); // should not call
   view.computeLayout.expect(YES);
@@ -172,11 +186,15 @@ test("changing the content of a single item should reload that item", function()
 
 test("changing the content of several items should reload each item", function() {
 
-  view.set('content', content1);
+  SC.run(function () {
+    view.set('content', content1);
+  });
   view.reset(); // don't care about this fire
 
-  content1.replace(1,1, ["X"]);
-  content1.replace(3,1, ["X"]);
+  SC.run(function () {
+    content1.replace(1,1, ["X"]);
+    content1.replace(3,1, ["X"]);
+  });
   view.reload.expect(SC.IndexSet.create(1).add(3));
   view.contentPropertyDidChange.expect(0); // should not call
   view.computeLayout.expect(YES);
@@ -185,11 +203,15 @@ test("changing the content of several items should reload each item", function()
 
 test("adding to end of content should reload new items", function() {
 
-  view.set('content', content1);
+  SC.run(function () {
+    view.set('content', content1);
+  });
   view.reset(); // don't care about this fire
 
-  content1.pushObject("X");
-  content1.pushObject("Y");
+  SC.run(function () {
+    content1.pushObject("X");
+    content1.pushObject("Y");
+  });
 
   view.reload.expect(SC.IndexSet.create(content1.get('length')-2, 2));
   view.contentPropertyDidChange.expect(0); // should not call
@@ -199,11 +221,15 @@ test("adding to end of content should reload new items", function() {
 
 test("removing from end of content should reload removed items", function() {
 
-  view.set('content', content1);
+  SC.run(function () {
+    view.set('content', content1);
+  });
   view.reset(); // don't care about this fire
 
-  content1.popObject();
-  content1.popObject();
+  SC.run(function () {
+    content1.popObject();
+    content1.popObject();
+  });
 
   view.reload.expect(SC.IndexSet.create(content1.get('length'), 2));
   view.contentPropertyDidChange.expect(0); // should not call
@@ -212,10 +238,14 @@ test("removing from end of content should reload removed items", function() {
 });
 
 test("inserting into middle should reload all following items", function() {
-  view.set('content', content1);
+  SC.run(function () {
+    view.set('content', content1);
+  });
   view.reset(); // don't care about this fire
 
-  content1.insertAt(3, 'FOO');
+  SC.run(function () {
+    content1.insertAt(3, 'FOO');
+  });
 
   view.reload.expect(SC.IndexSet.create(3, content1.get('length')-3));
   view.contentPropertyDidChange.expect(0); // should not call
@@ -228,7 +258,9 @@ test("inserting into middle should reload all following items", function() {
 //
 
 test("editing properties", function() {
-  view.set('content', content1);
+  SC.run(function () {
+    view.set('content', content1);
+  });
   view.reset();
   view.contentPropertyDidChange.reset();
 

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/itemViewForContentIndex.js

@@ -4,6 +4,7 @@
 //            portions copyright @2011 Apple Inc.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
+/*global ok, test, equals, module */
 
 var view, del, content ;
 
@@ -39,6 +40,7 @@ module("SC.CollectionView.itemViewForContentIndex", {
     };
 
     // NOTE: delegate methods above are added here.
+    SC.run(function () {
     view = SC.CollectionView.create(del, {
       content: content,
 
@@ -65,11 +67,13 @@ module("SC.CollectionView.itemViewForContentIndex", {
       },
 
       fixtureNowShowing: SC.IndexSet.create(0,3),
+
       computeNowShowing: function() {
         return this.fixtureNowShowing;
       }
 
     });
+    });
 
     // add in delegate mixin
     del = SC.mixin({}, SC.CollectionContent, del);
@@ -103,6 +107,29 @@ test("creating basic item view", function() {
   shouldMatchFixture(itemView, view.fixture);
 });
 
+test("isLast property", function () {
+  view.isVisibleInWindow = true;
+
+  var itemView = view.itemViewForContentIndex(1);
+  equals(itemView.get('isLast'), false, 'itemView.isLast should be false');
+
+  itemView = view.itemViewForContentIndex(2);
+  equals(itemView.get('isLast'), true, 'itemView.isLast should be true');
+
+  SC.run(function () {
+    view.beginPropertyChanges();
+    view.get('content').pushObject(SC.Object.create({ title: 'd' }));
+    view.set('fixtureNowShowing', SC.IndexSet.create(0, 4));
+    view.endPropertyChanges();
+  });
+
+  itemView = view.itemViewForContentIndex(3);
+  equals(itemView.get('isLast'), true, 'itemView.isLast should be true');
+
+  itemView = view.itemViewForContentIndex(2);
+  equals(itemView.get('isLast'), false, 'itemView.isLast for previous last item should be false');
+});
+
 test("returning item from cache", function() {
 
   var itemView1 = view.itemViewForContentIndex(1);
@@ -120,6 +147,34 @@ test("returning item from cache", function() {
 
 });
 
+// Tests support for the addition of designModes to SC.Pane and SC.View.  Since
+// SC.CollectionView doesn't use child views and thus doesn't call
+// SC.View:insertBefore, it needs to pass the designMode down to its item views
+// itself.
+test("set designMode on item views", function() {
+  var itemView,
+    updateDesignModeCount = 0;
+
+  view.set('exampleView', SC.View.extend({
+    updateDesignMode: function () {
+      updateDesignModeCount++;
+
+      sc_super();
+    }
+  }));
+
+  // Initial designMode before creating the item view.
+  view.set('designMode', 'small');
+  itemView = view.itemViewForContentIndex(1);
+  equals(itemView.get('designMode'), 'small', "itemView.designMode should be set to match the current value of the collection");
+  equals(updateDesignModeCount, 1, "updateDesignMode should have been called once on the itemView");
+
+  // Changes to designMode after creating the item view.
+  view.updateDesignMode('small', 'large');
+  equals(itemView.get('designMode'), 'large', "itemView.designMode should be set to match the current value of the collection");
+  equals(updateDesignModeCount, 2, "updateDesignMode should have been called once more on each itemView");
+});
+
 // ..........................................................
 // ALTERNATE WAYS TO GET AN EXAMPLE VIEW
 //
@@ -136,9 +191,10 @@ test("contentExampleViewKey is set and content has property", function() {
 });
 
 test("contentExampleViewKey is set and content is null", function() {
-  var CustomView = SC.View.extend();
   view.set('contentExampleViewKey', 'foo');
+  SC.run(function () {
   content.replace(1,1,[null]);
+  });
 
   var itemView = view.itemViewForContentIndex(1);
   ok(itemView, 'should return item view');
@@ -147,7 +203,6 @@ test("contentExampleViewKey is set and content is null", function() {
 });
 
 test("contentExampleViewKey is set and content property is empty", function() {
-  var CustomView = SC.View.extend();
   view.set('contentExampleViewKey', 'foo');
 
   var itemView = view.itemViewForContentIndex(1);
@@ -185,9 +240,10 @@ test("contentGroupExampleViewKey is set and content has property", function() {
 test("contentGroupExampleViewKey is set and content is null", function() {
   view.testAsGroup = YES ;
 
-  var CustomView = SC.View.extend();
   view.set('contentGroupExampleViewKey', 'foo');
+  SC.run(function () {
   content.replace(1,1,[null]);
+  });
 
   var itemView = view.itemViewForContentIndex(1);
   ok(itemView, 'should return item view');
@@ -199,7 +255,6 @@ test("contentGroupExampleViewKey is set and content is null", function() {
 test("contentGroupExampleViewKey is set and content property is empty", function() {
   view.testAsGroup = YES ;
 
-  var CustomView = SC.View.extend();
   view.set('contentGroupExampleViewKey', 'foo');
 
   var itemView = view.itemViewForContentIndex(1);
@@ -217,7 +272,10 @@ test("_contentGroupIndexes's cache should be properly invalidated", function() {
 
   ok(view.get('_contentGroupIndexes').isEqual(SC.IndexSet.create(0, 3)), "contentGroupIndexes should have correct initial value");
 
+  SC.run(function () {
   view.get('content').removeAt(2, 1);
+  });
+
   ok(view.get('_contentGroupIndexes').isEqual(SC.IndexSet.create(0, 2)), "contentGroupIndexes should have updated value after deletion");
 });
 
@@ -262,6 +320,24 @@ test("prefers delegate over content if both implement mixin", function() {
 // SPECIAL CASES
 //
 
+
+test("attempt to retrieve invalid indexes returns null", function () {
+  var itemView;
+
+  itemView = view.itemViewForContentIndex(null);
+  equals(itemView, null, 'Using index null should not return an item view');
+
+  itemView = view.itemViewForContentIndex(undefined);
+  equals(itemView, null, 'Using index undefined should not return an item view');
+
+  itemView = view.itemViewForContentIndex(-1);
+  equals(itemView, null, 'Using index -1 should not return an item view');
+
+  itemView = view.itemViewForContentIndex(view.get('length'));
+  equals(itemView, null, 'Using index %@ (length of content is %@) should not return an item view'.fmt(view.get('length'), view.get('length')));
+});
+
+
 test("after making an item visible then invisible again", function() {
 
   view.isVisibleInWindow = YES ;
@@ -352,3 +428,17 @@ test("canReorderContent sets isReorderable on the item views so they can visuall
   itemView = view.itemViewForContentIndex(1);
   equals(itemView.get('isReorderable'), false, 'itemView has isReorderable');
 });
+
+test("itemViewForContentObject", function() {
+  equals(view.itemViewForContentObject(content[0]).getPath('content.title'), 'a', "itemViewForContentObject returns 0th itemView for the 0th content object");
+
+  equals(view.itemViewForContentObject(SC.Object.create()), null, "itemViewForContentObject returns null for a object that is not in in its content");
+
+  var emptyContentCollection;
+  SC.run(function() {
+    emptyContentCollection = SC.CollectionView.create();
+  });
+
+  equals(emptyContentCollection.itemViewForContentObject(content[0]), null, "itemViewForContentObject returns null (without erroring) when it has no content.");
+
+});

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/collection/keyboard.js

@@ -0,0 +1,177 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            portions copyright @2011 Apple Inc.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+
+var controller = SC.ArrayController.create({
+	content: "1 2 3 4 5 6 7 8 9 10".w().map(function(x) {
+    return SC.Object.create({ value: x });
+  })
+});
+
+var pane = SC.ControlTestPane.design();
+pane.add('default', SC.CollectionView, {
+	content: controller.get('arrangedObjects')
+});
+
+/**
+  Simulates a key press on the specified view.
+
+  @param {SC.View} view the view
+  @param {Number} keyCode key to simulate
+  @param {Boolean} [isKeyPress] simulate key press event
+  @param {Boolean} [shiftKey] simulate shift key pressed
+  @param {Boolean} [ctrlKey] simulate ctrlKey pressed
+*/
+function keyPressOn(view, keyCode, isKeyPress, shiftKey, ctrlKey) {
+  var layer = view.get('layer'),
+    opts = {
+      shiftKey: !!shiftKey,
+      ctrlKey: !!ctrlKey,
+      keyCode: keyCode,
+      charCode: isKeyPress ? keyCode : 0,
+      which: keyCode
+    },
+    ev;
+
+  ok(layer, 'keyPressOn() precond - view %@ should have layer'.fmt(view.toString()));
+
+  ev = SC.Event.simulateEvent(layer, 'keydown', opts);
+  SC.Event.trigger(layer, 'keydown', [ev]);
+
+  if (isKeyPress) {
+    ev = SC.Event.simulateEvent(layer, 'keypress', opts);
+    SC.Event.trigger(layer, 'keypress', [ev]);
+  }
+
+  ev = SC.Event.simulateEvent(layer, 'keyup', opts);
+  SC.Event.trigger(layer, 'keyup', [ev]);
+  SC.RunLoop.begin().end();
+  layer = null;
+}
+
+module("SC.CollectionView Keyboard events and handlers", {
+	setup: function() {
+    pane.standardSetup().setup();
+	},
+	teardown: function() {
+		pane.standardSetup().teardown();
+	}
+});
+
+test("selectAll (ctrl+a handler)", function() {
+	SC.run(function() {
+		pane.view('default').selectAll();
+	});
+	equals(pane.view('default').getPath('selection.length'), 10, "selectAll selects all when allowsMultipleSelection is YES (default)");
+	SC.run(function() {
+		controller.set('allowsMultipleSelection', NO);
+		pane.view('default').set('selection', null);
+		pane.view('default').selectAll();
+	});
+	ok(!pane.view('default').getPath('selection.length'), "selectAll has no effect when allowsMultipleSelection is not set");
+
+	// Cleanup
+	controller.set('allowsMultipleSelection', YES);
+});
+
+test("deselectAll", function() {
+	var view = pane.view('default');
+	SC.run(function() {
+		view.selectAll();
+	});
+	equals(view.getPath('selection.length'), 10, "PRELIM: All items are selected");
+	SC.run(function() {
+		view.deselectAll();
+	});
+	equals(view.getPath('selection.length'), 0, "deselectAll clears the selection when allowsEmptySelection is YES (default)");
+	SC.run(function() {
+		view.selectAll();
+	})
+	equals(view.getPath('selection.length'), 10, "PRELIM: All items are re-selected");
+	SC.run(function() {
+		controller.set('allowsEmptySelection', NO);
+		view.deselectAll();
+	});
+	equals(view.getPath('selection.length'), 10, "deselectAll has no effect when allowsEmptySelection is NO")
+});
+
+// There was a specific bug in which insertNewLine when no selection was set, but
+// isEditable & canEditContent were true, that it would throw an exception.
+test("insertNewline doesn't throw exception when no selection", function() {
+	var collection = pane.view('default');
+
+	// Prep.
+	collection.set('isEditable', true);
+	collection.set('canEditContent', true);
+
+	SC.run(function() {
+		try {
+			collection.insertNewline();
+			ok(true, "Calling insertNewline without a selection should not throw an exception.");
+		} catch (ex) {
+			ok(false, "Calling insertNewline without a selection should not throw an exception. %@".fmt(ex));
+		}
+	});
+});
+
+test("moveDownAndModifySelection", function () {
+  var view = pane.view('default');
+
+  SC.run(function () {
+    pane.becomeKeyPane();
+    view.set('acceptsFirstResponder', true);
+    view.becomeFirstResponder();
+    view.select(1);
+  });
+  equals(view.getPath('selection.length'), 1, 'Should have a single selected row');
+  SC.run(function () {
+    keyPressOn(view, SC.Event.KEY_DOWN, false, true, false);
+  });
+  equals(view.getPath('selection.length'), 2, 'Should have an additional selected row');
+  SC.run(function () {
+    view.select(1);
+    controller.set('allowsMultipleSelection', false);
+  });
+  equals(view.getPath('selection.length'), 1, 'Should have a single selected row');
+  SC.run(function () {
+    keyPressOn(view, SC.Event.KEY_DOWN, false, true, false);
+  });
+  equals(view.getPath('selection.length'), 1, 'Should still have a single selected row');
+
+  // Cleanup
+  controller.set('allowsMultipleSelection', true);
+});
+
+test("moveUpAndModifySelection", function () {
+  var view = pane.view('default');
+
+  SC.run(function () {
+    pane.becomeKeyPane();
+    view.set('acceptsFirstResponder', true);
+    view.becomeFirstResponder();
+    view.select(1);
+  });
+  equals(view.getPath('selection.length'), 1, 'Should have a single selected row');
+  SC.run(function () {
+    keyPressOn(view, SC.Event.KEY_UP, false, true, false);
+  });
+  equals(view.getPath('selection.length'), 2, 'Should have an additional selected row');
+  SC.run(function () {
+    view.select(1);
+    controller.set('allowsMultipleSelection', false);
+  });
+  equals(view.getPath('selection.length'), 1, 'Should have a single selected row');
+  SC.run(function () {
+    keyPressOn(view, SC.Event.KEY_UP, false, true, false);
+  });
+  equals(view.getPath('selection.length'), 1, 'Should still have a single selected row');
+
+  // Cleanup
+  controller.set('allowsMultipleSelection', true);
+});
+
+// TODO: yeah all the other keyboard stuff.