sproutcore 1.9.2 → 1.10.0.rc.1

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/inline_text_field/beginEditing.js

@@ -20,9 +20,10 @@ pane = SC.ControlTestPane.design().add("label1", SC.LabelView, {
   inlineEditorWillBeginEditing: function(inlineEditor) {
     this.set('notifiedWillBegin', YES);
 
-    // The inline editor is the last view appended to the pane
-    var length = pane._pane.childViews.length,
-    editor = pane._pane.childViews[length - 1];
+    // The inline editor is the last view appended to the parent
+    var parentView = this.get('parentView'),
+      length = parentView.childViews.length,
+      editor = parentView.childViews[length - 1];
 
     ok(!editor.get('isFirstResponder'), "should not be first responder yet");
 
@@ -32,9 +33,10 @@ pane = SC.ControlTestPane.design().add("label1", SC.LabelView, {
   inlineEditorDidBeginEditing: function(inlineEditor) {
     this.set('notifiedDidBegin', YES);
 
-    // The inline editor is the last view appended to the pane
-    var length = pane._pane.childViews.length,
-    editor = pane._pane.childViews[length - 1];
+    // The inline editor is the last view appended to the parent
+    var parentView = this.get('parentView'),
+      length = parentView.childViews.length,
+      editor = parentView.childViews[length - 1];
 
     ok(editor.get('isFirstResponder'), "should be first responder now");
 
@@ -65,11 +67,9 @@ optionsForLabelFromView = function(view) {
   var optionsForLabel = {
     frame: f,
     delegate: view,
-    pane: pane._pane,
     exampleElement: view.$(),
     value: view.get('value'),
     multiline: view.get('isInlineEditorMultiline'),
-    isCollection: NO,
     validator: view.get('validator'),
     exampleInlineTextFieldView: view.get('exampleInlineTextFieldView')
   };
@@ -135,10 +135,11 @@ function() {
   SC.InlineTextFieldView.beginEditing(optionsForLabel1);
   SC.RunLoop.end();
 
-  // The inline editor is the last view appended to the pane
-  var length = pane._pane.childViews.length,
-  editor = pane._pane.childViews[length - 1],
-  view = pane.view('label1');
+  // The inline editor is the last view appended to the parent
+  var view = pane.view('label1'),
+    parentView = view.get('parentView'),
+    length = parentView.childViews.length,
+    editor = parentView.childViews[length - 1];
 
   equals(editor.get('value'), view.get('value'), "editor should have the same initial value as its label");
 });
@@ -149,9 +150,11 @@ function() {
   SC.InlineTextFieldView.beginEditing(optionsForLabel1);
   SC.RunLoop.end();
 
-  // The inline editor is the last view appended to the pane
-  var length = pane._pane.childViews.length,
-  editor = pane._pane.childViews[length - 1];
+  // The inline editor is the last view appended to the parent
+  var view = pane.view('label1'),
+    parentView = view.get('parentView'),
+    length = parentView.childViews.length,
+    editor = parentView.childViews[length - 1];
 
   ok(editor.$("input").length > 0, "should be using an input element");
 });
@@ -164,9 +167,11 @@ function() {
   SC.InlineTextFieldView.beginEditing(optionsForLabel1);
   SC.RunLoop.end();
 
-  // The inline editor is the last view appended to the pane
-  var length = pane._pane.childViews.length,
-  editor = pane._pane.childViews[length - 1];
+  // The inline editor is the last view appended to the parent
+  var view = pane.view('label1'),
+    parentView = view.get('parentView'),
+    length = parentView.childViews.length,
+    editor = parentView.childViews[length - 1];
 
   ok(editor.$("textarea").length > 0, "should be using a textarea element");
 });
@@ -217,9 +222,12 @@ function() {
   SC.InlineTextFieldView.beginEditing(optionsForLabel1);
   SC.RunLoop.end();
 
-  // The inline editor is the last view appended to the pane
-  var length = pane._pane.childViews.length,
-  editor = pane._pane.childViews[length - 1];
+  // The inline editor is the last view appended to the parent
+  var view = pane.view('label1'),
+    parentView = view.get('parentView'),
+    length = parentView.childViews.length,
+    editor = parentView.childViews[length - 1];
+
   same(editor.get('value'), 0, "editor should have number 0 as value");
   editor.blurEditor();
 

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/staticLayout.js

@@ -136,14 +136,12 @@ test("Test SC.StaticLayout frame support", function() {
   
   equals(child.get('frame'), null, "View's frame property will be null when useStaticLayout is YES and layer is not attached to DOM.");
   
-  parent.createLayer();
-  var layer = parent.get('layer');
-  document.body.appendChild(layer);
-  
   SC.RunLoop.begin();
-  parent.appendChild(child);
+  child._doRender();
+  child._doAttach(document.body);
   SC.RunLoop.end();
   
+  ok(child.get('layout') === SC.View.prototype.layout, "Hit fast path when useStaticLayout && no layout specified");
   ok(SC.typeOf(child.get('frame')) === SC.T_HASH, "View's frame property will be an object when useStaticLayout is YES and layer is attached to DOM.");
 });
 

data/lib/frameworks/sproutcore/frameworks/foundation/tests/mixins/validatable/ui.js

@@ -9,15 +9,13 @@
 
 (function() {
   var pane = SC.ControlTestPane.design()
-  .add("with valid value", SC.View.extend(SC.Validatable), { 
+  .add("with valid value", SC.View.extend(SC.Validatable), {
     value: SC.Object.create({ data: 'here is some data' })
   })
-  
-  .add("with error value", SC.View.extend(SC.Validatable), { 
+
+  .add("with error value", SC.View.extend(SC.Validatable), {
     value: SC.Error.create({ errorValue: 'bad data', message: 'Input is bad' })
   });
-    
-pane.show(); // add a test to show the test pane
 
 pane.verifyInvalid = function(view, isInvalid) {
   var layer = view.$();
@@ -32,7 +30,7 @@ pane.verifyInvalid = function(view, isInvalid) {
 
 // ..........................................................
 // TEST INITIAL STATES
-// 
+//
 
 module('SC.Validatable ui', pane.standardSetup());
 
@@ -53,21 +51,21 @@ test("with invalid value", function() {
 
 test("changing from invalid to valid", function() {
   var view = pane.view('with error value');
-  
+
   SC.RunLoop.begin();
   view.set('value', 'not an SC.Error instance');
   SC.RunLoop.end();
-  
+
   pane.verifyInvalid(view, NO);
 });
 
 test("changing from valid to invalid", function() {
   var view = pane.view('with valid value');
-  
+
   SC.RunLoop.begin();
   view.set('value', SC.Error.create());
   SC.RunLoop.end();
-  
+
   pane.verifyInvalid(view, YES);
 });
 

data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/app_cache_test.js

@@ -0,0 +1,81 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2012 7x7 Software, Inc.
+// License:   Licensed under MIT license
+// ==========================================================================
+/*globals module, test, ok, isObj, equals, expects, start, stop*/
+
+
+module('SC.appCache');
+
+test("hasNewVersion is computed properly", function() {
+  if (SC.platform.supportsApplicationCache) {
+    SC.appCache.set('status', 0);
+    equals(SC.appCache.get('hasNewVersion'), undefined, "When status is 0, hasNewVersion should be");
+
+    SC.appCache.set('status', 1);
+    equals(SC.appCache.get('hasNewVersion'), false, "When status is 1, hasNewVersion should be");
+
+    SC.appCache.set('status', 2);
+    equals(SC.appCache.get('hasNewVersion'), undefined, "When status is 2, hasNewVersion should be");
+
+    SC.appCache.set('status', 3);
+    equals(SC.appCache.get('hasNewVersion'), undefined, "When status is 3, hasNewVersion should be");
+
+    SC.appCache.set('status', 4);
+    equals(SC.appCache.get('hasNewVersion'), true, "When status is 4, hasNewVersion should be");
+
+    SC.appCache.set('status', 5);
+    equals(SC.appCache.get('hasNewVersion'), true, "When status is 5, hasNewVersion should be");
+  } else {
+    equals(SC.appCache.get('hasNewVersion'), false, "When supportsApplicationCache is false, hasNewVersion should be");
+  }
+});
+
+test("isNewVersionValid is computed properly", function() {
+  if (SC.platform.supportsApplicationCache) {
+    SC.appCache.set('status', 0);
+    equals(SC.appCache.get('isNewVersionValid'), undefined, "When status is 0, isNewVersionValid should be");
+
+    SC.appCache.set('status', 1);
+    equals(SC.appCache.get('isNewVersionValid'), undefined, "When status is 1, isNewVersionValid should be");
+
+    SC.appCache.set('status', 2);
+    equals(SC.appCache.get('isNewVersionValid'), undefined, "When status is 2, isNewVersionValid should be");
+
+    SC.appCache.set('status', 3);
+    equals(SC.appCache.get('isNewVersionValid'), undefined, "When status is 3, isNewVersionValid should be");
+
+    SC.appCache.set('status', 4);
+    equals(SC.appCache.get('isNewVersionValid'), true, "When status is 4, isNewVersionValid should be");
+
+    SC.appCache.set('status', 5);
+    equals(SC.appCache.get('isNewVersionValid'), false, "When status is 5, isNewVersionValid should be");
+  } else {
+    equals(SC.appCache.get('isNewVersionValid'), false, "When supportsApplicationCache is false, isNewVersionValid should be");
+  }
+});
+
+test("isReadyForOffline is computed properly", function() {
+  if (SC.platform.supportsApplicationCache) {
+    SC.appCache.set('status', 0);
+    equals(SC.appCache.get('isReadyForOffline'), false, "When status is 0, isReadyForOffline should be");
+
+    SC.appCache.set('status', 1);
+    equals(SC.appCache.get('isReadyForOffline'), true, "When status is 1, isReadyForOffline should be");
+
+    SC.appCache.set('status', 2);
+    equals(SC.appCache.get('isReadyForOffline'), undefined, "When status is 2, isReadyForOffline should be");
+
+    SC.appCache.set('status', 3);
+    equals(SC.appCache.get('isReadyForOffline'), undefined, "When status is 3, isReadyForOffline should be");
+
+    SC.appCache.set('status', 4);
+    equals(SC.appCache.get('isReadyForOffline'), true, "When status is 4, isReadyForOffline should be");
+
+    SC.appCache.set('status', 5);
+    equals(SC.appCache.get('isReadyForOffline'), false, "When status is 5, isReadyForOffline should be");
+  } else {
+    equals(SC.appCache.get('isReadyForOffline'), false, "When supportsApplicationCache is false, isReadyForOffline should be");
+  }
+});

data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/image_queue.js

@@ -13,8 +13,8 @@ var guardTimeout, firstGoodImageURL, secondGoodImageURL, badImageURL;
 module("Image Queue", {
   setup: function() {
 		guardTimeout = 30000;
-		firstGoodImageURL = sc_static('images/sproutcore.png');
-		secondGoodImageURL = sc_static('images/sproutcore-logo.png');
+		firstGoodImageURL = sc_static('images/sproutcore-128.png');
+		secondGoodImageURL = sc_static('images/sproutcore-256.png');
 		badImageURL = "http://www.sproutcore.com/images/foobar.png";
 	}
 });

data/lib/frameworks/sproutcore/frameworks/foundation/tests/system/utils/pointInElement.js

@@ -77,9 +77,6 @@ var pane = SC.ControlTestPane.extend()
     layout: { left: 10, top: 10, width: 100, height: 50 }
   });
 
-pane.show();
-
-
 module("SC.pointInElement()", {
   setup: function(){
     htmlbody('<style> .custom { background-color: #BBF; } .padding { padding: 10px !important; } .border { border: 10px red solid !important;} .margin { margin: 10px !important; } .padding-em { padding: 10em !important; } .border-em { border: 10em red solid !important;} .margin-em { margin: 10em !important; } .child { background-color: #AAA; width: 80px; height: 80px; } .absolute { position: absolute; top: 10px; left: 10px; } </style>');

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/container/methods.js

@@ -4,5 +4,44 @@
 //            portions copyright @2011 Apple Inc.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
+/*global module, test, ok, equals*/
+var containerView,
+  pane;
 
-module("TODO: Test SC.ContainerView Methods");
+module("SC.ContainerView Methods", {
+  setup: function () {
+    SC.run(function () {
+
+      containerView = SC.ContainerView.create({
+        nowShowing: null
+      });
+
+      pane = SC.Pane.create({
+        layout: { width: 200, height: 200, left: 0, top: 0 },
+        childViews: [containerView]
+      }).append();
+    });
+
+    SC.run(function () {
+      containerView.awake();
+    });
+  },
+
+  teardown: function () {
+    pane.remove();
+    containerView = pane = null;
+  }
+});
+
+/**
+  There was a regression where destroying a ContainerView that had never had
+  a nowShowing view set would throw an exception.
+  */
+test("Test destroy method.", function () {
+  try {
+    containerView.destroy();
+    ok(true, "ContainerView.prototype.destroy should not fail to work if the ContainerView has no view showing.");
+  } catch (ex) {
+    ok(false, "ContainerView.prototype.destroy should not fail to work if the ContainerView has no view showing.  Ex: %@".fmt(ex));
+  }
+});

data/lib/frameworks/sproutcore/frameworks/foundation/tests/views/container/transition_test.js

@@ -0,0 +1,143 @@
+// ==========================================================================
+// Project:   SproutCore
+// Copyright: @2012 7x7 Software, Inc.
+// License:   Licensed under MIT license (see license.js)
+// ==========================================================================
+/*global module, test, ok, equals*/
+
+
+var containerView,
+  pane,
+  view1, view2;
+
+module("SC.ContainerView Transitions", {
+  setup: function () {
+    SC.run(function () {
+      view1 = SC.View.create({
+        toString: function () { return 'View 1'; }
+      });
+
+      view2 = SC.View.create({
+        toString: function () { return 'View 2'; }
+      });
+
+      containerView = SC.ContainerView.create({
+        nowShowing: view1
+      });
+
+      pane = SC.Pane.create({
+        layout: { width: 200, height: 200, left: 0, top: 0 },
+        childViews: [containerView]
+      }).append();
+    });
+
+    SC.run(function () {
+      containerView.awake();
+    });
+  },
+
+  teardown: function () {
+    pane.remove();
+    containerView = pane = view1 = view2 = null;
+  }
+});
+
+
+test("Test assumptions on the initial state of the container and views.", function () {
+  ok(!containerView.get('isTransitioning'), "Container view should not indicate that it is transitioning.");
+  ok(containerView.get('childViews').contains(view1), "View 1 should be a child view of container.");
+  ok(!containerView.get('childViews').contains(view2), "View 2 should not be a child view of container.");
+});
+
+
+test("Test that the default transition (null) simply swaps the views.", function () {
+  containerView.set('nowShowing', view2);
+
+  equals(containerView.get('contentView'), view2, "Container's contentView should be");
+  ok(!containerView.get('childViews').contains(view1), "View 1 should no longer be a child view of container.");
+});
+
+test("Test that the isTransitioning property of container view updates accordingly.", function () {
+  // Pause the test execution.
+  window.stop(2000);
+
+  SC.run(function () {
+    containerView.set('transition', SC.ContainerView.PUSH);
+    containerView.set('nowShowing', view2);
+  });
+
+  ok(containerView.get('isTransitioning'), "Container view should indicate that it is transitioning.");
+
+  setTimeout(function () {
+    ok(!containerView.get('isTransitioning'), "Container view should not indicate that it is transitioning.");
+
+    window.start();
+  }, 1000);
+});
+
+test("Test that the container view calls the proper transition plugin methods.", function () {
+  var willBuildInToViewCalled = 0,
+    buildInToViewCalled = 0,
+    buildInDidCancelCalled = 0,
+    didBuildInToViewCalled = 0,
+    willBuildOutFromViewCalled = 0,
+    buildOutFromViewCalled = 0,
+    buildOutDidCancelCalled = 0,
+    didBuildOutFromViewCalled = 0,
+    plugin;
+
+  // Pause the test execution.
+  window.stop(2000);
+
+  plugin = {
+    willBuildInToView: function () { willBuildInToViewCalled++; },
+    buildInToView: function (statechart) {
+      buildInToViewCalled++;
+
+      setTimeout(function () {
+        statechart.entered();
+      }, 200);
+    },
+    buildInDidCancel: function () { buildInDidCancelCalled++; },
+    didBuildInToView: function () { didBuildInToViewCalled++; },
+    willBuildOutFromView: function () { willBuildOutFromViewCalled++; },
+    buildOutFromView: function (statechart) {
+      buildOutFromViewCalled++;
+
+      setTimeout(function () {
+        statechart.exited();
+      }, 200);
+    },
+    buildOutDidCancel: function () { buildOutDidCancelCalled++; },
+    didBuildOutFromView: function () { didBuildOutFromViewCalled++; }
+  };
+
+  containerView.set('transition', plugin);
+  containerView.set('nowShowing', view2);
+  equals(willBuildInToViewCalled, 1, "willBuildInToViewCalled() should have been called this many times");
+  equals(willBuildOutFromViewCalled, 1, "willBuildOutFromViewCalled() should have been called this many times");
+  equals(buildInToViewCalled, 1, "buildInToViewCalled() should have been called this many times");
+  equals(buildOutFromViewCalled, 1, "buildOutFromViewCalled() should have been called this many times");
+  equals(buildInDidCancelCalled, 0, "buildInDidCancelCalled() should have been called this many times");
+  equals(buildOutDidCancelCalled, 0, "buildOutDidCancelCalled() should have been called this many times");
+  equals(didBuildInToViewCalled, 0, "didBuildInToViewCalled() should have been called this many times");
+  equals(didBuildOutFromViewCalled, 0, "didBuildOutFromViewCalled() should have been called this many times");
+
+  SC.run(function () {
+    setTimeout(function () {
+      equals(buildInDidCancelCalled, 0, "buildInDidCancelCalled() should have been called this many times");
+      equals(buildOutDidCancelCalled, 0, "buildOutDidCancelCalled() should have been called this many times");
+      equals(didBuildInToViewCalled, 0, "didBuildInToViewCalled() should have been called this many times");
+      equals(didBuildOutFromViewCalled, 0, "didBuildOutFromViewCalled() should have been called this many times");
+    }, 100);
+  });
+
+  setTimeout(function () {
+    equals(buildInDidCancelCalled, 0, "buildInDidCancelCalled() should have been called this many times");
+    equals(buildOutDidCancelCalled, 0, "buildOutDidCancelCalled() should have been called this many times");
+    equals(didBuildInToViewCalled, 1, "didBuildInToViewCalled() should have been called this many times");
+    equals(didBuildOutFromViewCalled, 1, "didBuildOutFromViewCalled() should have been called this many times");
+
+    window.start();
+  }, 300);
+});