sproutcore 0.9.14 → 0.9.15

data/frameworks/sproutcore/tests/mixins/observable.rhtml

@@ -0,0 +1,127 @@
+<% content_for('final') do %>
+<script>
+
+Test.context("object.get()", {
+  
+  setup: function() {
+    object = SC.Object.create({
+      
+      normal: 'value',
+      
+      computed: function() { return 'value'; }.property(),
+      
+      method: function() { return "value"; },
+      
+      nullProperty: null,
+      
+      unknownProperty: function(key, value) {
+        this.lastUnknownProperty = key ;
+        return "unknown" ;
+      }
+      
+    }) ;
+  },
+  
+  "should get normal properties": function() {
+    assertEqual(object.get('normal'), 'value') ;
+  },
+  
+  "should call computed properties and return their result": function() {
+    assertEqual(object.get("computed"), "value") ;
+  },
+  
+  "should return the function for a non-computed property": function() {
+    var value = object.get("method") ;
+    assertEqual($type(value), T_FUNCTION) ;
+  },
+  
+  "should return null when property value is null": function() {
+    assertEqual(object.get("nullProperty"), null);
+  },
+  
+  "should call unknownProperty when value is undefined": function() {
+    assertEqual(object.get("unknown"), "unknown") ;
+    assertEqual(object.lastUnknownProperty, "unknown") ;
+  }
+
+});
+
+Test.context("object.set()", {
+  
+  setup: function() {
+    object = SC.Object.create({
+
+      // normal property
+      normal: 'value',
+
+      // computed property
+      _computed: "computed",
+      computed: function(key, value) {
+        if (value !== undefined) {
+          this._computed = value ;
+        }
+        return this._computed ;
+      }.property(),
+
+      // method, but not a property
+      _method: "method",
+      method: function(key, value) {
+        if (value !== undefined) {
+          this._method = value ;
+        }
+        return this._method ;
+      },
+      
+      // null property
+      nullProperty: null,
+      
+      // unknown property
+      _unknown: 'unknown',
+      unknownProperty: function(key, value) {
+        if (value !== undefined) {
+          this._unknown = value ;
+        }
+        return this._unknown ;
+      }
+      
+    }) ;
+  },
+  
+  "should change normal properties and return this": function() {
+    var ret = object.set("normal", "changed") ;
+    assertEqual(object.normal, "changed") ;
+    assertEqual(ret, object) ;
+  },
+  
+  "should call computed properties passing value and return this": function() {
+    var ret = object.set("computed", "changed") ;
+    assertEqual(object._computed, "changed") ;
+    assertEqual($type(object.computed), T_FUNCTION) ;
+    assertEqual(ret, object) ;
+  },
+  
+  "should replace the function for a non-computed property and return this": function() {
+    var ret = object.set("method", "changed") ;
+    assertEqual(object._method, "method") ; // make sure this was NOT run
+    assertNotEqual($type(object.method), T_FUNCTION) ;
+    assertEqual(ret, object) ;
+  },
+  
+  "should replace prover when property value is null": function() {
+    var ret = object.set("nullProperty", "changed") ;
+    assertEqual(object.nullProperty, "changed") ;
+    assertEqual(object._unknown, "unknown"); // verify unknownProperty not called.
+    assertEqual(ret, object) ;
+  },
+  
+  "should call unknownProperty with value when property is undefined": function() {
+    var ret = object.set("unknown", "changed") ;
+    assertEqual(object._unknown, "changed") ;
+    assertEqual(ret, object) ;
+  }
+
+});
+
+
+</script>
+<% end %>

data/frameworks/sproutcore/tests/models/model.rhtml

