sproutcore 1.10.3.1 → 1.11.0.rc1

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

@@ -27,26 +27,29 @@ var menu, anchor;
 
 module('SC.MenuPane Methods', {
   setup: function() {
-    menu = SC.MenuPane.create({
-      layout: { width: 206 },
-      items: items,
-
-      displayItemsCount: 0,
-      displayItemsDidChange: function() {
-        this.displayItemsCount++;
-      }.observes('displayItems')
-    });
-
-    anchor = SC.Pane.create({
-      layout: { top: 15, left: 15, width: 100, height: 100 }
+    SC.run(function () {
+      menu = SC.MenuPane.create({
+        layout: { width: 206 },
+        items: items,
+
+        displayItemsCount: 0,
+        displayItemsDidChange: function() {
+          this.displayItemsCount++;
+        }.observes('displayItems')
+      });
+
+      anchor = SC.Pane.create({
+        layout: { top: 15, left: 15, width: 100, height: 100 }
+      });
     });
   },
 
   teardown: function() {
-    menu.remove();
-    anchor.remove();
-    if (!menu.isDestroyed) { menu.destroy(); }
-    anchor.destroy();
+    SC.run(function () {
+      if (!menu.isDestroyed) { menu.destroy(); }
+      anchor.destroy();
+    });
+
     menu = anchor = null;
   }
 });
@@ -54,86 +57,100 @@ module('SC.MenuPane Methods', {
 test('popup() without anchor', function(){
   var layout;
 
-  menu.popup();
-  layout = menu.get('layout');
-  equals(layout.centerX, 0, 'menu should be horizontally centered');
-  equals(layout.centerY, 0, 'menu should be vertically centered');
-  equals(layout.width, 206, 'menu should maintain the width specified');
-  equals(layout.height, 184, 'menu height should resize based on item content');
-  menu.remove();
+  SC.run(function () {
+    menu.popup();
+    layout = menu.get('layout');
+    equals(layout.centerX, 0, 'menu should be horizontally centered');
+    equals(layout.centerY, 0, 'menu should be vertically centered');
+    equals(layout.width, 206, 'menu should maintain the width specified');
+    equals(layout.height, 184, 'menu height should resize based on item content');
+    menu.remove();
+  });
 });
 
 test('popup() with anchor', function(){
   var layout;
 
-  anchor.append();
-  menu.popup(anchor);
-  layout = menu.get('layout');
-  equals(layout.left, 16, 'menu should be aligned to the left of the anchor');
-  equals(layout.top, 119, 'menu should be positioned below the anchor');
-  equals(layout.width, 206, 'menu should maintain the width specified');
-  equals(layout.height, 184, 'menu height should resize based on item content');
-  menu.remove();
+  SC.run(function () {
+    anchor.append();
+    menu.popup(anchor);
+    layout = menu.get('layout');
+    equals(layout.left, Math.max(16, menu.windowPadding), 'menu should be aligned to the left of the anchor (beyond windowPadding)');
+    equals(layout.top, 119, 'menu should be positioned below the anchor');
+    equals(layout.width, 206, 'menu should maintain the width specified');
+    equals(layout.height, 184, 'menu height should resize based on item content');
+    menu.remove();
+  });
 });
 
 test('displayItems', function() {
-  var strings = ['Alpha', 'Beta', 'Gaga'], output, count;
+  var strings = ['Alpha', 'Beta', 'Gaga'],
+    output, count;
 
   menu.menuHeight = 1;
-  menu.set('items', strings);
-  equals(menu.displayItemsCount, 1, 'displayItems should change when items array changes');
-  ok(menu.get('menuHeight') > 1, 'menuHeight should be recalculated when displayItems changes');
-
-  output = menu.get('displayItems')[0];
-  equals(SC.typeOf(output), SC.T_OBJECT, 'strings should be transformed into objects');
-  equals(output.title, 'Alpha', 'title property of transformed object should match original string');
-  equals(output.value, 'Alpha', 'value property of transformed object should match original string');
-  equals(output.isEnabled, YES, 'isEnabled property of transformed object should be YES');
-
-  var hashes = [
-    { title: 'Yankee' },
-    { title: 'Hotel' },
-    { title: 'Foxtrot' } ];
-  menu.set('items', hashes);
-
-  output = menu.get('displayItems')[0];
-  equals(SC.typeOf(output), SC.T_OBJECT, 'displayItems should convert hashes to objects');
-  equals(output.get('title'), 'Yankee', 'object properties should correspond to hash properties');
-
-  var objects = [
-    SC.Object.create({ title: 'Whiskey' }),
-    SC.Object.create({ title: 'Mystics' }),
-    SC.Object.create({ title: 'Men' })
-  ];
-  menu.set('items', objects);
-
-  output = menu.get('displayItems')[0];
-  equals(SC.typeOf(output), SC.T_OBJECT, 'displayItems should not convert objects');
-  equals(SC.guidFor(output), SC.guidFor(objects[0]), 'objects should be identical to provided objects');
+  SC.run(function () {
+    items.pushObject({ title: 'Added Menu Item' });
+    equals(menu.displayItemsCount, 1, 'displayItems should change when items content changes');
+    ok(menu.get('menuHeight') > 1, 'menuHeight should be recalculated when displayItems changes');
+
+    menu.set('items', strings);
+    equals(menu.displayItemsCount, 2, 'displayItems should change when items property changes');
+
+    output = menu.get('displayItems')[0];
+    equals(SC.typeOf(output), SC.T_OBJECT, 'strings should be transformed into objects');
+    equals(output.title, 'Alpha', 'title property of transformed object should match original string');
+    equals(output.value, 'Alpha', 'value property of transformed object should match original string');
+    equals(output.isEnabled, YES, 'isEnabled property of transformed object should be YES');
+
+    var hashes = [
+      { title: 'Yankee' },
+      { title: 'Hotel' },
+      { title: 'Foxtrot' } ];
+    menu.set('items', hashes);
+
+    output = menu.get('displayItems')[0];
+    equals(SC.typeOf(output), SC.T_OBJECT, 'displayItems should convert hashes to objects');
+    equals(output.get('title'), 'Yankee', 'object properties should correspond to hash properties');
+
+    var objects = [
+      SC.Object.create({ title: 'Whiskey' }),
+      SC.Object.create({ title: 'Mystics' }),
+      SC.Object.create({ title: 'Men' })
+    ];
+    menu.set('items', objects);
+
+    output = menu.get('displayItems')[0];
+    equals(SC.typeOf(output), SC.T_OBJECT, 'displayItems should not convert objects');
+    equals(SC.guidFor(output), SC.guidFor(objects[0]), 'objects should be identical to provided objects');
+  });
 });
 
 test('displayItems - Edge Cases', function() {
-  menu.set('items', [null, null, false, 0, 'Real Item']);
+  SC.run(function () {
+    menu.set('items', [null, null, false, 0, 'Real Item']);
 
-  var output = menu.get('displayItems');
-  equals(output.get('length'), 1, 'displayItems should strip out invalid items');
+    var output = menu.get('displayItems');
+    equals(output.get('length'), 1, 'displayItems should strip out invalid items');
 
-  menu.set('items', ['Yellow', { title: 'Country' }, SC.Object.create({ title: 'Teeth' })]);
-  output = menu.get('displayItems');
+    menu.set('items', ['Yellow', { title: 'Country' }, SC.Object.create({ title: 'Teeth' })]);
+    output = menu.get('displayItems');
 
-  ok(output[0].title === 'Yellow' && output[1].title === 'Country' && output[2].title === 'Teeth',
-     'displayItems should accept a mix of supported item types');
+    ok(output[0].title === 'Yellow' && output[1].title === 'Country' && output[2].title === 'Teeth',
+       'displayItems should accept a mix of supported item types');
 
-  menu.set('items', []);
-  equals(menu.getPath('displayItems.length'), 0, 'displayItems should be empty if items is empty');
-  menu.set('items', null);
-  equals(menu.get('displayItems'), null, 'displayItems should be null if items is null');
+    menu.set('items', []);
+    equals(menu.getPath('displayItems.length'), 0, 'displayItems should be empty if items is empty');
+    menu.set('items', null);
+    equals(menu.get('displayItems'), null, 'displayItems should be null if items is null');
+  });
 });
 
 test('menuItemViewForContentIndex', function() {
-  menu.popup();
-  var view = menu.menuItemViewForContentIndex(0);
-  equals(items[0].title, view.$('.value').text(), 'menu item views should match content items');
+  SC.run(function () {
+    menu.popup();
+    var view = menu.menuItemViewForContentIndex(0);
+    equals(items[0].title, view.$('.value').text(), 'menu item views should match content items');
+  });
 });
 
 
@@ -143,8 +160,10 @@ test('destroy should destroy the menu view', function () {
   var menuView = menu._menuView,
     menuItemView = menu.get('menuItemViews')[0];
 
-  menu.popup();
-  menu.destroy();
+  SC.run(function () {
+    menu.popup();
+    menu.destroy();
+  });
 
   ok(menuView.get('isDestroyed'), 'destroying the menu pane also destroys the menu view.');
   ok(menuItemView.get('isDestroyed'), 'destroying the menu pane also destroys the menu view child views.');

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

@@ -71,7 +71,7 @@ module('SC.MenuPane UI', {
 */
 function clickOn(view, shiftKey, ctrlKey) {
   var layer    = view.get('layer'),
-      opts     = { shiftKey: !!shiftKey, ctrlKey: !!ctrlKey },
+      opts     = { shiftKey: !!shiftKey, ctrlKey: !!ctrlKey, which: 1 },
       ev;
 
   ok(layer, 'clickOn() precond - view %@ should have layer'.fmt(view.toString()));
@@ -276,6 +276,16 @@ test('Basic Submenus', function () {
       smallMenu.remove();
     });
     ok(!subMenu.get('isVisibleInWindow'), 'submenus should close if their parent menu is closed');
+    equals(subMenu.getPath('items.length'), 2, 'submenus should have 2 items');
+
+    menuItem.get('content').set('subMenu', [{ title: 'Submenu item 3' }]);
+    subMenu = menuItem.get('subMenu');
+    equals(subMenu.getPath('items.length'), 1, 'submenus should have 1 item');
+
+    smallMenu.destroy();
+    ok(smallMenu.get('isDestroyed'), 'smallMenu should be destroyed');
+    ok(menuItem.get('isDestroyed'), 'menuItem should be destroyed');
+    ok(subMenu.get('isDestroyed'), 'submenus should be destroyed');
     start();
   }, 150);
 });
@@ -435,3 +445,53 @@ test('aria-checked attribute', function () {
   clickOn(menuPane);
 });
 
+test('Menu item keys', function () {
+  var menuPane,
+    items,
+    submenu,
+    menuItem;
+
+  submenu = [
+    { title: 'Submenu item' }
+  ];
+
+  items = [
+    {
+      TheTitle: 'Menu item',
+      TheValue: 1,
+      TheToolTip: 'Menu tooltip',
+      AmIEnabled: false,
+      MyIcon: 'folder',
+      MyHeight: 50,
+      MySubmenu: submenu,
+      AmIASeparator: false
+    }
+  ];
+
+  SC.run(function () {
+    menuPane = SC.MenuPane.create({
+      layout: { width: 200 },
+      items: items,
+      itemTitleKey: 'TheTitle',
+      itemValueKey: 'TheValue',
+      itemToolTipKey: 'TheToolTip',
+      itemIsEnabledKey: 'AmIEnabled',
+      itemIconKey: 'MyIcon',
+      itemSubMenuKey: 'MySubmenu',
+      itemSeparatorKey: 'AmIASeparator'
+    });
+
+    menuPane.popup();
+  });
+
+  menuItem = menuPane.get('menuItemViews')[0];
+
+  equals(menuItem.get('title'), 'Menu item');
+  equals(menuItem.get('value'), 1);
+  equals(menuItem.get('toolTip'), 'Menu tooltip');
+  equals(menuItem.get('isEnabled'), false);
+  equals(menuItem.get('icon'), 'folder');
+  ok(SC.kindOf(menuItem.get('subMenu'), SC.MenuPane));
+  equals(menuItem.get('isSeparator'), false);
+  clickOn(menuPane);
+});

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

@@ -20,9 +20,13 @@ test("PanelPane destroy", function() {
   var pane = SC.PanelPane.create({
     isModal: YES
   });
-  pane.append();
-  pane.remove();
-  pane.destroy();
+  SC.run(function () {
+    pane.append();
+  });
+
+  SC.run(function () {
+    pane.destroy();
+  });
 
   var end = getViewCount();
   equals(start, end, "No extra views lying about after calling .destroy");

data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/panel/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 */
 
 module("SC.PanelPane UI");
 
@@ -16,7 +16,9 @@ test("verify panel content container is visible at correct location with right s
     layout: { width: 400, height: 200, centerX: 0, centerY: 0 },
     contentView: SC.View
   });
-  pane.append();
+  SC.run(function () {
+    pane.append();
+  });
 
   ok(pane.get('isVisibleInWindow'), 'pane.isVisibleInWindow should be YES');
   ok(pane.$().hasClass('sc-panel'), 'pane should have sc-panel class');
@@ -34,21 +36,25 @@ test("verify panel content container is visible at correct location with right s
   equals(ret.marginLeft, -pw/2+'px', 'pane should shift-left %@ px'.fmt(-pw/2));
   equals(ret.marginTop, -ph/2+'px', 'pane should shift-top %@ px'.fmt(-ph/2));
 
-  pane.remove();
-  pane.destroy();
-}) ;
+  SC.run(function () {
+    pane.destroy();
+  });
+});
 
 test("Verify panel pane has aria role set", function() {
   var pane = SC.PanelPane.create({
     layout: { width: 400, height: 200, centerX: 0, centerY: 0 },
     contentView: SC.View
   });
-  pane.append();
+  SC.run(function () {
+    pane.append();
+  });
 
   equals(pane.$().attr('role'), 'dialog', "panel pane has role attribute set");
 
-  pane.remove();
-  pane.destroy();
+  SC.run(function () {
+    pane.destroy();
+  });
 });
 
 test("Verify panel pane has aria-label attribute set, when ariaLabel is provided", function() {
@@ -57,12 +63,15 @@ test("Verify panel pane has aria-label attribute set, when ariaLabel is provided
     contentView: SC.View,
     ariaLabel: "Panel is labelled by this value for voiceover"
   });
-  pane.append();
+  SC.run(function () {
+    pane.append();
+  });
 
   equals(pane.$().attr('aria-label'), 'Panel is labelled by this value for voiceover', "panel pane has aria-labelledby attribute set");
 
-  pane.remove();
-  pane.destroy();
+  SC.run(function () {
+    pane.destroy();
+  });
 });
 
 test("Verify panel pane's modal pane lifecycle", function() {
@@ -72,33 +81,41 @@ test("Verify panel pane's modal pane lifecycle", function() {
     isModal: YES
   });
   ok(pane.get('modalPane').isClass, "Modal pane class is not instantiated before is panel is appended.");
-  pane.append();
+  SC.run(function () {
+    pane.append();
+  });
   var modal = pane.get('modalPane');
   ok(!modal.isClass, "Modal pane class is instantiated when the panel is appended.");
   ok(modal.get('viewState') === SC.CoreView.ATTACHED_SHOWN, "Modal pane appends when panel pane is appended.");
-  pane.remove();
+  SC.run(function () {
+    pane.remove();
+  });
   ok(modal.get('viewState') & SC.CoreView.UNATTACHED, "Modal pane is removed when panel pane is removed.");
-  pane.destroy();
+  SC.run(function () {
+    pane.destroy();
+  });
   ok(modal.get('isDestroyed'), "Modal pane is destroyed when its panel pane is destroyed.");
 
 });
 
 test("Verify SC.PanelPane#isModal", function() {
-  SC.RunLoop.begin();
   var pane = SC.PanelPane.create({
     contentView: SC.View,
     modalPane: SC.ModalPane.create(),
     isModal: NO
   });
-  pane.append();
+  SC.run(function () {
+    pane.append();
+  });
   equals(pane.getPath('modalPane.viewState'), SC.CoreView.UNRENDERED, "Panel pane does not use modal pane when isModal is NO");
   pane.set('isModal', YES);
   equals(pane.getPath('modalPane.viewState'), SC.CoreView.ATTACHED_SHOWN, "Panel pane appends modal pane when isModal becomes YES");
   pane.set('isModal', NO);
   equals(pane.getPath('modalPane.viewState'), SC.CoreView.UNATTACHED, "Panel pane removes modal pane when isModal becomes NO");
 
-
-  pane.destroy()
+  SC.run(function () {
+    pane.destroy();
+  });
 
   // Tests an edge case where isModal turns YES during a transition out.
   pane = SC.PanelPane.create({
@@ -108,10 +125,18 @@ test("Verify SC.PanelPane#isModal", function() {
     transitionOut: SC.View.FADE_OUT,
     transitionOutOptions: { duration: 0.1 }
   });
-  pane.append();
-  pane.remove(); // trigger transition and then willRemoveFromDocument
+
+  SC.run(function () {
+    pane.append();
+
+    pane.remove(); // trigger transition and then willRemoveFromDocument
+  });
   pane.set('isModal', YES);
   equals(pane.getPath('modalPane.viewState'), SC.CoreView.UNRENDERED, "Panel pane does not add modal pane when isModal becomes YES while transitioning out");
-  pane.destroy();
-  SC.RunLoop.end();
+
+  SC.run(function () {
+    pane.destroy();
+
+    equals(pane.get('viewState'), SC.CoreView.UNRENDERED);
+  });
 });