sproutcore 1.10.3.1 → 1.11.0.rc1

data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/picker/methods.js

@@ -5,7 +5,7 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-/*global module test htmlbody ok equals same stop start target */
+/*globals module, test, ok, equals, target */
 
 window.target = null;
 
@@ -43,7 +43,9 @@ test("check default action on pane#mouseDown", function() {
       layout: { top: 0, left: 0, bottom: 0, right: 0 }
     })
   });
-  pane.popup(anchor.view('anchor'), SC.PICKER);
+  SC.run(function () {
+    pane.popup(anchor.view('anchor'), SC.PICKER);
+  });
 
   ok(pane.get('isVisibleInWindow'), 'pane.isVisibleInWindow should be YES');
 
@@ -51,7 +53,9 @@ test("check default action on pane#mouseDown", function() {
 
   ok(!pane.get('isVisibleInWindow'), 'pane.isVisibleInWindow should be NO after mouseDown');
 
-  pane.destroy();
+  SC.run(function () {
+    pane.destroy();
+  });
 }) ;
 
 test("check action on pane#mouseDown with removeAction set", function() {
@@ -68,7 +72,10 @@ test("check action on pane#mouseDown with removeAction set", function() {
       this.remove();
     }
   });
-  pane.popup(anchor.view('anchor'), SC.PICKER);
+
+  SC.run(function () {
+    pane.popup(anchor.view('anchor'), SC.PICKER);
+  });
 
   ok(pane.get('isVisibleInWindow'), 'pane.isVisibleInWindow should be YES');
 
@@ -76,9 +83,10 @@ test("check action on pane#mouseDown with removeAction set", function() {
 
   ok(!pane.get('isVisibleInWindow'), 'pane.isVisibleInWindow should be NO after mouseDown');
   ok(pane.get('fooInvoked'), 'pane.fooInvoked should be YES after mouseDown');
-
-  pane.destroy();
-}) ;
+  SC.run(function () {
+    pane.destroy();
+  });
+});
 
 test("check action on pane#mouseDown with removeAction and removeTarget set", function() {
   pane = SC.PickerPane.create({
@@ -90,7 +98,9 @@ test("check action on pane#mouseDown with removeAction and removeTarget set", fu
     removeAction: 'foo',
     removeTarget: target
   });
-  pane.popup(anchor.view('anchor'), SC.PICKER);
+  SC.run(function () {
+    pane.popup(anchor.view('anchor'), SC.PICKER);
+  });
 
   ok(pane.get('isVisibleInWindow'), 'pane.isVisibleInWindow should be YES');
 
@@ -100,5 +110,52 @@ test("check action on pane#mouseDown with removeAction and removeTarget set", fu
   ok(target.get('fooInvoked'), 'target.fooInvoked should be YES');
   ok(target.get('sender'), pane, 'target.sender should be pane');
 
-  pane.destroy();
+  SC.run(function () {
+    pane.destroy();
+  });
 }) ;
+
+test("Verify setting anchorElement.", function() {
+  var anchorView = anchor.view('anchor'),
+      anchorElement = anchorView.get('layer'),
+      $anchorElement = $(anchorElement);
+
+  pane = SC.PickerPane.create({
+    layout: { width: 300, height: 200 },
+    contentView: SC.View.extend({
+      layout: { top: 0, left: 0, bottom: 0, right: 0 }
+    })
+  });
+
+  pane.set('anchorElement', anchorView);
+
+  ok(pane.get('anchorElement') === anchorElement, 'Setting anchorElement to a view successfully translates it to its element.');
+
+  pane.set('anchorElement', anchorElement);
+
+  ok(pane.get('anchorElement') === anchorElement, 'Setting anchorElement to an element succeeds.');
+
+  pane.set('anchorElement', $anchorElement);
+
+  ok(pane.get('anchorElement') === anchorElement, 'Setting anchorElement to a jQuery object succeeds.');
+
+  SC.run(function () {
+    pane.destroy();
+  });
+});
+
+test("SC.PickerPane#popup correctly returns the receiver.", function() {
+  var pane = SC.PickerPane.create(),
+    ret;
+
+  SC.run(function () {
+    ret = pane.popup();
+  });
+
+  equals(pane, ret, 'SC.Pane#popup returns the receiver');
+
+  // Clean up.
+  SC.run(function () {
+    pane.destroy();
+  });
+});

data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/picker/ui.js

@@ -5,7 +5,7 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-/*global module, test, clearHtmlbody, htmlbody, ok, equals, same, stop, start */
+/*globals module, test, clearHtmlbody, htmlbody, ok, equals, same, stop, start */
 
 
 function evaluatePicker(pane) {
@@ -32,6 +32,7 @@ module("SC.PickerPane UI", {
     htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
     anchor.standardSetup().setup();
   },
+
   teardown: function () {
     anchor.standardSetup().teardown();
     clearHtmlbody();
@@ -55,8 +56,10 @@ test("verify default picker pane content container is visible at correct locatio
     paneDefault.popup(anchor.view('anchor'), SC.PICKER);
   });
   evaluatePicker(paneDefault);
-  paneDefault.remove();
-  paneDefault.destroy();
+
+  SC.run(function () {
+    paneDefault.destroy();
+  });
 });
 
 test("verify default picker pane content container is visible at correct location with right size (live resize)", function () {
@@ -84,8 +87,9 @@ test("verify default picker pane content container is visible at correct locatio
   equals(newLayout.height, 300, "The new height should be");
   equals(newLayout.top, firstLayout.top - 100, "The new top should be");
 
-  paneDefault.remove();
-  paneDefault.destroy();
+  SC.run(function () {
+    paneDefault.destroy();
+  });
 });
 
 test("verify menu picker pane content container is visible at correct location with right size", function () {
@@ -99,8 +103,10 @@ test("verify menu picker pane content container is visible at correct location w
     paneMenu.popup(anchor.view('anchor'), SC.PICKER_MENU);
   });
   evaluatePicker(paneMenu);
-  paneMenu.remove();
-  paneMenu.destroy();
+
+  SC.run(function () {
+    paneMenu.destroy();
+  });
 });
 
 test("verify fixed picker pane content container is visible at correct location with right size", function () {
@@ -115,8 +121,10 @@ test("verify fixed picker pane content container is visible at correct location
     paneFixed.popup(anchor.view('anchor'), SC.PICKER_FIXED);
   });
   evaluatePicker(paneFixed);
-  paneFixed.remove();
-  paneFixed.destroy();
+
+  SC.run(function () {
+    paneFixed.destroy();
+  });
 });
 
 test("verify pointer picker pane content container is visible at correct location with right size", function () {
@@ -130,6 +138,8 @@ test("verify pointer picker pane content container is visible at correct locatio
     panePointer.popup(anchor.view('anchor'), SC.PICKER_POINTER, [3, 0, 1, 2, 2]);
   });
   evaluatePicker(panePointer);
-  panePointer.remove();
-  panePointer.destroy();
+
+  SC.run(function () {
+    panePointer.destroy();
+  });
 });