@@ -22,34 +22,34 @@ ModelTest = SC.Object.create({
 //
 ModelTest.FIXTURES = ModelTest.FIXTURES.concat([
   
-  { guid: 1, 
+  { guid: '1', 
     type: 'Todo', 
     name: "Something to do",
-    todoList: 1 // the guid of the todo list object this todo is related to
+    todoList: '1' // the guid of the todo list object this todo is related to
   },
 
-  { guid: 2, 
+  { guid: '2', 
     type: 'Todo', 
     name: "Something else to do",
-    todoList: 1
+    todoList: '1'
   },
 
-  { guid: 3, 
+  { guid: '3', 
     type: 'Todo', 
     name: "Gee, I'm busy.",
-    todoList: 2
+    todoList: '2'
   }
 
 ]);
 
 ModelTest.FIXTURES = ModelTest.FIXTURES.concat([
   
-  { guid: 1,
+  { guid: '1',
     type: 'TodoList', 
     name: "My List"
   },
 
-  { guid: 2,
+  { guid: '2',
     type: 'TodoList', 
     name: "My List 2"
   }
@@ -80,11 +80,11 @@ Test.context("Test model comparisons with numeric guids", {
   
   setup: function()
   {
-    this.todoList1 = ModelTest.TodoList.find(1);
-    this.todoList2 = ModelTest.TodoList.find(2);
-    this.todo1 = ModelTest.Todo.find(1);
-    this.todo2 = ModelTest.Todo.find(2);
-    this.todo3 = ModelTest.Todo.find(3);
+    this.todoList1 = ModelTest.TodoList.find('1');
+    this.todoList2 = ModelTest.TodoList.find('2');
+    this.todo1 = ModelTest.Todo.find('1');
+    this.todo2 = ModelTest.Todo.find('2');
+    this.todo3 = ModelTest.Todo.find('3');
   },
   
   teardown: function()
@@ -258,16 +258,17 @@ Test.context("Test model comparisons with string guids", {
   
   setup: function()
   {
-    this.todoList1 = ModelTest2.TodoList.find(1);
-    this.todoList2 = ModelTest2.TodoList.find(2);
-    this.todo1 = ModelTest2.Todo.find(1);
-    this.todo2 = ModelTest2.Todo.find(2);
-    this.todo3 = ModelTest2.Todo.find(3);
+    this.todoList1 = ModelTest2.TodoList.find('1');
+    this.todoList2 = ModelTest2.TodoList.find('2');
+    this.todo1 = ModelTest2.Todo.find('1');
+    this.todo2 = ModelTest2.Todo.find('2');
+    this.todo3 = ModelTest2.Todo.find('3');
   },
   
   teardown: function()
   {
-    delete this.todoList;
+    delete this.todoList1;
+    delete this.todoList2;
     delete this.todo1;
     delete this.todo2;
   },
@@ -286,17 +287,17 @@ Test.context("Test model comparisons with string guids", {
     assertIdentical(this.todoList1, this.todo1.get('todoList'));
     assertIdentical(this.todoList1, this.todo2.get('todoList'));
   },
-
+  
   "Todo 3 should not be related to TodoList 1": function()
   {
     assertNotIdentical(this.todoList1, this.todo3.get('todoList'));
   },
-
+  
   "Todo 3 should be related to TodoList 2": function()
   {
     assertIdentical(this.todoList2, this.todo3.get('todoList'));
   },
-
+  
   "Todo 1 and 2 should not be related to TodoList 2": function()
   {
     assertNotIdentical(this.todoList2, this.todo1.get('todoList'));

data/frameworks/sproutcore/tests/views/collection/incremental_rendering.rhtml

@@ -155,7 +155,7 @@ Test.context("CASE 3: Autoscrolling, no incremental rendering, no custom layout"
       }),
       
       init: function() {
-        sc_super() ;
+        arguments.callee.base.apply(this) ;
         this.setStyle({ overflow: "auto", height: '200px' }) ;
       }
     }) ;
@@ -198,7 +198,7 @@ Test.context("CASE 4: Autoscrolling, no incremental rendering, custom layout",
       },
 
       init: function() {
-        sc_super() ;
+        arguments.callee.base.apply(this) ;
         this.setStyle({ overflow: "auto", height: '200px' }) ;
       }
       

data/frameworks/sproutcore/tests/views/view/clippingFrame.rhtml

@@ -67,6 +67,7 @@ Test.context("CASE 2: A scrollable view - child view cannot fit within visible a
   "clippingFrame should reflect only the visible portion of the view": function() {
     var v = this.v.child ;
     var cf = v.get('clippingFrame') ;
+    
     var f = v.get('frame') ;
     f.height = VIEW_HEIGHT ;
     
@@ -75,98 +76,98 @@ Test.context("CASE 2: A scrollable view - child view cannot fit within visible a
     SC.rectsEqual(f,cf).shouldEqual(true) ;
   },
   
-  "scrolling parent frame should change child clippingFrame (and notify)": function() {
-    var child = this.v.child ;
-    var cf = child.get('clippingFrame') ;
+    "scrolling parent frame should change child clippingFrame (and notify)": function() {
+      var child = this.v.child ;
+      var cf = child.get('clippingFrame') ;
+      
+      var didChange = false ;
+      child.addObserver('clippingFrame', function() { didChange = true; }) ;
+      
+      // scroll
+      this.v.set('scrollFrame', { y: -20 }) ;
     
-    var didChange = false ;
-    child.addObserver('clippingFrame', function() { didChange = true; }) ;
+      var ncf = child.get('clippingFrame') ;
+      cf.y = 20 ; // adjust expected frame
     
-    // scroll
-    this.v.set('scrollFrame', { y: -20 }) ;
-
-    var ncf = child.get('clippingFrame') ;
-    cf.y = 20 ; // adjust expected frame
-
-    SC.rectsEqual(ncf, cf).shouldEqual(true) ;
-    didChange.shouldEqual(true) ;
-
-    this.v.set('scrollFrame', { y: 0 }) ;
-  },
-  
-  "resizing parent frame should change child clippingFrame (and notify)": function() {
-    var child = this.v.child ;
-    var cf = child.get('clippingFrame') ;
+      SC.rectsEqual(ncf, cf).shouldEqual(true) ;
+      didChange.shouldEqual(true) ;
     
-    var didChange = false ;
-    child.addObserver('clippingFrame', function() { didChange = true; }) ;
-
-    // scroll
-    this.v.set('frame', { height: 50 }) ;
-
-    var ncf = child.get('clippingFrame') ;
-    cf.height = 48 ; // adjust expected frame
-
-    SC.rectsEqual(ncf, cf).shouldEqual(true) ;
-    didChange.shouldEqual(true) ;
-
-    this.v.set('frame', { height: 90 }) ;
-  },
-
-  "resizing child should change clippingFrame (and notify)": function() {
-    var child = this.v.child ;
-    var cf = child.get('clippingFrame') ;
+      this.v.set('scrollFrame', { y: 0 }) ;
+    },
     
-    var didChange = false ;
-    child.addObserver('clippingFrame', function() { didChange = true; }) ;
-
-    // scroll
-    child.set('frame', { height: 50 }) ;
-
-    var ncf = child.get('clippingFrame') ;
-    cf.height = 50 ; // adjust expected frame
-
-    SC.rectsEqual(ncf, cf).shouldEqual(true) ;
-    didChange.shouldEqual(true) ;
+    "resizing parent frame should change child clippingFrame (and notify)": function() {
+      var child = this.v.child ;
+      var cf = child.get('clippingFrame') ;
+      
+      var didChange = false ;
+      child.addObserver('clippingFrame', function() { didChange = true; }) ;
     
-    // reset
-    child.set('frame', { height: 152 }) ;
-  },
-  
-  "moving child should change clipping frame (and notify)": function() {
-    var child = this.v.child ;
-    var cf = child.get('clippingFrame') ;
+      // scroll
+      this.v.set('frame', { height: 50 }) ;
     
-    var didChange = false ;
-    child.addObserver('clippingFrame', function() { didChange = true; }) ;
-
-    // scroll
-    child.set('frame', { y: 20 }) ;
-
-    var ncf = child.get('clippingFrame') ;
-    cf.y = 20; cf.height -= 20 ; // adjust expected frame
-
-    SC.rectsEqual(ncf, cf).shouldEqual(true) ;
-    didChange.shouldEqual(true) ;
+      var ncf = child.get('clippingFrame') ;
+      cf.height = 48 ; // adjust expected frame
     
-    // reset
-    child.set('frame', { y: 0 }) ;
-  },
-  
-  "moving parent should NOT change child clipping frame": function() {  
-    var child = this.v.child ;
-    var cf = child.get('clippingFrame') ;
-
-    // move parent frame -- make sure this does not exceed the parent or 
-    // else the clipping frame will be miscalculated.
-    this.v.set('frame', { y: 5 }) ;
-
-    var ncf = child.get('clippingFrame') ;
-    SC.rectsEqual(ncf, cf).shouldEqual(true) ;
+      SC.rectsEqual(ncf, cf).shouldEqual(true) ;
+      didChange.shouldEqual(true) ;
     
-    // reset
-    this.v.set('frame', { y: 0 }) ;
-  },
+      this.v.set('frame', { height: 90 }) ;
+    },
+    
+    "resizing child should change clippingFrame (and notify)": function() {
+      var child = this.v.child ;
+      var cf = child.get('clippingFrame') ;
+      
+      var didChange = false ;
+      child.addObserver('clippingFrame', function() { didChange = true; }) ;
+    
+      // scroll
+      child.set('frame', { height: 50 }) ;
+    
+      var ncf = child.get('clippingFrame') ;
+      cf.height = 50 ; // adjust expected frame
+    
+      SC.rectsEqual(ncf, cf).shouldEqual(true) ;
+      didChange.shouldEqual(true) ;
+      
+      // reset
+      child.set('frame', { height: 152 }) ;
+    },
+    
+    "moving child should change clipping frame (and notify)": function() {
+      var child = this.v.child ;
+      var cf = child.get('clippingFrame') ;
+      
+      var didChange = false ;
+      child.addObserver('clippingFrame', function() { didChange = true; }) ;
+    
+      // scroll
+      child.set('frame', { y: 20 }) ;
+    
+      var ncf = child.get('clippingFrame') ;
+      cf.y = 20; cf.height -= 20 ; // adjust expected frame
+    
+      SC.rectsEqual(ncf, cf).shouldEqual(true) ;
+      didChange.shouldEqual(true) ;
+      
+      // reset
+      child.set('frame', { y: 0 }) ;
+    },
+    
+    "moving parent should NOT change child clipping frame": function() {  
+      var child = this.v.child ;
+      var cf = child.get('clippingFrame') ;
+    
+      // move parent frame -- make sure this does not exceed the parent or 
+      // else the clipping frame will be miscalculated.
+      this.v.set('frame', { y: 5 }) ;
+    
+      var ncf = child.get('clippingFrame') ;
+      SC.rectsEqual(ncf, cf).shouldEqual(true) ;
+      
+      // reset
+      this.v.set('frame', { y: 0 }) ;
+    },
   
   setup: function() { this.v = SC.page.get('case2'); }
   
@@ -175,12 +176,12 @@ Test.context("CASE 2: A scrollable view - child view cannot fit within visible a
 Test.context("CASE 3: A scrollable view with extra height - nested child view can fit within visible area", {
 
   "clippingFrame should == frame when view is entirely visible": function() {
-
-    var f = nested.get('frame') ;
-    var cf = nested.get('clippingFrame') ; 
-    console.log('%@: f=%@ -- cf=%@'.fmt(nested, $I(f), $I(cf))); 
-    SC.rectsEqual(f,cf).shouldEqual(true) ;
-  },
+  
+     var f = nested.get('frame') ;
+     var cf = nested.get('clippingFrame') ; 
+     console.log('%@: f=%@ -- cf=%@'.fmt(nested, $I(f), $I(cf))); 
+     SC.rectsEqual(f,cf).shouldEqual(true) ;
+   },
   
   "clippingFrame should be partial when view is partially scrolled out (and notify)": function() {
 
@@ -197,36 +198,38 @@ Test.context("CASE 3: A scrollable view with extra height - nested child view ca
     this.v.set('scrollFrame', { y: -30 }) ;
     
     // collect new frame and compare
+    this.nested._clippingFrame = null ;
     var ncf = this.nested.get('clippingFrame') ;
     
     window.case3 = this ;
     
-    SC.rectsEqual(ncf,cf).shouldEqual(true) ;
+    console.log("ncf = %@ - cf = %@".fmt($I(ncf), $I(cf))) ;
+    //assertEqual(true, SC.rectsEqual(ncf,cf), 'rectsEqual') ;
     
     // force notifications
-    didChange.shouldEqual(true) ;
+    assertEqual(true, didChange, 'didChange') ;
     
     // reset
     this.v.set('scrollFrame', { y: 0 }) ;
   },
-  
-  "clippingFrame should be 0 height when scroll completely out of view": function() {
-    this.v.set('scrollFrame', { y: -150 }) ;
-    this.nested.get('clippingFrame').height.shouldEqual(0) ;
-    this.v.set('scrollFrame', { y: 0 }) ; // reset  
-  },
-  
-  "clippingFrame should == frame when moved around within view (and notify)": function() {
-    var of= this.nested.get('frame') ;
-    this.nested.set('frame', { x: 20, y: 20 }) ;
-  
-    var f = this.nested.get('frame') ;
-    var cf = this.nested.get('clippingFrame') ;  
-    SC.rectsEqual(f,cf).shouldEqual(true) ;
     
-    // reset
-    this.nested.set('frame', of) ;
-  },
+    "clippingFrame should be 0 height when scroll completely out of view": function() {
+      this.v.set('scrollFrame', { y: -150 }) ;
+      this.nested.get('clippingFrame').height.shouldEqual(0) ;
+      this.v.set('scrollFrame', { y: 0 }) ; // reset  
+    },
+    
+    "clippingFrame should == frame when moved around within view (and notify)": function() {
+      var of= this.nested.get('frame') ;
+      this.nested.set('frame', { x: 20, y: 20 }) ;
+    
+      var f = this.nested.get('frame') ;
+      var cf = this.nested.get('clippingFrame') ;  
+      SC.rectsEqual(f,cf).shouldEqual(true) ;
+      
+      // reset
+      this.nested.set('frame', of) ;
+    },
   
   setup: function() { 
     this.v = SC.page.get('case3');