sproutit-sproutcore 1.0.0.20090416161445 → 1.0.0.20090720093355

data/frameworks/sproutcore/frameworks/foundation/tests/system/core_query/jquery_core.js

@@ -313,7 +313,7 @@ test("SC.CoreQuery()", function() {
  expect(8);
 
  var main = SC.$("#main");
- isSet( SC.$("div p", main).get(), q("sndp", "en", "sap"), "Basic selector with SC.$ object as context" );
+ same( SC.$("div p", main).get(), q("sndp", "en", "sap"), "Basic selector with SC.$ object as context" );
 
  var code = SC.$("<code/>");
  equals( code.length, 1, "Correct number of elements generated for code" );
@@ -366,7 +366,7 @@ test("size()", function() {
 
 test("get()", function() {
  expect(1);
- isSet( SC.$("p").get(), q("firstp","ap","sndp","en","sap","first"), "Get All Elements" );
+ same( SC.$("p").get(), q("firstp","ap","sndp","en","sap","first"), "Get All Elements" );
 });
 
 test("get(Number)", function() {
@@ -376,8 +376,8 @@ test("get(Number)", function() {
 
 test("add(String|Element|Array|undefined)", function() {
  expect(12);
- isSet( SC.$("#sndp").add("#en").add("#sap").get(), q("sndp", "en", "sap"), "Check elements from document" );
- isSet( SC.$("#sndp").add( SC.$("#en")[0] ).add( SC.$("#sap") ).get(), q("sndp", "en", "sap"), "Check elements from document" );
+ same( SC.$("#sndp").add("#en").add("#sap").get(), q("sndp", "en", "sap"), "Check elements from document" );
+ same( SC.$("#sndp").add( SC.$("#en")[0] ).add( SC.$("#sap") ).get(), q("sndp", "en", "sap"), "Check elements from document" );
  ok( SC.$([]).add(SC.$("#form")[0].elements).length >= 13, "Check elements from array" );
 
  var x = SC.$([]).add(SC.$("<p id='x1'>xxx</p>")).add(SC.$("<p id='x2'>xxx</p>"));
@@ -969,7 +969,7 @@ test("val()", function() {
  
  equals( SC.$('#select2').val(), '3', 'Call val() on a single="single" select' );
 
- isSet( SC.$('#select3').val(), ['1', '2'], 'Call val() on a multiple="multiple" select' );
+ same( SC.$('#select3').val(), ['1', '2'], 'Call val() on a multiple="multiple" select' );
 
  equals( SC.$('#option3c').val(), '2', 'Call val() on a option element with value' );
  
@@ -1051,11 +1051,11 @@ test("filter()", function() {
  expect(5);
  
  // psuedo-selectors are not supported
- //isSet( SC.$("#form input").filter(":checked").get(), q("radio2", "check1"), "filter(String)" );
+ //same( SC.$("#form input").filter(":checked").get(), q("radio2", "check1"), "filter(String)" );
 
- isSet( SC.$("p").filter("#ap, #sndp").get(), q("ap", "sndp"), "filter('String, String')" );
- isSet( SC.$("p").filter("#ap,#sndp").get(), q("ap", "sndp"), "filter('String,String')" );
- isSet( SC.$("p").filter(function() { return !SC.$("a", this).length; }).get(), q("sndp", "first"), "filter(Function)" );
+ same( SC.$("p").filter("#ap, #sndp").get(), q("ap", "sndp"), "filter('String, String')" );
+ same( SC.$("p").filter("#ap,#sndp").get(), q("ap", "sndp"), "filter('String,String')" );
+ same( SC.$("p").filter(function() { return !SC.$("a", this).length; }).get(), q("sndp", "first"), "filter(Function)" );
 
  // using contents will get comments regular, text, and comment nodes
  var j = SC.$("#nonnodes").contents();
@@ -1070,16 +1070,16 @@ test("not()", function() {
  equals( SC.$("#main p#ap a").not("#google").length, 3, "not('selector')" );
  equals( SC.$("#main p#ap a").not(document.getElementById("google")).length, 3, "not(DOMElement)" );
 
- isSet( SC.$("p").not(".result").get(), q("firstp", "ap", "sndp", "en", "sap", "first"), "not('.class')" );
+ same( SC.$("p").not(".result").get(), q("firstp", "ap", "sndp", "en", "sap", "first"), "not('.class')" );
 
- isSet( SC.$("p").not("#ap, #sndp, .result").get(), q("firstp", "en", "sap", "first"), "not('selector, selector')" );
+ same( SC.$("p").not("#ap, #sndp, .result").get(), q("firstp", "en", "sap", "first"), "not('selector, selector')" );
 
- isSet( SC.$("p").not(SC.$("#ap, #sndp, .result")).get(), q("firstp", "en", "sap", "first"), "not(SC.$)" );
+ same( SC.$("p").not(SC.$("#ap, #sndp, .result")).get(), q("firstp", "en", "sap", "first"), "not(SC.$)" );
 
  equals( SC.$("p").not(document.getElementsByTagName("p")).length, 0, "not(Array-like DOM collection)" );
 
  // not supported selectors
- //isSet( SC.$("#form option").not("option.emptyopt:contains('Nothing'),[selected],[value='1']").get(), q("option1c", "option1d", "option2c", "option3d", "option3e" ), "not('complex selector')");
+ //same( SC.$("#form option").not("option.emptyopt:contains('Nothing'),[selected],[value='1']").get(), q("option1c", "option1d", "option2c", "option3d", "option3e" ), "not('complex selector')");
 
  var selects = SC.$("#form select");
  isSet( selects.not( selects[1] ), q("select1", "select3"), "filter out DOM element");
@@ -1087,29 +1087,29 @@ test("not()", function() {
 
 test("andSelf()", function() {
  expect(4);
- isSet( SC.$("#en").siblings().andSelf().get(), q("sndp", "sap","en"), "Check for siblings and self" );
- isSet( SC.$("#foo").children().andSelf().get(), q("sndp", "en", "sap", "foo"), "Check for children and self" );
- isSet( SC.$("#en, #sndp").parent().andSelf().get(), q("foo","en","sndp"), "Check for parent and self" );
- isSet( SC.$("#groups").parents("p, div").andSelf().get(), q("ap", "main", "groups"), "Check for parents and self" );
+ same( SC.$("#en").siblings().andSelf().get(), q("sndp", "sap","en"), "Check for siblings and self" );
+ same( SC.$("#foo").children().andSelf().get(), q("sndp", "en", "sap", "foo"), "Check for children and self" );
+ same( SC.$("#en, #sndp").parent().andSelf().get(), q("foo","en","sndp"), "Check for parent and self" );
+ same( SC.$("#groups").parents("p, div").andSelf().get(), q("ap", "main", "groups"), "Check for parents and self" );
 });
 
 test("siblings([String])", function() {
  expect(3);
- isSet( SC.$("#en").siblings().get(), q("sndp", "sap"), "Check for siblings" );
+ same( SC.$("#en").siblings().get(), q("sndp", "sap"), "Check for siblings" );
  // no psuedo-selectors
- //isSet( SC.$("#sndp").siblings(":has(code)").get(), q("sap"), "Check for filtered siblings (has code child element)" );
- //isSet( SC.$("#sndp").siblings(":has(a)").get(), q("en", "sap"), "Check for filtered siblings (has anchor child element)" );
- isSet( SC.$("#foo").siblings("form, b").get(), q("form", "lengthtest", "testForm", "floatTest"), "Check for multiple filters" );
- isSet( SC.$("#en, #sndp").siblings().get(), q("sndp", "sap", "en"), "Check for unique results from siblings" );
+ //same( SC.$("#sndp").siblings(":has(code)").get(), q("sap"), "Check for filtered siblings (has code child element)" );
+ //same( SC.$("#sndp").siblings(":has(a)").get(), q("en", "sap"), "Check for filtered siblings (has anchor child element)" );
+ same( SC.$("#foo").siblings("form, b").get(), q("form", "lengthtest", "testForm", "floatTest"), "Check for multiple filters" );
+ same( SC.$("#en, #sndp").siblings().get(), q("sndp", "sap", "en"), "Check for unique results from siblings" );
 });
 
 test("children([String])", function() {
  expect(2);
- isSet( SC.$("#foo").children().get(), q("sndp", "en", "sap"), "Check for children" );
+ same( SC.$("#foo").children().get(), q("sndp", "en", "sap"), "Check for children" );
  
  // no pseudo-selectors
- //isSet( SC.$("#foo").children(":has(code)").get(), q("sndp", "sap"), "Check for filtered children" );
- isSet( SC.$("#foo").children("#en, #sap").get(), q("en", "sap"), "Check for multiple filters" );
+ //same( SC.$("#foo").children(":has(code)").get(), q("sndp", "sap"), "Check for filtered children" );
+ same( SC.$("#foo").children("#en, #sap").get(), q("en", "sap"), "Check for multiple filters" );
 });
 
 test("parent([String])", function() {
@@ -1118,7 +1118,7 @@ test("parent([String])", function() {
  equals( SC.$("#groups").parent("p")[0].id, "ap", "Filtered parent check" );
  equals( SC.$("#groups").parent("div").length, 0, "Filtered parent check, no match" );
  equals( SC.$("#groups").parent("div, p")[0].id, "ap", "Check for multiple filters" );
- isSet( SC.$("#en, #sndp").parent().get(), q("foo"), "Check for unique results from parent" );
+ same( SC.$("#en, #sndp").parent().get(), q("foo"), "Check for unique results from parent" );
 });
 
 test("parents([String])", function() {
@@ -1126,8 +1126,8 @@ test("parents([String])", function() {
  equals( SC.$("#groups").parents()[0].id, "ap", "Simple parents check" );
  equals( SC.$("#groups").parents("p")[0].id, "ap", "Filtered parents check" );
  equals( SC.$("#groups").parents("div")[0].id, "main", "Filtered parents check2" );
- isSet( SC.$("#groups").parents("p, div").get(), q("ap", "main"), "Check for multiple filters" );
- //isSet( SC.$("#en, #sndp").parents().get(), q("foo", "main", "dl", "body", "html"), "Check for unique results from parents" );
+ same( SC.$("#groups").parents("p, div").get(), q("ap", "main"), "Check for multiple filters" );
+ //same( SC.$("#en, #sndp").parents().get(), q("foo", "main", "dl", "body", "html"), "Check for unique results from parents" );
 });
 
 test("next([String])", function() {

data/frameworks/sproutcore/frameworks/foundation/tests/system/core_query/jquery_selector.js

@@ -366,7 +366,7 @@ test("id", function() {
 	
 	t( "ID selector with non-existant ancestor", "#asdfasdf #foobar", [] ); // bug #986
 
-	isSet( SC.$("body").find("div#form"), [], "ID selector within the context of another element" );
+	same( SC.$("body").find("div#form").length, 0, "ID selector within the context of another element" );
 });
 
 test("class", function() {

data/frameworks/sproutcore/frameworks/foundation/tests/system/datetime.js

@@ -0,0 +1,151 @@
+// ==========================================================================
+// Project:   DateTime Unit Test
+// Copyright: ©2009 Martin Ottenwaelter
+// ==========================================================================
+/*globals module test ok equals same stop start */
+
+module('Time');
+
+var ms, options, dt;
+
+module("SC.DateTime", {
+  setup: function() {
+    ms = 484387222925;
+    options = {year: 1985, month: 5, day: 8, hour: 1, minute: 0, second: 22, millisecond: 925};
+    dt = SC.DateTime.create(options);
+  },
+  teardown: function() {
+    delete ms;
+    delete options;
+    delete dt;
+  }
+});
+
+function timeShouldBeEqualToHash(t, h) {
+  if (h === undefined) h = testHash;
+  
+  equals(t.get('year'), h.year , 'year');
+  equals(t.get('month'), h.month, 'month');
+  equals(t.get('day'), h.day, 'day');
+  equals(t.get('hour'), h.hour, 'hour');
+  equals(t.get('minute'), h.minute, 'minute');
+  equals(t.get('second'), h.second, 'second');
+  equals(t.get('millisecond'), h.millisecond, 'millisecond');
+}
+
+test('create', function() {
+  timeShouldBeEqualToHash(dt, options);
+});
+
+test('create', function() {
+  var x = SC.DateTime.create(ms);
+  timeShouldBeEqualToHash(x, options);
+});
+
+test('adjust', function() {
+  timeShouldBeEqualToHash(dt.adjust({year: 2005}), {year: 2005, month: 5, day:  8, hour: 1, minute: 0, second: 22, millisecond: 925});
+  timeShouldBeEqualToHash(dt.adjust({month:   9}), {year: 1985, month: 9, day:  8, hour: 1, minute: 0, second: 22, millisecond: 925});
+  timeShouldBeEqualToHash(dt.adjust({day:    31}), {year: 1985, month: 5, day: 31, hour: 1, minute: 0, second: 22, millisecond: 925});
+  timeShouldBeEqualToHash(dt.adjust({hour:    3}), {year: 1985, month: 5, day:  8, hour: 3, minute: 0, second:  0, millisecond:   0});
+  timeShouldBeEqualToHash(dt.adjust({minute:  1}), {year: 1985, month: 5, day:  8, hour: 1, minute: 1, second:  0, millisecond:   0});
+  timeShouldBeEqualToHash(dt.adjust({second: 30}), {year: 1985, month: 5, day:  8, hour: 1, minute: 0, second: 30, millisecond:   0});
+});
+
+test('advance', function() {
+  var t = dt.advance({year: 1, month: 1, day: 1, hour: 1, minute: 1, second: 1, millisecond: 1});
+  timeShouldBeEqualToHash(t, {year: 1986, month: 6, day: 9, hour: 2, minute: 1, second: 23, millisecond: 926});
+});
+
+test('compare', function() {  
+  equals(SC.DateTime.compare(dt, dt), 0);
+  equals(dt.isEqual(dt), YES);
+  equals(dt.advance({hour: 1}).isEqual(dt), NO);
+  equals(SC.DateTime.compare(dt, dt.advance({hour: 1})), -1);
+  equals(SC.DateTime.compare(dt.advance({hour: 1}), dt), 1);
+  equals(SC.DateTime.compareDate(dt, dt.advance({hour: 1})), 0);
+  equals(SC.DateTime.compareDate(dt, dt.adjust({hour: 0}).advance({day: 1, second: -1})), 0);
+  equals(SC.DateTime.compareDate(dt, dt.adjust({hour: 0}).advance({day: 1})), -1);
+  equals(SC.DateTime.compareDate(dt, dt.advance({day: 1})), -1);
+});
+
+test('Format', function() {
+  equals(
+    dt.toFormattedString('%a %A %b %B %d %H %I %j %m %M %p %S %w %y %Y %%a'),
+    'Wed Wednesday May May 08 01 01 128 05 00 AM 22 3 85 1985 %a');
+});
+
+test('fancy getters', function() {
+  equals(dt.get('isLeapYear'), NO);
+  equals(SC.DateTime.create({year: 1900}).get('isLeapYear'), NO);
+  equals(SC.DateTime.create({year: 2000}).get('isLeapYear'), YES);
+  equals(SC.DateTime.create({year: 2004}).get('isLeapYear'), YES);
+  
+  equals(dt.get('daysInMonth'), 31);
+  equals(SC.DateTime.create({year: 2000, month: 2}).get('daysInMonth'), 29);
+  equals(SC.DateTime.create({year: 2001, month: 2}).get('daysInMonth'), 28);
+  
+  equals(dt.get('dayOfYear'), 128);
+  equals(SC.DateTime.create({year: 2000, month: 12, day: 31}).get('dayOfYear'), 366);
+  equals(SC.DateTime.create({year: 2001, month: 12, day: 31}).get('dayOfYear'), 365);
+  
+  equals(dt.get('week'), 18);
+  equals(SC.DateTime.create({year: 2006, month:  1, day:  1}).get('week0'),  1);
+  equals(SC.DateTime.create({year: 2006, month:  1, day:  1}).get('week1'),  0);
+  equals(SC.DateTime.create({year: 2006, month:  1, day:  8}).get('week0'),  2);
+  equals(SC.DateTime.create({year: 2006, month:  1, day:  8}).get('week1'),  1);
+  equals(SC.DateTime.create({year: 2006, month: 12, day: 31}).get('week0'), 53);
+  equals(SC.DateTime.create({year: 2006, month: 12, day: 31}).get('week1'), 52);
+  
+  equals(dt.get('lastMonday'), dt.advance({day: -2}).adjust({hour: 0}));
+  equals(dt.get('nextFriday'), dt.advance({day:  2}).adjust({hour: 0}));
+  equals(dt.get('lastWednesday'), dt.advance({day: -7}).adjust({hour: 0}));
+});
+
+test('parse', function() {
+  timeShouldBeEqualToHash(
+    SC.DateTime.parse('08/05/1985 01:00:22 %a', '%d/%m/%Y %H:%M:%S %%a'),
+    {year: 1985, month: 5, day: 8, hour: 1, minute: 0, second: 22, millisecond: 0});
+  timeShouldBeEqualToHash(
+    SC.DateTime.parse('08/05/1985 01:00:22 PM', '%d/%m/%Y %H:%M:%S %p'),
+    {year: 1985, month: 5, day: 8, hour: 13, minute: 0, second: 22, millisecond: 0}); 
+  timeShouldBeEqualToHash(
+    SC.DateTime.parse('Wed 08 May 1985 01:00:22 AM', '%a %d %b %Y %H:%M:%S %p'),
+    {year: 1985, month: 5, day: 8, hour: 1, minute: 0, second: 22, millisecond: 0});
+  ok(
+    SC.DateTime.parse('Tue 08 May 1985 01:00:22 AM', '%a %d %b %Y %H:%M:%S %p')
+    === null, '1985-05-08 is not a tuesday');
+  timeShouldBeEqualToHash(
+    SC.DateTime.parse('70-01-01 00:00:00', '%y-%m-%d %H:%M:%S'),
+    {year: 2070, month: 1, day: 1, hour: 0, minute: 0, second: 0, millisecond: 0}); 
+  timeShouldBeEqualToHash(
+    SC.DateTime.parse('71-01-01 00:00:00', '%y-%m-%d %H:%M:%S'),
+    {year: 1971, month: 1, day: 1, hour: 0, minute: 0, second: 0, millisecond: 0});
+});
+
+test('binding', function() {
+  var fromObject = SC.Object.create({value: dt});
+  var toObject = SC.Object.create({value: ''});
+  var binding = SC.Binding.dateTime('%Y-%m-%d %H:%M:%S').from('value', fromObject).to('value', toObject).connect();
+  SC.Binding.flushPendingChanges();
+  equals(toObject.get('value'), '1985-05-08 01:00:22');
+});
+
+test('cache', function() {
+  
+  SC.DateTime.create(options);
+  var cache_length_1 = SC.keys(SC.DateTime._dt_cache).length;
+  SC.DateTime.create(options);
+  var cache_length_2 = SC.keys(SC.DateTime._dt_cache).length;
+  equals(
+    cache_length_1, cache_length_2,
+    "Creating twice the same datetime should not modify the cache's length");
+  
+  var dates = [];
+  for (var i = 0; i < 3*SC.DateTime._DT_CACHE_MAX_LENGTH; i++) {
+    dates[i] = SC.DateTime.create(i);
+  }
+  ok(
+    SC.keys(SC.DateTime._dt_cache).length <= 2*SC.DateTime._DT_CACHE_MAX_LENGTH,
+    "Creating a lot of datetimes should not make a cache larger than the maximum allowed size");
+  
+});

data/frameworks/sproutcore/frameworks/foundation/tests/system/render_context/get.js

@@ -20,12 +20,12 @@ module("SC.RenderContext#get", {
 });
 
 test("it should return strings array with space for top tag if no params passed and no strings pushed yet", function() {
-  isSet(context.get(), [null]);
+  same(context.get(), [null]);
 });
 
 test("it should return full strings array if no params passed and no strings pushed yet", function() {
   context.push("line1");
-  isSet(context.get(), [null, "line1"]);
+  same(context.get(), [null, "line1"]);
 });
 
 test("it should return individual string if index passed that is within current length", function() {

data/frameworks/sproutcore/frameworks/foundation/tests/system/render_context/helpers_attr.js

@@ -5,7 +5,7 @@
 // License:   Licened under MIT license (see license.js)
 // ==========================================================================
 
-/*global module test equals context ok same isSet */
+/*global module test equals context ok same same */
 
 var context = null;
 

data/frameworks/sproutcore/frameworks/foundation/tests/system/render_context/helpers_basic.js

@@ -5,7 +5,7 @@
 // License:   Licened under MIT license (see license.js)
 // ==========================================================================
 
-/*global module test equals context ok isSet */
+/*global module test equals context ok same */
 
 var context = null;
 

data/frameworks/sproutcore/frameworks/foundation/tests/system/render_context/helpers_className.js

@@ -5,7 +5,7 @@
 // License:   Licened under MIT license (see license.js)
 // ==========================================================================
 
-/*global module test equals context ok isSet */
+/*global module test equals context ok same */
 
 var context = null;
 
@@ -19,18 +19,18 @@ module("SC.RenderContext#classNames", {
 });
 
 test("returns empty array if no current class names", function() {
-  isSet(context.classNames(), [], 'classNames') ;
+  same(context.classNames(), [], 'classNames') ;
 });
 
 test("classNames(array) updates class names", function() {
   var cl = 'bar baz'.w();
   equals(context.classNames(cl), context, "returns receiver");
-  isSet(context.classNames(), cl, 'class names');
+  same(context.classNames(), cl, 'class names');
 });
 
 test("returns classNames if set", function() {
   context.classNames('bar'.w());
-  isSet(context.classNames(), ['bar'], 'classNames');
+  same(context.classNames(), ['bar'], 'classNames');
 });
 
 test("clone on next retrieval if classNames(foo) set with cloneOnModify=YES", function() {
@@ -39,7 +39,7 @@ test("clone on next retrieval if classNames(foo) set with cloneOnModify=YES", fu
   
   var result = context.classNames();
   ok(result !== cl, "class name is NOT same instance");
-  isSet(result, cl, "but arrays are equivalent");
+  same(result, cl, "but arrays are equivalent");
   
   equals(result, context.classNames(), "2nd retrieval is same instance");
 });
@@ -50,7 +50,7 @@ test("extracts class names from element on first retrieval", function() {
   context = SC.RenderContext(elem);
   
   var result = context.classNames();
-  isSet(result, ['foo', 'bar'], 'extracted class names');
+  same(result, ['foo', 'bar'], 'extracted class names');
   
   equals(context.classNames(), result, "should reuse same instance thereafter");
 });
@@ -93,16 +93,16 @@ test("shoudl return receiver", function() {
 
 test("should add class name to existing classNames array on currentTag", function() {
   context.addClass('bar');
-  isSet(context.classNames(), ['foo', 'bar'], 'has classes');
+  same(context.classNames(), ['foo', 'bar'], 'has classes');
   equals(context._classNamesDidChange, YES, "note did change");
 });
 
 test("should only add class name once - does nothing if name already in array", function() {
-  isSet(context.classNames(), ['foo'], 'precondition - has foo classname');
+  same(context.classNames(), ['foo'], 'precondition - has foo classname');
   context._classNamesDidChange = NO; // reset  to pretend once not modified
   
   context.addClass('foo');
-  isSet(context.classNames(), ['foo'], 'no change');
+  same(context.classNames(), ['foo'], 'no change');
   equals(context._classNamesDidChange, NO, "note did not change");
 });
 
@@ -129,17 +129,17 @@ test('should return receiver', function() {
 test("should do nothing if class name not in array", function() {
   context._classNamesDidChange = NO; // reset to pretend not modified
   context.removeClass('imaginary');
-  isSet(context.classNames(), 'foo bar'.w(), 'did not change');
+  same(context.classNames(), 'foo bar'.w(), 'did not change');
   equals(context._classNamesDidChange, NO, "note did not change");
 });
 
 test("should do nothing if there are no class names", function() {
   context = context.begin();
-  isSet(context.classNames(), [], 'precondition - no class names');
+  same(context.classNames(), [], 'precondition - no class names');
   context._classNamesDidChange = NO; // reset to pretend not modified
   
   context.removeClass('foo');
-  isSet(context.classNames(), [], 'still no class names -- and no errors');
+  same(context.classNames(), [], 'still no class names -- and no errors');
   equals(context._classNamesDidChange, NO, "note did not change");
 });
 

data/frameworks/sproutcore/frameworks/foundation/tests/system/render_context/helpers_style.js

@@ -5,7 +5,7 @@
 // License:   Licened under MIT license (see license.js)
 // ==========================================================================
 
-/*global module test equals context ok same isSet */
+/*global module test equals context ok same same */
 
 var context = null;
 

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

@@ -30,7 +30,7 @@ test("Basic Requirements", function() {
 
 test("Test Asynchronous GET Request", function() {
   request.addObserver("response", function(response) {
-      contents = request.get("response") ;
+      contents = request.get("rawResponse") ;
   });
   
   request.send() ;
@@ -38,23 +38,21 @@ test("Test Asynchronous GET Request", function() {
   stop() ; // stops the test runner
   setTimeout( function(){
     ok(contents !== null, 'request.send() should return a response') ;
-    ok(SC.$ok(contents), 'contents should not be an error (Error: %@)'.fmt(contents));
-    
-    if (SC.$ok(contents)) equals(contents, '{"message": "Yay!"}') ;
+    ok(SC.$ok(contents), 'contents should not be an error ');
+    if (SC.$ok(contents)) equals(contents.responseText, '{"message": "Yay!"}', "should match retrieved message") ;
     window.start() ; // starts the test runner
   }, 3000); // a shorter timeout fails when a lot of unit tests are running...
 });
 
 test("Test Synchronous GET Request", function() {
-  request.set("isAsynchronous", NO);
-  
+
+  request.set("isAsynchronous", NO);  
   request.send();
-  
-  contents = request.get("response");
+  contents = request.get("rawResponse");
   
   ok(contents !== null) ;
-  ok(SC.$ok(contents), 'contents should not be an error (Error: %@)'.fmt(contents));
-  if (SC.$ok(contents)) equals(contents, '{"message": "Yay!"}') ;
+  ok(SC.$ok(contents), 'contents should not be an error ');
+  if (SC.$ok(contents)) equals(contents.responseText, '{"message": "Yay!"}', 'should match retrieved message') ;
 });
 
 test("Test Asynchronous GET Request, auto-deserializing JSON", function() {
@@ -69,7 +67,7 @@ test("Test Asynchronous GET Request, auto-deserializing JSON", function() {
   stop() ; // stops the test runner
   setTimeout( function(){
     ok(contents !== null) ;
-    ok(SC.$ok(contents), 'contents should not be an error (Error: %@)'.fmt(contents));
+    ok(SC.$ok(contents), 'contents should not be an error ');
     if (SC.$ok(contents)) same({"message": "Yay!"}, contents) ;
     window.start() ; // starts the test runner
   }, 1000);
@@ -83,7 +81,47 @@ test("Test Synchronous GET Request, auto-deserializing JSON", function() {
   
   var contents = request.get("response");
   
-  ok(contents !== null) ;
-  ok(SC.$ok(contents), 'contents should not be an error (Error: %@)'.fmt(contents));
-  if (SC.$ok(contents)) same({"message": "Yay!"}, contents) ;
+  ok(contents !== null, 'contents should not be null') ;
+  ok(SC.$ok(contents), 'contents should not be an error');
+  if (SC.$ok(contents)) same(contents, {"message": "Yay!"}, 'contents should have message') ;
+});
+
+
+test("Test if Request body is being auto-serializing to JSON", function() {
+  request.set("isAsynchronous", false);
+  request.set("isJSON", true);
+  var objectToPost={"content": "garbage"};
+  
+  request.send(objectToPost);
+  var jsonEncoded = request.get('body');
+  var contents = request.get("response");
+  
+  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;
+
+  var observer = function(response) {
+    responseCount++;
+    if(requestCount<=7) {
+      SC.Request.getUrl(url).addObserver("response", observer).send();
+      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, 8, "requestCount should be 4");
+    equals(responseCount, 6, "responseCount should be 4");
+    window.start() ; // starts the test runne
+  }, 3000);
+});
+