data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/sheet/ui.js

@@ -5,7 +5,7 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-/*global module test htmlbody ok equals same stop start */
+/*globals module, test, ok, equals, stop, start */
 
 module("SC.SheetPane UI");
 
@@ -18,32 +18,26 @@ test("verify sheet pane slide down works", function() {
     })
   });
 
-  var layout = slidePane.get('layout');
-  var pt = layout.top;
-  var pl = layout.left;
-  var pw = layout.width;
-  var ph = layout.height;
-  var ret = slidePane.layoutStyle();
-
-  slidePane.append();
+  SC.run(function () {
+    slidePane.append();
+  });
   var f = function() {
     // make sure all fo the timers have had an opportunity to fire
-    SC.RunLoop.begin().end();
-    equals(slidePane.get('layout').top, 0, 'pane should be displayed at default position top after animating');
+    equals(slidePane.get('frame').y, 0, 'pane should be displayed at default position top after animating');
     ok(slidePane.get('isVisibleInWindow'), 'pane.isVisibleInWindow should be YES');
     ok(slidePane.$().hasClass('sc-sheet'), 'pane should have sc-sheet class');
     ok(slidePane.childViews[0].get('isVisibleInWindow'), 'pane.div.isVisibleInWindow should be YES');
     ok(slidePane.childViews[0].$().hasClass('sc-view'), 'pane.div should have sc-view class');
-    SC.RunLoop.begin();
-    slidePane.remove();
-    slidePane.destroy();
-    SC.RunLoop.end();
 
-    window.start();
+    SC.run(function () {
+      slidePane.destroy();
+    });
+
+    start();
   };
 
-  stop(800);
+  stop(1200);
 
-  setTimeout(f, 400);
+  setTimeout(f, 800);
 
 });

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/button/methods.js

