sproutcore 1.4.5 → 1.5.0.pre.3

data/lib/frameworks/sproutcore/frameworks/{foundation → amber}/tests/controllers/array/single_case.js

@@ -10,23 +10,23 @@
 var content, controller, extra;
 
 var TestObject = SC.Object.extend({
-  title: "test",  
+  title: "test",
   toString: function() { return "TestObject(%@)".fmt(this.get("title")); }
 });
 
 
 // ..........................................................
 // allowsSingleContent
-// 
+//
 
 module("SC.ArrayController - single_case - SINGLE", {
   setup: function() {
     content = TestObject.create({ title: "FOO" });
-    controller = SC.ArrayController.create({ 
+    controller = SC.ArrayController.create({
       content: content, allowsSingleContent: YES
     });
   },
-  
+
   teardown: function() {
     controller.destroy();
   }
@@ -50,9 +50,9 @@ test("removeObject - no destroyOnRemoval", function() {
   var callCount = 0;
   controller.set('destroyOnRemoval', NO);
   controller.addObserver('[]', function() { callCount++; });
-  
+
   controller.removeObject(content);
-  
+
   equals(controller.get('content'), null, 'removeObject(content) should set content to null');
   equals(callCount, 1, 'should notify observer since content did not change');
   equals(controller.get('length'), 0, 'should now have length of 0');
@@ -84,16 +84,16 @@ test("arrangedObjects", function() {
 
 // ..........................................................
 // allowsSingleContent=NO
-// 
+//
 
 module("SC.ArrayController - single_case - allowsSingleContent=NO", {
   setup: function() {
     content = TestObject.create({ title: "FOO" });
-    controller = SC.ArrayController.create({ 
+    controller = SC.ArrayController.create({
       content: content, allowsSingleContent: NO
     });
   },
-  
+
   teardown: function() {
     controller.destroy();
   }

data/lib/frameworks/sproutcore/frameworks/amber/tests/mixins/string.js

@@ -0,0 +1,55 @@
+// ==========================================================================
+// 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 */
+var LocaleObject;
+module('String.prototype.w()', {
+  setup: function() {
+
+    LocaleObject = SC.Locale.create({
+      init: function(){
+        sc_super();
+        //hash of new languages
+        var newLocales = { deflang: 'dl', empty: '' };
+
+        //Added the new languages to the existing list of locales
+        SC.Locale.addStrings(newLocales);
+      }
+    });
+    this.currentLocale = LocaleObject;
+  }
+});
+
+test("'one two three'.w() => ['one','two','three']", function() {
+  same('one two three'.w(), ['one','two','three'], "should be equal");
+});
+
+test("'one    two    three'.w() with extra spaces between words => ['one','two','three']", function() {
+  same('one    two    three'.w(), ['one','two','three'], "should be equal");
+});
+
+test("Trim ' spaces on both sides '", function() {
+  same(' spaces on both sides '.trim(), 'spaces on both sides', "should be equal");
+});
+
+test("Trim ' spaces on both sides ' on left only", function() {
+  same(' spaces on both sides '.trimLeft(), 'spaces on both sides ', "should be equal");
+});
+
+test("Trim ' spaces on both sides ' on right only", function() {
+  same(' spaces on both sides '.trimRight(), ' spaces on both sides', "should be equal");
+});
+
+test("Localize a string", function() {
+  //Based on the input passed it should return the default locale
+  equals("en".loc(), "en") ;
+  equals("jp".locWithDefault("Japanese"), "Japanese") ;
+  equals('deflang'.loc(), "dl") ;
+});
+
+test("Localize a string even if localized version is empty", function() {
+  equals("empty".loc(), "");
+  equals("empty".locWithDefault("Empty"), "");
+});

data/lib/frameworks/sproutcore/frameworks/{foundation → amber}/tests/system/core_query/within.js

@@ -2,7 +2,7 @@
 // CoreQuery Tests
 // ========================================================================
 
-// This file tests additions to CoreQuery.  These should function even if you use 
+// This file tests additions to CoreQuery.  These should function even if you use
 // jQuery
 module("CoreQuery.within() && within()");
 
@@ -13,10 +13,10 @@ test("should return if passed RAW element that is child", function() {
       <div class="child2"></div>\
     </div>\
   </div>') ;
-  
+
   var child = cq.find('.child1');
   equals(cq.within(child.get(0)), YES, "cq.within(DOMElement) = YES") ;
-  
+
   var notChild = SC.$('<div class="not-child"></div>') ;
   equals(cq.within(notChild.get(0)), NO, "cq.hadChild(DOMElement) = NO");
   child = notChild = cq = null ;
@@ -29,10 +29,10 @@ test("should return if passed CQ with element that is child", function() {
       <div class="child2"></div>\
     </div>\
   </div>') ;
-  
+
   var child = cq.find('.child1');
   equals(cq.within(child), YES, "cq.within(DOMElement) = YES") ;
-  
+
   var notChild = SC.$('<div class="not-child"></div>') ;
   equals(cq.within(notChild), NO, "cq.hadChild(DOMElement) = NO");
   child = notChild = cq = null ;
@@ -50,10 +50,10 @@ test("should work if matched set has multiple element", function() {
     </div>\
   </div>').find('.root') ;
   equals(cq.length, 3, "should have three element in matched set");
-  
+
   var child = cq.find('.child1');
   equals(cq.within(child), YES, "cq.within(DOMElement) = YES") ;
-  
+
   var notChild = SC.$('<div class="not-child"></div>') ;
   equals(cq.within(notChild), NO, "cq.hadChild(DOMElement) = NO");
   child = notChild = cq = null ;
@@ -63,4 +63,3 @@ test("should return YES if matching self", function() {
   var cq = SC.$('<div></div>');
   equals(cq.within(cq), YES, "should not match");
 });
-

data/lib/frameworks/sproutcore/frameworks/{foundation → amber}/tests/system/render_context/end.js

@@ -39,7 +39,7 @@ test("should emit style in tag if opts.styles is defined", function() {
 
 test("should emit style with custom browser attributes", function() {
   context.styles({ mozColumnCount: '3', webkitColumnCount: '3', oColumnCount: '3', msColumnCount: '3' }).end();
-  ok(context.get(0).match('<div style="-moz-column-count: 3px; -webkit-column-count: 3px; -o-column-count: 3px; -ms-column-count: 3px" >'),
+  ok(context.get(0).match('<div style="-moz-column-count: 3; -webkit-column-count: 3; -o-column-count: 3; -ms-column-count: 3" >'),
                             '<div> has style="-moz-column-count: 3; -webkit-column-count: 3, -o-column-count: 3, -ms-column-count: 3"');
 });
 

data/lib/frameworks/sproutcore/frameworks/{foundation → amber}/tests/system/render_context/helpers_className.js

@@ -51,8 +51,6 @@ test("extracts class names from element on first retrieval", function() {
   
   var result = context.classNames();
   same(result, ['foo', 'bar'], 'extracted class names');
-  
-  equals(context.classNames(), result, "should reuse same instance thereafter");
 });
 
 // ..........................................................

data/lib/frameworks/sproutcore/frameworks/{foundation → amber}/tests/system/render_context/helpers_style.js

@@ -52,9 +52,8 @@ test("extracts styles from element on first retrieval", function() {
   
   var result = context.styles();
   
-  if(SC.browser.msie) same(result, { height: '20px', color: 'black', height: '20px', borderTop: 'hotpink 1px solid', WebkitColumnCount: '3' }, 'extracted style. This is failing in IE8 because it return styles like cOLOR.');
-  else if(SC.browser.mozilla) same(result, { color: 'black', height: '20px', borderTop: '1px solid hotpink' }, 'extracted style. This is failing in IE8 because it return styles like cOLOR.');
-  else same(result, { color: 'black', height: '20px', borderTop: '1px solid hotpink', WebkitColumnCount: '3' }, 'extracted style. This is failing in IE8 because it return styles like cOLOR.');
+  
+  same(result, { color: 'black', height: '20px', borderTop: '1px solid hotpink', WebkitColumnCount: '3' }, 'extracted style. This is failing in IE8 because it return styles like cOLOR.');
   
   equals(context.styles(), result, "should reuse same instance thereafter");
 });
@@ -99,3 +98,12 @@ test("css() should be an alias for addStyle()", function() {
   equals(SC.RenderContext.fn.css, SC.RenderContext.fn.addStyle, 'methods');
 });
 
+test("addStyle should remove properties that are part of combo properties", function(){
+  SC.COMBO_STYLES = { foo: 'fooSub'.w() };
+  context.styles({ foo: 'foo', fooSub: 'bar' });
+  equals(context.styles().fooSub, 'bar', 'proper starting values');
+  context.addStyle('foo', 'bar');
+  equals(context.styles().foo, 'bar', 'foo has new value');
+  equals(context.styles().fooSub, undefined, 'fooSub has no value');
+});
+

data/lib/frameworks/sproutcore/frameworks/{foundation → amber}/tests/system/root_responder/targetForAction.js

@@ -6,7 +6,7 @@
 
 /*global module test equals context ok same Q$ htmlbody Dummy */
 
-var r, r2, sender, pane, barView, fooView, defaultResponder;
+var r, r2, sender, pane, pane2, barView, fooView, defaultResponder;
 var keyPane, mainPane, globalResponder, globalResponderContext, actionSender ;
 
 var CommonSetup = {
@@ -29,7 +29,9 @@ var CommonSetup = {
     
     // global default responder as a responder context 
     // set on RootResponder
-    globalResponderContext = SC.Object.create(SC.ResponderContext);
+    globalResponderContext = SC.Object.create(SC.ResponderContext, {
+      globalAction: action
+    });
     
     // explicit pane
     pane = SC.Pane.create({ 
@@ -42,7 +44,25 @@ var CommonSetup = {
         })]    
       })],
       
-      paneAction: action 
+      paneAction: action
+       
+    });
+    
+    pane2 = SC.Pane.create({ 
+      acceptsKeyPane: YES,
+      defaultResponder: defaultResponder,
+      childViews: [SC.View.extend({
+        bar: action,  // implement bar action
+        childViews: [SC.View.extend({
+          foo: action // implement foo action
+        })]    
+      })],
+      
+      paneAction: action,
+      
+      keyAction: action,
+      mainAction: action,
+      globalAction: action
     });
     
     keyPane = SC.Pane.create({
@@ -196,14 +216,31 @@ test("no target, explicit pane, no first responder", function() {
 });
 
 test("no target, explicit pane, does not implement action", function() {
-  equals(r.targetForAction('keyAction', null, null, pane), null,
-    'should not return keyPane');
+  equals(r.targetForAction('keyAction', null, null, pane), keyPane,
+    'should return keyPane');
     
-  equals(r.targetForAction('mainAction', null, null, pane), null,
-    'should not return mainPane');
+  equals(r.targetForAction('mainAction', null, null, pane), mainPane,
+    'should return mainPane');
+
+  equals(r.targetForAction('globalAction', null, null, pane), globalResponder,
+    'should return global defaultResponder');
+      
+  equals(r2.targetForAction('globalAction', null, null, pane), globalResponderContext,
+    'should return global defaultResponder');
+});
 
-  equals(r.targetForAction('globalAction', null, null, pane), null,
-    'should not return global defaultResponder');
+test("no target, explicit pane, does implement action", function() {
+  equals(r.targetForAction('keyAction', null, null, pane2), pane2,
+    'should return pane');
+    
+  equals(r.targetForAction('mainAction', null, null, pane2), pane2,
+    'should return pane');
+
+  equals(r.targetForAction('globalAction', null, null, pane2), pane2,
+    'should return pane');
+    
+  equals(r2.targetForAction('globalAction', null, null, pane2), pane2,
+    'should return pane');  
 });
 
 test("no target, no explicit pane", function() {

data/lib/frameworks/sproutcore/frameworks/amber/tests/system/theme.js

@@ -0,0 +1,77 @@
+// ==========================================================================
+// 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 */
+
+var Ace, Dark, Capsule, DarkCapsule, AceOnly;
+
+module("SC.Theme", {
+  setup: function() {
+    // make and register Ace
+    Ace = SC.Theme.create({
+      name: 'ace',
+      "classNames": ["ace"]
+    });
+    SC.Theme.addTheme(Ace);
+    
+    // Dark
+    Dark = Ace.subtheme("dark");
+    
+    // Capsule
+    Capsule = Ace.subtheme("capsule");
+  },
+  
+  teardown: function() {
+    
+  }
+});
+
+// use this utility to check themes
+function themeIs(themeInstance, shouldBe, classNames) {
+  ok(themeInstance === shouldBe, "Correct theme");
+  if (!themeInstance) return;
+
+  var isOk = same(themeInstance.classNames, SC.Set.create(classNames), "Correct class names.");
+}
+
+test("Calling SC.Theme.find finds proper theme.", function(){
+  var ace = SC.Theme.find("ace");
+  themeIs(ace, Ace, ["ace"]);
+});
+
+test("There is no proliferation of theme registration (that is, subthemes are not registered globally)", function(){
+  var dark = SC.Theme.find("dark");
+  ok(!dark, "Theme should not be found.");
+});
+
+test("Calling find on a subtheme class finds proper theme.", function(){
+  var dark = Ace.find("dark");
+
+  // child themes are specialized
+  themeIs(dark.baseTheme, Dark, ["ace", "dark"]);
+});
+
+test("Calling find on a theme instance finds proper theme.", function(){
+  var ace = SC.Theme.find("ace");
+  var dark = ace.find("dark");
+
+  // child themes are specialized (that means derived by the parent theme)
+  themeIs(dark.baseTheme, Dark, ["ace", "dark"]);
+});
+
+test("Calling find on a subtheme instance finds the proper theme.", function(){
+  var dark = Ace.find("dark");
+  var capsule = dark.find("capsule");
+
+  // child themes are specialized (that is, derived by the parent)
+  themeIs(capsule.baseTheme, Capsule, ["ace", "capsule"]);
+
+  // and now we are testing said specialization
+  themeIs(capsule, capsule, ["ace", "dark", "capsule"]);
+});
+
+