sproutcore 1.4.5 → 1.5.0.pre.3

data/lib/frameworks/sproutcore/frameworks/foundation/tasks/preload_bundle.js

@@ -22,12 +22,12 @@ SC.PreloadBundleTask = SC.Task.extend({
   bundle: null,
   
   /**
-    The target to supply to SC.loadBundle.
+    The target to supply to SC.Module.loadModule.
   */
   target: "SC",
   
   /**
-    The action to supply to SC.loadBundle.
+    The action to supply to SC.Module.loadModule.
   */
   action: "preloaded",
   
@@ -35,7 +35,7 @@ SC.PreloadBundleTask = SC.Task.extend({
     var bundle;
     if (bundle = this.get("bundle")) {
       var st = Date.now();
-      SC.loadBundle(this.get("bundle"), this.get("target"), this.get("action"));
+      SC.Module.loadModule(this.get("bundle"), this.get("target"), this.get("action"));
     }
   }
 });

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

@@ -180,7 +180,7 @@ function() {
 
   ok(editor.$("textarea").length > 0, "should be using a textarea element");
 });
-
+/* TODO: move these to inlineEditorDelegate tests
 test("inline editor aborts if delegate returns NO to inlineEditorShouldBeginEditing()",
 function() {
   SC.InlineTextFieldView.beginEditing(optionsForLabel2);
@@ -202,7 +202,7 @@ function() {
   ok(view1.get('notifiedWillBegin'), "the delegate should have been notified of begin editing at this point");
   SC.RunLoop.end();
 });
-
+*/
 test("inline editor notifies delegate with inlineEditorDidBeginEditing() after becoming responder",
 function() {
   var view1 = pane.view('label1');

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

@@ -111,6 +111,7 @@ test("Test that auto as a value for width height is set correctly when"
 test("Test that an exception is thrown when calling adjust and setting to auto", 
   function(){
   var error=null;
+  console.log('NOTE: The following error concerning width:auto is expected.');
   parent.adjust('width', 'auto').adjust('height', 'auto');
   try{
     parent.get('layoutStyle');
@@ -140,3 +141,4 @@ test("Test SC.StaticLayout frame support", function() {
   
   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/string.js

@@ -1,53 +1,9 @@
-// ==========================================================================
-// 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("Regular expression escaping a string", function() {
   same('\.+*?[^]$(){}=!<>|:'.escapeForRegExp(), '\\.\\+\\*\\?\\[\\^\\]\\$\\(\\)\\{\\}\\=\\!\\<\\>\\|\\:', "should be escaped");
 });
 
 test("Pluralizing a string", function() {
-	expect(8);
+  expect(8);
   same('Goat'.pluralize(), 'Goats', "standard pluralization");
   same('There are many goat'.pluralize(), 'There are many goats', "standard pluralization of a multi-word string");
   same('Bunny'.pluralize(), 'Bunnies', "non-standard pluralization");
@@ -59,7 +15,7 @@ test("Pluralizing a string", function() {
 });
 
 test("Singularizing a string", function() {
-	expect(8);
+  expect(8);
   same('Vegetables'.singularize(), 'Vegetable', "standard singularization");
   same('Broccoli is a vegetables'.singularize(), 'Broccoli is a vegetable', "standard singularization of a multi-word string");
   same('Properties'.singularize(), 'Property', "non-standard singularization");
@@ -70,14 +26,3 @@ test("Singularizing a string", function() {
   same('Gotta git da money'.singularize(), 'Gotta git da money', "uncountable singularization of a multi-word string");
 });
 
-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/tests/system/core_query/setClass.js

@@ -38,12 +38,22 @@ test("setClass(new, NO) should do nothing", function() {
 
 test("setClass(mixed, YES) should work across multiple", function() {
   var cq = SC.$('<div class="root">\
-    <div class="mixed match"></div>\
+    <div class="match"></div>\
     <div class="match"></div>\
   </div>').find('.match');
   equals(cq.length, 2, 'should have two items');
-  equals(cq.hasClass("mixed"), NO, "should not all have mixed class");
-  
+
+  var allHaveMixed = YES;
+  cq.each(function(el){
+    if (!SC.$(el).hasClass('mixed')) allHaveMixed = NO;
+  });
+  equals(allHaveMixed, NO, "should not all have mixed class");
+
   cq.setClass("mixed", YES);
+
+  allHaveMixed = YES;
+  cq.each(function(el){
+    if (!SC.$(el).hasClass('mixed')) allHaveMixed = NO;
+  });
   equals(cq.hasClass("mixed"), YES, "now all should have mixed class") ;
 }) ;

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

@@ -6,17 +6,17 @@
 var url, request, contents ;
 
 module("SC.Request", {
-  
+
   setup: function() {
     url = sc_static("file_exists.json"); //"/static/sproutcore/en/desktop/_src/desktop.platform/english.lproj/file_exists.json" ;
     request = SC.Request.getUrl(url) ;
     contents = null ;
   },
-  
+
   teardown: function() {
     url = request = contents;
   }
-  
+
 });
 
 test("Basic Requirements", function() {
@@ -27,33 +27,32 @@ test("Basic Requirements", function() {
 });
 
 test("Test Asynchronous GET Request", function() {
-  
+
   var response, timer;
 
   timer = setTimeout(function() {
     ok(false, 'response did not invoke notify() within 2sec');
     window.start();
   }, 2000);
-  
+
   request.notify(this, function(response) {
     ok(SC.ok(response), 'response should not be an error');
     equals(response.get('body'), '{"message": "Yay!"}', 'should match retrieved message');
     clearTimeout(timer);
     window.start();
   });
-  
+
   response = request.send();
   ok(response !== null, 'request.send() should return a response object');
   ok(response.get('status')<0, 'response should still not have a return code since this should be async');
-  
+
   stop() ; // stops the test runner - wait for response
 });
 
 test("Test Synchronous GET Request", function() {
-
-  request.set("isAsynchronous", NO);  
+  request.set("isAsynchronous", NO);
   var response = request.send();
-  
+
   ok(response !== null, 'send() should return response') ;
   ok(SC.$ok(response), 'contents should not be an error ');
   equals(response.get('body'), '{"message": "Yay!"}', 'should match retrieved message') ;
@@ -69,16 +68,16 @@ test("Test Asynchronous GET Request, auto-deserializing JSON", function() {
     ok(false, 'response did not invoke notify()');
     window.start();
   }, 1000);
-  
+
   request.notify(this, function(response) {
     ok(SC.ok(response), 'response should not be error');
     same(response.get('body'), {"message": "Yay!"}, 'repsonse.body');
     clearTimeout(timer);
     window.start();
   });
-  
+
   request.send();
-  
+
   stop() ; // stops the test runner
 
 });
@@ -90,21 +89,21 @@ test("Test auto-deserializing malformed JSON", function() {
     ok(false, 'response did not invoke notify()');
     window.start();
   }, 1000);
-  
+
   request.notify(this, function(response) {
     ok(SC.ok(response), 'response should not be error');
-    
+
     try {
       var body = response.get('body');
       ok(!SC.ok(body), 'body should be an error');
     } catch(e) {
       ok(false, 'getting the body should not throw an exception');
     }
-    
+
     clearTimeout(timer);
     window.start();
   });
-  
+
   request.send();
 
   stop();
@@ -113,9 +112,9 @@ test("Test auto-deserializing malformed JSON", function() {
 test("Test Synchronous GET Request, auto-deserializing JSON", function() {
   request.set("isAsynchronous", false);
   request.set("isJSON", true);
-  
+
   var response = request.send();
-  
+
   ok(response !== null, 'response should not be null') ;
   ok(SC.ok(response), 'contents should not be an error');
   same(response.get('body'), {"message": "Yay!"}, 'contents should have message') ;
@@ -127,11 +126,11 @@ test("Test if Request body is being auto-serializing to JSON", function() {
   request.set("isJSON", true).set('body', objectToPost);
 
   var jsonEncoded = request.get('encodedBody');
-  
+
   equals(jsonEncoded, '{"content":"garbage"}', "The json object passed in send should be encoded and set as the body");
 });
 
- 
+
 test("Test Multiple Asynchronous GET Request - two immediate, and two in serial", function() {
   var requestCount = 3;
   var responseCount = 0;
@@ -145,12 +144,12 @@ test("Test Multiple Asynchronous GET Request - two immediate, and two in serial"
       requestCount++;
     }
   };
-  
-  
+
+
   SC.Request.getUrl(url).notify(this, observer).send();
   SC.Request.getUrl(url).notify(this, observer).send();
   SC.Request.getUrl(url).notify(this, observer).send();
-  
+
   stop() ; // stops the test runner
   setTimeout( function(){
     equals(requestCount, 6, "requestCount should be 6");
@@ -159,11 +158,18 @@ test("Test Multiple Asynchronous GET Request - two immediate, and two in serial"
   }, 2000);
 });
 
+/**
+  There are two ways to be notified of request changes:
+
+    - Implementing a didReceive function on the SC.Request object
+    - Registering a listener using notify()
 
-test("Test timeouts", function() {
+  The following two tests test the timeout functionality for each of these.
+*/
+test("Timeouts - SC.Request didReceive callback", function() {
   var message;
-  
-  // Sanity check 1
+
+  // Sanity check - Should throw an error if we try to set a timeout of 0s.
   try {
     SC.Request.getUrl(url).set('timeout', 0).send();
   }
@@ -171,8 +177,8 @@ test("Test timeouts", function() {
     message = e;
   }
   ok(message && message.indexOf("The timeout value must either not be specified or must be greater than 0") !== -1, 'An error should be thrown when the timeout value is 0 ms');
-  
-  // Sanity check 2
+
+  // Sanity check 2 - Can't set timeouts on synchronous XHR requests
   try {
     SC.Request.getUrl(url).set('isAsynchronous', NO).set('timeout', 10).send();
   }
@@ -183,41 +189,85 @@ test("Test timeouts", function() {
 
 
   // Make sure timeouts actually fire, and fire when expected.
-  var changedBefore  = NO,
-      changedAfter   = NO,
-      timeoutRequest = SC.Request.getUrl("http://www.sproutcore.com"),
+  // Point to the server itself so that the tests will work even when offline
+  var timeoutRequest = SC.Request.getUrl("/"),
       checkstop;
 
   var now = Date.now();
-  
-  // make the timeout as short as possible so that it will always happen
+
+  // Set timeout as short as possible so that it will always timeout before
+  // the request returns.
+  // This test will fail should the response time drop to
+  // below 10ms.
   timeoutRequest.set('timeout', 10);
-  timeoutRequest.set('didTimeout', function() { 
-    // at least timeout time must have elapsed
-    var elapsed = Date.now()-now;
-    ok(elapsed >= 10, 'timeout must not fire earlier than 10msec - actual %@'.fmt(elapsed));
 
-    // timeout did fire...just resume...
-    clearTimeout(checkstop);
-    window.start();
+  timeoutRequest.set('didReceive', function(request, response) {
+    // Test runner is paused after the request is sent; resume unit testing
+    // once we receive a response.
+    start();
+
+    // If this response was caused by a timeout…
+    if (response.get('timedOut')) {
+      equals(response.get('status'), 0,
+             'Timed out responses should have status 0');
+
+      // We should never be called before the timeout we specified
+      var elapsed = Date.now()-now;
+      ok(elapsed >= 10,
+        'timeout must not fire earlier than 10msec - actual %@'.fmt(elapsed));
+
+      // Since we received a timeout, we can stop the timer that will resume
+      // the test runner if no timeout is ever received.
+      clearTimeout(checkstop);
+    } else {
+      // We received a response from thes server, which should never happen
+      ok(false, 'timeout did not fire before response was received.  should have fired after 10msec.  response time: %@msec'.fmt(Date.now() - now));
+    }
   });
-  
-  timeoutRequest.set('didReceive', function() { 
-    ok(false, 'timeout did not fire before response was recieved.  should have fired after 10msec.  response time: %@msec'.fmt(Date.now() - now));
-    window.start(); // resume
+
+  SC.RunLoop.begin();
+  timeoutRequest.send();
+  SC.RunLoop.end();
+
+  // Stop the test runner and wait for a timeout or a response.
+  stop();
+
+  // In case we never receive a timeout, just start unit testing again after
+  // 500ms.
+  checkstop = setTimeout(function() {
+    window.start();
+    ok(false, 'timeout did not fire at all');
+  }, 500);
+});
+
+test("Timeouts - Status listener callback", function() {
+  // Make sure timeouts actually fire, and fire when expected.
+  // Point to local server so test works offline
+  var timeoutRequest = SC.Request.getUrl("/"),
+      checkstop;
+
+  // make the timeout as short as possible so that it will always happen
+  timeoutRequest.timeoutAfter(10).notify(this, function(response) {
+    start();
+    clearTimeout(checkstop);
+
+    equals(response.get('status'), 0, "Status code should be zero");
+    equals(response.get('timedOut'), YES, "Should have timedOut property set to YES");
+    // timeout did fire...just resume...
+
+    return YES;
   });
-  
+
   SC.RunLoop.begin();
   timeoutRequest.send();
   SC.RunLoop.end();
-  
+
   stop() ; // stops the test runner
 
   // in case nothing works
   checkstop = setTimeout(function() {
     ok(false, 'timeout did not fire at all');
     window.start();
-  }, 500); 
-  
+  }, 500);
 });
 

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

@@ -5,6 +5,8 @@
 
 var router;
 
+SC.routes.wantsHistory = YES;
+
 module('SC.routes setup');
 
 test('Setup', function() {
@@ -19,7 +21,7 @@ module('SC.routes setup', {
         return;
       }
     });
-    SC.run(function() { 
+    SC.run(function() {
       SC.routes.add('foo', router, router.route);
     });
   }
@@ -88,7 +90,7 @@ test('Route tree', function() {
   ok(s, 'There should be a wildcardRoutes tree for a');
   
   equals(r.routeForParts(['a'], {}), null, 'routeForParts should return null for non existant routes');
-  equals(r.routeForParts(['a', 'b'], {}), null, 'routeForParts should return null for non existant routes');  
+  equals(r.routeForParts(['a', 'b'], {}), null, 'routeForParts should return null for non existant routes');
   equals(r.routeForParts(abc, {}), c, 'routeForParts should return the correct route for a/b/c');
   
   equals(r.routeForParts(abd, {}), d, 'routeForParts should return the correct route for a/b/d');
@@ -111,7 +113,7 @@ module('SC.routes location', {
   
 });
 
-var routeWorks = function(route, name) {  
+var routeWorks = function(route, name) {
   SC.routes.set('location', route);
   equals(SC.routes.get('location'), route, name + ' route has been set');
   
@@ -123,7 +125,7 @@ var routeWorks = function(route, name) {
   stop();
 };
 
-test('Null route', function() {  
+test('Null route', function() {
   SC.routes.set('location', null);
   equals(SC.routes.get('location'), '', 'Null route is the empty string');
 });
@@ -296,21 +298,23 @@ module('SC.routes location observing', {
 test('Location change', function() {
   var timer;
   
-  timer = setTimeout(function() {
-    ok(false, 'Route change was not notified within 2 seconds');
-    window.start();
-  }, 2000);
-  
-  router.addObserver('hasBeenNotified', function() {
-    equals(router.get('hasBeenNotified'), YES, 'router should have been notified');
-    clearTimeout(timer);
-    window.start();
-  });
-  
-  SC.routes.add('foo', router, router.route);
-  window.location.hash = 'foo';
-  
-  stop();  
+  if (!SC.routes.get('usesHistory')) {
+    timer = setTimeout(function() {
+      ok(false, 'Route change was not notified within 2 seconds');
+      window.start();
+    }, 2000);
+
+    router.addObserver('hasBeenNotified', function() {
+      equals(router.get('hasBeenNotified'), YES, 'router should have been notified');
+      clearTimeout(timer);
+      window.start();
+    });
+
+    SC.routes.add('foo', router, router.route);
+    window.location.hash = 'foo';
+
+    stop();
+  }
 });
 
 module('_extractParametersAndRoute');
@@ -337,7 +341,7 @@ test('_extractParametersAndRoute with ? syntax', function() {
        'route should be well formatted with the given parameters even if there is no initial route');
 });
 
-test('_extractParametersAndRoute with & syntax', function() {  
+test('_extractParametersAndRoute with & syntax', function() {
   same(SC.routes._extractParametersAndRoute({ route: 'videos/5&format=h264' }),
        { route: 'videos/5', params:'&format=h264', format: 'h264' },
        'route parameters should be correctly extracted');