sproutcore 1.4.5 → 1.5.0.pre.3

data/lib/frameworks/sproutcore/frameworks/{foundation → amber}/tests/views/view/prepareContext.js

@@ -1,6 +1,6 @@
 // ==========================================================================
 // Project:   SproutCore - JavaScript Application Framework
-// Copyright: �2006-2010 Apple Inc. and contributors.
+// Copyright: 2006-2009 Apple Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
 
@@ -19,15 +19,23 @@ test("populates context with layerId & classNames from view if firstTime", funct
   view.prepareContext(context, YES);
   equals(context.id(), 'foo', 'did set id');
   ok(context.hasClass('bar'), 'did set class names');
-  
-  // test w/o firstTime
-  context = view.renderContext();
+});
+
+test("check that testing without first time still renders to a context", function() {
+  var view = SC.View.create({
+    layerId: "foo", 
+    classNames: ["bar"],
+    createRenderer: function(t) {  return undefined; }
+  });
+  var context = view.renderContext();
   view.prepareContext(context, NO);
-  ok(context.id() !== 'foo', 'did not set id');
-  ok(context.hasClass('bar'), 'did set class name');
+
+
+  ok(context.id() === 'foo', 'set id');
+  ok(context.hasClass('bar'), 'set class name');
 });
 
-test("invokes renderLayout if first time", function() {
+test("invokes renderLayout each time", function() {
   var runCount = 0;
   var context, isFirstTime ;
   var view = SC.View.create({
@@ -49,7 +57,7 @@ test("invokes renderLayout if first time", function() {
   context = view.renderContext();
   isFirstTime = NO ;
 	view.prepareContext(context, NO);
-	equals(runCount, 0, 'should not call renderLayout');
+	equals(runCount, 1, 'should call renderLayout');
 
 });
 

data/lib/frameworks/sproutcore/frameworks/{foundation → amber}/tests/views/view/render.js

@@ -43,18 +43,21 @@ test("default implementation invokes renderChildViews if firstTime = YES", funct
   
 module("SC.View#renderChildViews");
 
-test("creates a context and then invokes prepareContext on each childView", function() {
+test("creates a context and then invokes renderToContext or updateLayer on each childView", function() {
 
 	var runCount = 0, curContext, curFirstTime ;
 	
 	var ChildView = SC.View.extend({
-	  prepareContext: function(context, firstTime) {
+	  renderToContext: function(context) {
 	  	equals(context.prevObject, curContext, 'passed child context of curContext');
-	  	equals(firstTime, curFirstTime, 'passed first time flag');
 	  	
 	  	equals(context.tagName(), this.get('tagName'), 'context setup with current tag name');
 	  	
 	  	runCount++; // record run
+	  },
+	  
+	  updateLayer: function() {
+	    runCount++;
 	  }
 	});
 	
@@ -70,7 +73,7 @@ test("creates a context and then invokes prepareContext on each childView", func
 	curContext = view.renderContext('div');
 	curFirstTime= YES ;
 	equals(view.renderChildViews(curContext, curFirstTime), curContext, 'returns context');
-	equals(runCount, 3, 'prepareContext() invoked for each child view');
+	equals(runCount, 3, 'renderToContext() invoked for each child view');
 	
 
 	// VERIFY: firstTime= NO 	
@@ -78,6 +81,35 @@ test("creates a context and then invokes prepareContext on each childView", func
 	curContext = view.renderContext('div');
 	curFirstTime= NO ;
 	equals(view.renderChildViews(curContext, curFirstTime), curContext, 'returns context');
-	equals(runCount, 3, 'prepareContext() invoked for each child view');
+	equals(runCount, 3, 'updateLayer() invoked for each child view');
+
+});
+
+test("creates a context and then invokes renderChildViews to call renderToContext on each childView", function() {
+
+	var runCount = 0, curContext ;
+	
+	var ChildView = SC.View.extend({
+	  renderToContext: function(context) {
+	  	equals(context.prevObject, curContext, 'passed child context of curContext');
+	  	
+	  	equals(context.tagName(), this.get('tagName'), 'context setup with current tag name');
+	  	
+	  	runCount++; // record run
+	  }
+  });
+	
+	var view = SC.View.create({
+		childViews: [
+			ChildView.extend({ tagName: 'foo' }),
+			ChildView.extend({ tagName: 'bar' }),
+			ChildView.extend({ tagName: 'baz' })
+		]
+	});
+
+	// VERIFY: firstTime= YES 	
+	curContext = view.renderContext('div');
+	view.renderChildViews(curContext);
+	equals(runCount, 3, 'renderToContext() invoked for each child view');
 
 });

data/lib/frameworks/sproutcore/frameworks/amber/tests/views/view/render_delegate_support.js

@@ -0,0 +1,163 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2010 Apple Inc. and contributors.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/*global module test equals context ok same */
+
+// .......................................................
+//  render() 
+//
+module("SC.View#render");
+
+test("Supports backwards-compatible render method", function() {
+  var renderCallCount = 0;
+  var view = SC.View.create({
+    render: function(context, firstTime) {
+      renderCallCount++;
+      ok(context._STYLE_REGEX, 'passes RenderContext');
+      equals(firstTime, YES, 'passes YES for firstTime');
+    }
+  });
+
+  view.createLayer();
+  
+  view.render = function(context, firstTime) {
+    renderCallCount++;
+    ok(context._STYLE_REGEX, 'passes RenderContext');
+    equals(firstTime, NO, 'passes NO for firstTime');
+  };
+  
+  view.updateLayer();
+  
+  equals(renderCallCount, 2, 'render should have been called twice');
+});
+
+test("Treats a view as its own render delegate", function() {
+  var renderCallCount = 0,
+      updateCallCount = 0;
+
+  var view = SC.View.create({
+    render: function(context) {
+      // Check for existence of _STYLE_REGEX to determine if this is an instance
+      // of SC.RenderContext
+      ok(context._STYLE_REGEX, 'passes render context');
+      renderCallCount++;
+    },
+
+    update: function(elem) {
+     ok(elem.jquery, 'passes a jQuery object as first parameter'); 
+     updateCallCount++;
+    }
+  });
+  
+  view.createLayer();
+  view.updateLayer();
+  equals(renderCallCount, 1, "calls render once");
+  equals(updateCallCount, 1, "calls update once");
+});
+
+test("Passes data source as first parameter if render delegate is not the view", function() {
+  var renderCallCount = 0,
+      updateCallCount = 0;
+      
+  var view;
+
+  var renderDelegate = SC.Object.create({
+    render: function(dataSource, context, firstTime) {
+      equals(dataSource, view.get('renderDelegateProxy'), "passes the view's render delegate proxy as data source");
+      ok(context._STYLE_REGEX, "passes render context");
+      equals(firstTime, undefined, "does not pass third parameter");
+      renderCallCount++;
+    },
+
+    update: function(dataSource, elem) {
+      equals(dataSource, view.get('renderDelegateProxy'), "passes view's render delegate proxy as data source");
+      ok(elem.jquery, "passes a jQuery object as first parameter"); 
+      updateCallCount++;
+    }  
+  });
+
+  view = SC.View.create({
+    renderDelegate: renderDelegate
+  });
+
+  view.createLayer();
+  view.updateLayer();
+  equals(renderCallCount, 1, "calls render once");
+  equals(updateCallCount, 1, "calls update once");
+});
+
+test("Extending view with render delegate by implementing old render method", function() {
+  var renderCalls = 0, updateCalls = 0;
+  var parentView = SC.View.extend({
+    renderDelegate: SC.Object.create({
+      render: function(context) {
+        renderCalls++;
+      },
+
+      update: function(cq) {
+        updateCalls++;
+      }
+    })
+  });
+
+  var childView = parentView.create({
+    render: function(context, firstTime) {
+      sc_super();
+    }
+  });
+  
+  childView.createLayer();
+  childView.updateLayer();
+  
+  equals(renderCalls, 1, "calls render on render delegate once");
+  equals(updateCalls, 1, "calls update on render delegates once");
+});
+
+test("Views that do not override render should render their child views", function() {
+  var newStyleCount = 0, oldStyleCount = 0, renderDelegateCount = 0;
+
+  var parentView = SC.View.design({
+    childViews: 'newStyle oldStyle renderDelegateView'.w(),
+    
+    newStyle: SC.View.design({
+      render: function(context) {
+        newStyleCount++;
+      },
+      
+      update: function() {
+        // no op
+      }
+    }),
+    
+    oldStyle: SC.View.design({
+      render: function(context, firstTime) {
+        oldStyleCount++;
+      }
+    }),
+    
+    renderDelegateView: SC.View.design({
+      renderDelegate: SC.Object.create({
+        render: function(dataSource, context) {
+          ok(dataSource.isViewRenderDelegateProxy, "Render delegate should get passed a view's proxy for its data source");
+          renderDelegateCount++;
+        },
+        
+        update: function() {
+          // no op
+        }
+      })
+    })
+  });
+  
+  parentView = parentView.create();
+  
+  parentView.createLayer();
+  parentView.updateLayer();
+  
+  equals(newStyleCount, 1, "calls render on new style view once");
+  equals(oldStyleCount, 1, "calls render on old style view once");
+  equals(renderDelegateCount, 1, "calls render on render delegate once");
+});

data/lib/frameworks/sproutcore/frameworks/amber/tests/views/view/theme.js

@@ -0,0 +1,43 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2009 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/*global module test equals context ok */
+
+module("SC.View#themes");
+
+// TODO: This isn't passing on master. Alex needs to take a look at it.
+
+//var t1 = SC.Theme.addTheme("sc-test-1", SC.BaseTheme.extend({name: 'test-1' }));
+//var t2 = SC.Theme.addTheme("sc-test-2", SC.BaseTheme.extend({name: 'test-2' }));
+
+//test("changing themes propagates to child view.", function() {
+  //var view = SC.View.create({
+    //"childViews": "child".w(),
+    //theme: "sc-test-1",
+    //child: SC.View.extend({
+      
+    //})
+  //});
+  
+  //ok(t1 === view.get("theme"), "view's theme should be sc-test-1");
+  //ok(t1 === view.child.get("theme"), "view's child's theme should be sc-test-1");
+  //view.set('themeName', 'sc-test-2');
+  //ok(t2 === view.get("theme"), "view's theme should be sc-test-2");
+  //ok(t2 === view.child.get("theme"), "view's child's theme should be sc-test-2");
+//});
+
+//test("adding child to parent propagates theme to child view.", function() {
+  //var child = SC.View.create({});
+  //var view = SC.View.create({
+    //theme: "sc-test-1"
+  //});
+  
+  //ok(t1 === view.get("theme"), "view's theme should be sc-test-1");
+  //equals(child.get("theme"), SC.Theme.find('sc-base'), "view's child's theme should start at base theme");
+  //view.appendChild(child);
+  //equals(t1, child.get("theme"), "view's child's theme should be sc-test-1");
+//});

data/lib/frameworks/sproutcore/frameworks/{foundation → amber}/tests/views/view/updateLayer.js

@@ -14,17 +14,19 @@
 // 
 module("SC.View#updateLayer");
 
-test("invokes prepareContext() and then updates layer element", function() {
+test("invokes renderLayerSettings() and then updates layer element", function() {
   var layer = document.createElement('div');
+
+  var times = 0;
   var view = SC.View.create({
-    layer: layer, // fake it...
-    prepareContext: function(context) {
-      context.addClass('did-update');
+    _renderLayerSettings: function() {
+      times++;
+      this.$().addClass('did-update-' + times);
     }
   });
-  
+  view.createLayer();
   view.updateLayer();
-  ok(SC.$(layer).attr('class').indexOf('did-update')>=0, 'has class name added by prepareContext()');
+  ok(view.$().attr('class').indexOf('did-update-2')>=0, 'has class name added by prepareContext()');
 });
 
 // ..........................................................
@@ -35,14 +37,14 @@ module("SC.View#updateLayerIfNeeded", {
   setup: function() {
     // setup a fake view class so that updateLayerIfNeeded() will call
     // updateLayer() if needed.  updateLayer() is faked to isolate test
-    var layer = document.createElement('div');
     view = SC.View.create({
-      layer: layer, // fake it...
       isVisibleInWindow: YES,
-      layerNeedsUpdate: YES,
       updateLayer: function() { callCount++; }
     });
     callCount = 0 ;
+    
+    view.createLayer();
+    view.set("layerNeedsUpdate", YES);
   }
   
 });
@@ -124,10 +126,10 @@ test("layerNeedsUpdate actually triggers updateLayer", function() {
   var callCount = 0 ;
   var layer = document.createElement('div');
   var view = SC.View.create({
-    layer: layer, // fake it...
     isVisibleInWindow: YES,
     updateLayer: function() { callCount++; }
   });
+  view.createLayer();
   
   SC.RunLoop.begin();
   view.set('layerNeedsUpdate', YES);

data/lib/frameworks/sproutcore/frameworks/amber/tests/views/view/view.js

@@ -0,0 +1,64 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2011 Strobe Inc. and contributors.
+//            Portions ©2008-2009 Apple Inc. All rights reserved.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+
+/*global module test equals context ok */
+
+module("SC.View");
+
+test("setting themeName should trigger a theme observer", function() {
+  var count = 0;
+  var view = SC.View.create({
+    themeDidChange: function() {
+      count++;
+    }.observes('theme'),
+  });
+
+  view.set('themeName', 'hello');
+  equals(1, count, "theme observers should get called");
+});
+
+test("setting themeName should trigger a theme observer when extending", function() {
+  var count = 0;
+  var View = SC.View.extend({
+    themeDidChange: function() {
+      count++;
+    }.observes('theme'),
+  });
+
+  View.create().set('themeName', 'hello');
+  equals(1, count, "theme observers should get called");
+});
+
+test("it still works with the backward compatible theme property", function() {
+  var count = 0;
+  var view = SC.View.create({
+    theme: 'sc-base',
+    themeDidChange: function() {
+      count++;
+    }.observes('theme'),
+  });
+
+  equals(SC.Theme.find('sc-base'), view.get('theme'));
+  view.set('themeName', 'hello');
+  equals(1, count, "theme observers should get called");
+});
+
+test("it still works with the backward compatible theme property when extending", function() {
+  var count = 0;
+  var View = SC.View.extend({
+    theme: 'sc-base',
+    themeDidChange: function() {
+      count++;
+    }.observes('theme'),
+  });
+
+  view = View.create();
+  equals(SC.Theme.find('sc-base'), view.get('theme'));
+  view.set('themeName', 'hello');
+  equals(1, count, "theme observers should get called");
+});
+