@@ -14,29 +14,31 @@ module("SC.ButtonView#actions", {
 test("Emulate mouse click to verify if the button activates", function() {
   b.triggerActionAfterDelay();
   equals(b.get('isActive'), YES, "the should be active for 200ms");
-  
+
 });
 
 
 test("Test different moused states", function() {
   b.set('isEnabled', YES);
-  b.mouseDown();
+
+  var evt = SC.Event.simulateEvent(b.get('layer'), 'mousedown', { which: 1 });
+  b.mouseDown(evt);
   equals(b.get('isActive'), YES, "the button should be active after a mouseDown event");
   b.mouseExited();
   equals(b.get('isActive'), NO, "the button should be active after a mouseDown event");
   b.mouseEntered();
-  equals(b.get('isActive'), b._isMouseDown, "the button should be active after a mouseDown event");  
+  equals(b.get('isActive'), b._isMouseDown, "the button should be active after a mouseDown event");
 //  b.mouseUp();
 //  equals(b.get('isActive'), NO, "the button should be inactive after a mouseUP event");
 
   b.set('buttonBehavior', SC.TOGGLE_BEHAVIOR);
   b._action();
   equals(b.get('value'), b.get('toggleOnValue'), "the value should be the same as the toggle value");
- 
+
   b.set('buttonBehavior', SC.TOGGLE_ON_BEHAVIOR);
   b._action();
   equals(b.get('value'), b.get('toggleOnValue'), "the value should be the same as the toggle value");
-  
+
   b.set('buttonBehavior', SC.TOGGLE_OFF_BEHAVIOR);
   b._action();
   equals(b.get('value'), b.get('toggleOffValue'), "the value should be the same as the toggle value");
@@ -44,7 +46,7 @@ test("Test different moused states", function() {
 
 test("Actions should be sent up the responder chain", function() {
   var timeout = NO;
-  
+
   // create a pane to test with. It has a child view, and under that, a button.
   // the button sends an action up to its parent. We hope. :)
   var pane = SC.Pane.create({
@@ -55,7 +57,7 @@ test("Actions should be sent up the responder chain", function() {
         setTimeout(function() {
           clearTimeout(timeout);
           start();
-          
+
           pane.remove();
           ok(YES, "method on parent should have been called");
         }, 1);
@@ -65,23 +67,23 @@ test("Actions should be sent up the responder chain", function() {
         action: "methodOnParent"
       })
     }),
-    
+
     rootResponder: SC.RootResponder.responder
   });
-  
+
   // the pane has to be in DOM for this to work, apparently.
   pane.append();
-  
+
   // use async API
   stop();
-  
+
   timeout = setTimeout(function() {
     start();
     ok(false, "Timeout.");
     pane.remove();
   }, 1000);
-  
-  pane.v.b._action();  
+
+  pane.v.b._action();
 
 });
 
@@ -140,7 +142,8 @@ test("Test action repeats while active", function(){
 });
 
 test("Test action happens on mouseDown", function(){
-  b.mouseDown();
+  var evt = SC.Event.simulateEvent(b.get('layer'), 'mousedown', { which: 1 });
+  b.mouseDown(evt);
   equals(counter.get('value'), 1, "should have run once");
   b.set('isActive', NO); // Stops triggering
 });

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/button/ui.js

@@ -215,7 +215,8 @@ test("mouseDown and then mouseUp anywhere in the button should toggle the aria-p
   var b = pane.view('aria-pressed');
   var elem = b.get('layer');
 
-  SC.Event.trigger(elem, 'mousedown');
+  var evt = SC.Event.simulateEvent(elem, 'mousedown', { which: 1 });
+  SC.Event.trigger(elem, 'mousedown', [evt]);
   equals(b.$().attr('aria-pressed'), 'true', 'aria-pressed should be true when mousedown');
 
   SC.Event.trigger(elem,'mouseup');

data/lib/frameworks/sproutcore/frameworks/desktop/tests/views/checkbox/methods.js

@@ -35,7 +35,7 @@
       SC.RunLoop.end();
 
       view = pane.childViews[0];
-    }, 
+    },
 
     teardown: function() {
       pane.remove();
@@ -89,7 +89,7 @@
     ok(view.get('isSelected'), 'isSelected should match value');
     ok(view.$().hasClass('sel'), 'should have sel class');
 
-    // update value -- make sure isSelected changes.  
+    // update value -- make sure isSelected changes.
     SC.RunLoop.begin();
     view.set('value', 0); // make falsy. (but not NO exactly)
     SC.RunLoop.end();
@@ -109,11 +109,13 @@
   });
 
   test("mouseDown and then mouseUp anywhere in the checkbox should toggle the selection", function() {
-    var elem = view.get('layer');
+    var elem = view.get('layer'),
+      evt;
 
     ok(!triggered, 'precond - action should not have been triggered yet');
 
-    SC.Event.trigger(elem, 'mousedown');
+    evt = SC.Event.simulateEvent(elem, 'mousedown', { which: 1 });
+    SC.Event.trigger(elem, 'mousedown', [evt]);
     ok(view.get('isActive'), 'view should be active');
     ok(view.get('value'), 'value should not change yet');
     equals(view.$().attr('aria-checked'), 'true', 'aria-checked should be true');
@@ -136,9 +138,10 @@
     SC.RunLoop.end();
 
     ok(view.get('value'), 'precond - value should be true');
-    view.mouseDown();
+    var evt = SC.Event.simulateEvent(view.get('layer'), 'mousedown', { which: 1 });
+    view.mouseDown(evt);
     view.mouseUp();
     ok(view.get('value'), 'value should not change when clicked');
   });
-  
+
 })();

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

@@ -5,39 +5,44 @@
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
-var view, exampleView;
+// Note that as of 1.10, the SC.CollectionView fast path is turned on by default.
 
-module("SC.CollectionFastPath", {
-  setup: function() {
-
-    SC.run(function () {
-      view = SC.CollectionView.create({
-        content: "a b c d e f".w().map(function(x) {
-          return SC.Object.create({ title: x });
-        }),
-        // STUB: reloadIfNeeded
-        reloadIfNeeded: CoreTest.stub('reloadIfNeeded', SC.CollectionView.prototype.reloadIfNeeded)
-      });
-    });
-
-    exampleView = SC.View.extend({});
+var pane = SC.ControlTestPane.design()
+  .add('group-item-test', SC.CollectionView, {
+      content: [
+        SC.Object.create({ title: 'a' }),
+        SC.Object.create({ title: 'b' })
+      ]
+  });
 
+module("SC.CollectionView fast path", {
+  setup: function() {
+    pane.standardSetup().setup();
   },
 
   teardown: function() {
-    view.destroy();
-    view = exampleView = null;
+    pane.standardSetup().teardown();
   }
 });
 
 
 /**
-  There was a bug that if you called itemViewForContentIndex() on a Collection
-  with SC.CollectionFastPath mixed in BEFORE it was visible, it would throw an
-  exception (because this._mapView wasn't initialized properly in
-  CollectionFastPath).
+  There was a bug that if you called itemViewForContentIndex() on a fast-path
+  SC.CollectionView BEFORE it was visible, it would throw an exception (because
+  this._mapView wasn't initialized properly in fast-path mode).
 */
 test("Calling itemViewForContentIndex() before the Collection is visible.", function() {
+  var view;
+  SC.run(function() {
+    view = SC.CollectionView.create({
+      content: "a b c d e f".w().map(function(x) {
+        return SC.Object.create({ title: x });
+      }),
+      // STUB: reloadIfNeeded
+      reloadIfNeeded: CoreTest.stub('reloadIfNeeded', SC.CollectionView.prototype.reloadIfNeeded)
+    });
+  });
+
   try {
     var itemView = view.itemViewForContentIndex(0);
     ok(true, 'Requesting itemViewForContentIndex() should not throw an exception prior to reloadIfNeeded being called.');
@@ -61,4 +66,32 @@ test("Calling itemViewForContentIndex() before the Collection is visible.", func
   } catch (ex) {
     ok(false, 'Requesting itemViewForContentIndex() should not throw an exception after reloadIfNeeded being called.');
   }
+
+  view.destroy();
+});
+
+test("Changing a pooled item view's group view status.", function() {
+  var view = pane.view('group-item-test'),
+      childView = view.childViews[0];
+
+  // Test the example view for isGroupView and 'sc-item'.
+  ok(!childView.get('isGroupView'), 'Item view should have "isGroupView" property set to NO.');
+  ok(childView.get('classNames').contains('sc-item'), 'Item view should have "sc-item" class in classNames list.');
+  ok(!childView.get('classNames').contains('sc-group-item'), 'Item view should not have "sc-group-item" class in classNames list.');
+  ok(childView.$().hasClass('sc-item'), 'Item view should have "sc-item" class on its element.');
+  ok(!childView.$().hasClass('sc-group-item'), 'Item view should not have "sc-group-item" class on its element.');
+
+  // Change all childViews to groups.
+  view._contentIndexIsGroup = function() { return YES; };
+  SC.run(function() {
+    view.reload();
+  });
+
+  ok(childView.get('isGroupView'), 'Group view should have "isGroupView" property set to YES.');
+  ok(!childView.get('classNames').contains('sc-item'), 'Group view should not have "sc-item" class in classNames list.');
+  ok(childView.get('classNames').contains('sc-group-item'), 'Group view should have "sc-group-item" class in classNames list.');
+  ok(!childView.$().hasClass('sc-item'), 'Group view should not have "sc-item" class on its element.');
+  ok(childView.$().hasClass('sc-group-item'), 'Group view should have "sc-group-item" class on its element.');
+
+
 });