Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Corrected some minor errors made by me (rkatic) in last commits.

  • Loading branch information...
commit ee9192d103b3e3b5479a824caa9f6938598ebd30 1 parent 7b26e3b
Robert Katić authored November 12, 2009 jeresig committed November 13, 2009

Showing 1 changed file with 3 additions and 3 deletions. Show diff stats Hide diff stats

  1. 6  test/unit/core.js
6  test/unit/core.js
@@ -517,7 +517,7 @@ test("jQuery.merge()", function() {
517 517
 });
518 518
 
519 519
 test("jQuery.extend(Object, Object)", function() {
520  
-	expect(24);
  520
+	expect(25);
521 521
 
522 522
 	var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
523 523
 		options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
@@ -557,13 +557,13 @@ test("jQuery.extend(Object, Object)", function() {
557 557
 	var optionsWithCustomObject = { foo: { date: new customObject } };
558 558
 	empty = {};
559 559
 	jQuery.extend(true, empty, optionsWithCustomObject);
560  
-	ok( empty.foo && empty.foo.date && empty.foo.date === customObject, "Custom objects copy correctly (no methods)" );
  560
+	ok( empty.foo && empty.foo.date === customObject, "Custom objects copy correctly (no methods)" );
561 561
 	
562 562
 	// Makes the class a little more realistic
563 563
 	myKlass.prototype = { someMethod: function(){} };
564 564
 	empty = {};
565 565
 	jQuery.extend(true, empty, optionsWithCustomObject);
566  
-	ok( empty.foo && empty.foo.date && empty.foo.date === customObject, "Custom objects copy correctly" );
  566
+	ok( empty.foo && empty.foo.date === customObject, "Custom objects copy correctly" );
567 567
 	
568 568
 	var ret = jQuery.extend(true, { foo: 4 }, { foo: new Number(5) } );
569 569
 	ok( ret.foo == 5, "Wrapped numbers copy correctly" );

0 notes on commit ee9192d

Please sign in to comment.
Something went wrong with that request. Please try again.