sproutcore 1.9.2 → 1.10.0.rc.1

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

@@ -11,7 +11,7 @@ module("SC.PalettePane UI");
 
 var pane ;
 
-test("verify palette pane content container is visible at correct location with right size", function() { 
+test("verify palette pane content container is visible at correct location with right size", function() {
   pane = SC.PalettePane.create({
     layout: { width: 400, height: 200, right: 20, top: 0 },
     contentView: SC.View.extend({
@@ -23,7 +23,7 @@ test("verify palette pane content container is visible at correct location with
   ok(pane.$().hasClass('sc-palette'), 'pane should have sc-palette class');
   ok(pane.childViews[0].get('isVisibleInWindow'), 'pane.div.isVisibleInWindow should be YES');
   ok(pane.childViews[0].$().hasClass('sc-view'), 'pane.div should have sc-view class');
-  
+
   var ret = pane.layoutStyle();
 
   equals(ret.top, '0px', 'pane should be initiated at default position top including shadow');
@@ -32,4 +32,5 @@ test("verify palette pane content container is visible at correct location with
   equals(ret.height, '200px', 'pane should have height 200px');
 
   pane.remove();
+  pane.destroy();
 }) ;

data/lib/frameworks/sproutcore/frameworks/desktop/tests/panes/pane_page.js

@@ -11,21 +11,23 @@ module('SC.Pane-SC.Page') ;
 
 test("isVisible changes should update views that are instantiated in a page", function() {
   var page = SC.Page.design({
+
     inspector: SC.PickerPane.design({
       layout: { width: 300, height: 300, centerX: 0 },
       contentView: SC.View.extend({
         layout: { top: 0, left: 0, bottom: 0, right: 0 },
-        childViews: 'labelView'.w(),
+        childViews: ['labelView'],
 
         labelView: SC.LabelView.extend({
           layout: { centerY: -10, height: 24, left: 0, right: 0 },
           value: "PrefPane"
         })
-      })  
+      })
     })
-  }) ;
-  
-  
+
+  });
+
+
   var pp = page.get('inspector');
   pp.append();
   SC.RunLoop.begin().end();
@@ -37,6 +39,8 @@ test("isVisible changes should update views that are instantiated in a page", fu
   SC.RunLoop.begin().end();
   var res = pp.childViews[0].childViews[0].$().hasClass('sc-hidden');
   ok(res, "The view (isVisible) has been properly rerendered even though it was part of a page, the pane was detached and the visibility was changed while detached");
- 
-  pp.remove(); 
+
+  pp.remove();
+
+  page.destroy();
 });

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

@@ -11,7 +11,7 @@ module("SC.PanelPane UI");
 
 var pane ;
 
-test("verify panel content container is visible at correct location with right size", function() { 
+test("verify panel content container is visible at correct location with right size", function() {
   pane = SC.PanelPane.create({
     layout: { width: 400, height: 200, centerX: 0, centerY: 0 },
     contentView: SC.View.extend({
@@ -23,7 +23,7 @@ test("verify panel content container is visible at correct location with right s
   ok(pane.$().hasClass('sc-panel'), 'pane should have sc-panel class');
   ok(pane.childViews[0].get('isVisibleInWindow'), 'pane.div.isVisibleInWindow should be YES');
   ok(pane.childViews[0].$().hasClass('sc-view'), 'pane.div should have sc-view class');
-  
+
   var pw = pane.layout.width;
   var ph = pane.layout.height;
   var ret = pane.layoutStyle();
@@ -36,6 +36,7 @@ test("verify panel content container is visible at correct location with right s
   equals(ret.marginTop, -ph/2+'px', 'pane should shift-top %@ px'.fmt(-ph/2));
 
   pane.remove();
+  pane.destroy();
 }) ;
 
 test("Verify panel pane has aria role set", function() {
@@ -49,7 +50,7 @@ test("Verify panel pane has aria role set", function() {
   equals(pane.$().attr('role'), 'dialog', "panel pane has role attribute set");
 
   pane.remove();
-
+  pane.destroy();
 });
 
 test("Verify panel pane has aria-label attribute set, when ariaLabel is provided", function() {
@@ -64,6 +65,6 @@ test("Verify panel pane has aria-label attribute set, when ariaLabel is provided
   equals(pane.$().attr('aria-label'), 'Panel is labelled by this value for voiceover', "panel pane has aria-labelledby attribute set");
 
   pane.remove();
-
+  pane.destroy();
 });
 

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

@@ -9,6 +9,13 @@
 
 window.target = null;
 
+var anchor = SC.ControlTestPane.design()
+  .add("anchor", SC.ButtonView, {
+     title: "Anchor Button"
+  });
+
+var pane;
+
 module("SC.PickerPane Methods", {
   setup: function(){
     window.target = SC.Object.create({
@@ -20,23 +27,16 @@ module("SC.PickerPane Methods", {
         sender.remove();
       }
     });
+    anchor.standardSetup().setup();
   },
-  
+
   teardown: function(){
     window.target = null;
+    anchor.standardSetup().teardown();
   }
 });
 
-var anchor = SC.ControlTestPane.design()
-  .add("anchor", SC.ButtonView, { 
-     title: "Anchor Button" 
-  });
-
-anchor.show(); // add a test to show the test pane
-
-var pane;
-
-test("check default action on pane#mouseDown", function() { 
+test("check default action on pane#mouseDown", function() {
   pane = SC.PickerPane.create({
     layout: { width: 300, height: 200 },
     contentView: SC.View.extend({
@@ -44,41 +44,45 @@ test("check default action on pane#mouseDown", function() {
     })
   });
   pane.popup(anchor.view('anchor'), SC.PICKER);
-  
+
   ok(pane.get('isVisibleInWindow'), 'pane.isVisibleInWindow should be YES');
-  
+
   pane.mouseDown({ pageX: 0, pageY: 0 });
-  
+
   ok(!pane.get('isVisibleInWindow'), 'pane.isVisibleInWindow should be NO after mouseDown');
+
+  pane.destroy();
 }) ;
 
-test("check action on pane#mouseDown with removeAction set", function() { 
+test("check action on pane#mouseDown with removeAction set", function() {
   pane = SC.PickerPane.create({
-    
+
     layout: { width: 300, height: 200 },
     contentView: SC.View.extend({
       layout: { top: 0, left: 0, bottom: 0, right: 0 }
     }),
     removeAction: 'foo',
     fooInvoked: NO,
-    foo: function() { 
+    foo: function() {
       this.set('fooInvoked', YES);
       this.remove();
     }
   });
   pane.popup(anchor.view('anchor'), SC.PICKER);
-  
+
   ok(pane.get('isVisibleInWindow'), 'pane.isVisibleInWindow should be YES');
-  
+
   pane.mouseDown({ pageX: 0, pageY: 0 });
-  
+
   ok(!pane.get('isVisibleInWindow'), 'pane.isVisibleInWindow should be NO after mouseDown');
   ok(pane.get('fooInvoked'), 'pane.fooInvoked should be YES after mouseDown');
+
+  pane.destroy();
 }) ;
 
-test("check action on pane#mouseDown with removeAction and removeTarget set", function() { 
+test("check action on pane#mouseDown with removeAction and removeTarget set", function() {
   pane = SC.PickerPane.create({
-    
+
     layout: { width: 300, height: 200 },
     contentView: SC.View.extend({
       layout: { top: 0, left: 0, bottom: 0, right: 0 }
@@ -87,12 +91,14 @@ test("check action on pane#mouseDown with removeAction and removeTarget set", fu
     removeTarget: target
   });
   pane.popup(anchor.view('anchor'), SC.PICKER);
-  
+
   ok(pane.get('isVisibleInWindow'), 'pane.isVisibleInWindow should be YES');
-  
+
   pane.mouseDown({ pageX: 0, pageY: 0 });
-  
+
   ok(!pane.get('isVisibleInWindow'), 'pane.isVisibleInWindow should be NO after mouseDown');
   ok(target.get('fooInvoked'), 'target.fooInvoked should be YES');
   ok(target.get('sender'), pane, 'target.sender should be pane');
-}) ;
+
+  pane.destroy();
+}) ;

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

@@ -7,24 +7,15 @@
 
 /*global module test htmlbody ok equals same stop start */
 
-module("SC.PickerPane UI", {
-  setup: function(){
-    htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
-  },
-  teardown: function(){
-    clearHtmlbody();
-  }
-});
-
 
 function evaluatePicker(pane) {
   ok(pane.get('isVisibleInWindow'), 'pane.isVisibleInWindow should be YES');
   ok(pane.$().hasClass('sc-picker'), 'pane should have sc-picker class');
   ok(pane.childViews[0].get('isVisibleInWindow'), 'pane.div.isVisibleInWindow should be YES');
   ok(pane.childViews[0].$().hasClass('sc-view'), 'pane.div should have sc-view class');
-  
+
   equals(pane.$('.sc-view').length, 1, 'pane should have only one content view');
-  
+
   var ret = pane.layoutStyle();
 
   equals(ret.width, '300px', 'pane should have width 300px');
@@ -32,18 +23,28 @@ function evaluatePicker(pane) {
 }
 
 var anchor = SC.ControlTestPane.design()
-  .add("anchor", SC.ButtonView, { 
-     title: "Anchor Button" 
+  .add("anchor", SC.ButtonView, {
+     title: "Anchor Button"
   });
 
-anchor.show(); // add a test to show the test pane
+module("SC.PickerPane UI", {
+  setup: function(){
+    htmlbody('<style> .sc-static-layout { border: 1px red dotted; } </style>');
+    anchor.standardSetup().setup();
+  },
+  teardown: function(){
+    anchor.standardSetup().teardown();
+    clearHtmlbody();
+  }
+});
+
 
 var paneDefault ;
 var paneMenu ;
 var paneFixed ;
 var panePointer ;
 
-test("verify default picker pane content container is visible at correct location with right size", function() { 
+test("verify default picker pane content container is visible at correct location with right size", function() {
   paneDefault = SC.PickerPane.create({
     layout: { width: 300, height: 200 },
     contentView: SC.View.extend({
@@ -52,10 +53,11 @@ test("verify default picker pane content container is visible at correct locatio
   });
   paneDefault.popup(anchor.view('anchor'), SC.PICKER);
   evaluatePicker(paneDefault);
-  //paneDefault.remove();
+  paneDefault.remove();
+  paneDefault.destroy();
 }) ;
 
-test("verify menu picker pane content container is visible at correct location with right size", function() { 
+test("verify menu picker pane content container is visible at correct location with right size", function() {
   paneMenu = SC.PickerPane.create({
     layout: { width: 300, height: 200 },
     contentView: SC.View.extend({
@@ -64,10 +66,11 @@ 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.remove();
+  paneMenu.destroy();
 }) ;
 
-test("verify fixed picker pane content container is visible at correct location with right size", function() { 
+test("verify fixed picker pane content container is visible at correct location with right size", function() {
   paneFixed = SC.PickerPane.create({
     layout: { width: 300, height: 200 },
     contentView: SC.View.extend({
@@ -76,10 +79,11 @@ 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.remove();
+  paneFixed.destroy();
 }) ;
 
-test("verify pointer picker pane content container is visible at correct location with right size", function() { 
+test("verify pointer picker pane content container is visible at correct location with right size", function() {
   panePointer = SC.PickerPane.create({
     layout: { width: 300, height: 200 },
     contentView: SC.View.extend({
@@ -88,5 +92,6 @@ 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.remove();
+  panePointer.destroy();
 }) ;

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

@@ -53,12 +53,12 @@ module("SC.SelectButtonView",{
           nameKey: 'title',
           sortKey: 'pos'
         }),
-        
+
         //view5
         SC.SelectButtonView.extend({
           objects: ["My","New", "List"]
         }),
-        
+
         //view6
         SC.SelectButtonView.extend({
           objects: ["My","New", "List"],
@@ -74,14 +74,15 @@ module("SC.SelectButtonView",{
     view4 = pane.childViews[3] ;
     view5 = pane.childViews[4] ;
     view6 = pane.childViews[5] ;
-    
+
     pane.append(); // make sure there is a layer...
     SC.RunLoop.end();
   },
 
   //teardown
   teardown: function() {
-    pane.remove() ;
+    pane.remove();
+    pane.destroy();
     pane = view = null ;
   }
 });

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

@@ -84,8 +84,6 @@ var pane = SC.ControlTestPane.design()
       checkboxEnabled: YES
     }) ;
 
-    pane.show();
-
 // ..........................................................
 // TEST VIEWS
 //

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

@@ -9,17 +9,15 @@
 
 module("SC.SheetPane UI");
 
-var slidePane;
-
-test("verify sheet pane slide down works", function() { 
-  slidePane = SC.SheetPane.create({
-    layout: { top: 60, width: 400, height: 200, centerX: 0 },
+test("verify sheet pane slide down works", function() {
+  var slidePane = SC.SheetPane.create({
+    layout: { width: 400, height: 200, centerX: 0 },
     contentView: SC.LabelView.extend({
       escapeHTML: NO,
       value: '<h1>Slide Down!</h1>'
     })
   });
-  
+
   var layout = slidePane.get('layout');
   var pt = layout.top;
   var pl = layout.left;
@@ -38,9 +36,14 @@ test("verify sheet pane slide down works", function() {
     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();
   };
-  stop();
+
+  stop(800);
+
   setTimeout(f, 400);
-}) ;
+
+});

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

@@ -9,11 +9,11 @@
 var view ;
 module("SC.ButtonView#displayProperties", {
   setup: function() {
-    view = SC.ButtonView.create({ 
-      isVisibleInWindow: YES 
-    }).createLayer();
+    view = SC.ButtonView.create()
+    view.createLayer();
+    view._doAttach(document.body);
   },
-  
+
   teardown: function() {
     view.destroy();
   }
@@ -39,7 +39,7 @@ test("setting isSelected to ON removes sel class name", function() {
   view.set('isSelected', YES);
   SC.RunLoop.end();
   ok(view.$().hasClass('sel'), 'precond - should have sel class');
-  
+
   SC.RunLoop.begin();
   view.set('isSelected', NO);
   SC.RunLoop.end();

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

@@ -3,32 +3,30 @@
 // Copyright: ©2006-2011 Apple Inc. and contributors.
 // License: Licensed under MIT license (see license.js)
 // ==========================================================================
- 
+
 /*global module test equals context ok same */
- 
+
 // ..........................................................
 // performKeyEquivalent() - verify that return value is correct.
 //
 var pane = SC.ControlTestPane.design()
-  .add("basic", SC.ButtonView, { 
+  .add("basic", SC.ButtonView, {
     triggerAction: function() { return YES; },
     title:'hello world',
     keyEquivalent: 'return'
   });
-  
-pane.show(); // add a test to show the test pane
 
-  
- 
+
+
 module('SC.ButtonView#performKeyEquivalent', pane.standardSetup());
- 
+
 test("handles matching key equivalent 'return'", function() {
   var view = pane.view('basic');
   view.triggerAction = function(evt) { return YES; }; // act like we handled it if we get here
   var u = view.pane();
   ok(u.performKeyEquivalent('return'), "should return truthy value indicating it handled the key equivalent 'return'");
 });
- 
+
 test("ignores non-matching key equivalent 'wrong_key'", function() {
   var view = pane.view('basic');
   view.triggerAction = function(evt) { return YES; }; // act like we handled it if we get here (we shouldn't in this case)
@@ -40,7 +38,7 @@ test("triggers on return if isDefault is set and no keyEquivalent is set", funct
   view.set('isDefault', YES);
   view.set('keyEquivalent', null);
   ok(view.performKeyEquivalent('return'), 'should be handled');
-  
+
   view.set('keyEquivalent', 'a');
   ok(!view.performKeyEquivalent('return'), 'should NOT be handled');
 });
@@ -51,7 +49,7 @@ test("triggers on escape if isCancel is set and no keyEquivalent is set", functi
   view.set('isCancel', YES);
   view.set('keyEquivalent', null);
   ok(view.performKeyEquivalent('escape'), 'should be handled');
-  
+
   view.set('keyEquivalent', 'a');
   ok(!view.performKeyEquivalent('escape'), 'should NOT be handled');
 });