test commit

sllabres · sllabres · commit 337d90dffb1c · 2013-04-22T20:14:01.000+01:00
diff --git a/topics/about_asserts.js b/topics/about_asserts.js
@@ -2,13 +2,13 @@
 module("About Asserts (topics/about_asserts.js)");
 
 test("ok", function() {
-    ok(__, 'what will satisfy the ok assertion?');
+    ok(true, 'what will satisfy the ok assertion?');
 });
 
 test("not", function() {
-    not(__, 'what is a false value?');
+    not(false, 'what is a false value?');
 });
 
-test("equals", function() {
-    equals(1+1, __, 'what will satisfy the equals assertion?');
-});
+test("equals", function() {	
+    equals(1+1, 2, 'what will satisfy the equals assertion?');
+});
diff --git a/topics/about_operators.js b/topics/about_operators.js
@@ -1,38 +1,43 @@
 
 module("About Operators (topics/about_operators.js)");
 
-test("addition", function() {
+test("addition", 
+  function() {
   var result = 0;
   //starting i at 0, add i to result and increment i by 1 until i is equal to 5
   for (var i = 0; i <= 5; i++) {
-    result = result + i;
-  }
-  equals(result, __, "What is the value of result?");
-});
+    result = result + i;    
+  } 
+
+  equals(result, 15, "What is the value of result?");
+}
+);
 
 test("assignment addition", function() {
   var result = 0;
   for (var i = 0; i <=5; i++) {
     //the code below is just like saying result = result + i; but is more concise
     result += i;
   }
-  equals(result, __, "What is the value of result?");
+  
+  equals(result, 15, "What is the value of result?");
 });
 
 test("subtraction", function() {
   var result = 5;
   for (var i = 0; i <= 2; i++) {
-    result = result - i;
+    result = result - i;    
   }
-  equals(result, __, "What is the value of result?");
+
+  equals(result, 2, "What is the value of result?");
 });
 
 test("assignment subtraction", function() {
   var result = 5;
   for (var i = 0; i <= 2; i++) {
     result -= i;
   }
-  equals(result, __, "What is the value of result?");
+  equals(result, 2, "What is the value of result?");
 });
 
 //Assignment operators are available for multiplication and division as well
@@ -43,5 +48,5 @@ test("modulus", function() {
   var x = 5;
   //again this is exactly the same as result = result % x
   result %= x;
-  equals(result, __, "What is the value of result?");
+  equals(result, 0, "What is the value of result?");
 });
diff --git a/topics/about_reflection.js b/topics/about_reflection.js
@@ -37,7 +37,7 @@ test("hasOwnProperty", function() {
         keys.push(propertyName);
     }
     equals(keys.length, __, 'how many elements are in the keys array?');
-    deepEqual(keys, [__, __], 'what are the properties of the array?');
+    ok(keys.equalTo([__, __]), 'what are the properties of the array?');
 
     // hasOwnProperty returns true if the parameter is a property directly on the object, 
     // but not if it is a property accessible via the prototype chain.
@@ -48,7 +48,7 @@ test("hasOwnProperty", function() {
         }
     }
     equals(ownKeys.length, __, 'how many elements are in the ownKeys array?');
-    deepEqual(ownKeys, [__], 'what are the own properties of the array?');
+    ok(ownKeys.equalTo([__, __]), 'what are the own properties of the array?');
 });
 
 test("constructor property", function () {
diff --git a/topics/about_scope.js b/topics/about_scope.js
@@ -1,3 +1,4 @@
+
 module("About Scope (topics/about_scope.js)");
 
 thisIsAGlobalVariable = 77;
@@ -17,5 +18,5 @@ test("variables declared inside of a function", function() {
     })();
 
     equals(outerVariable, __, 'is outerVariable defined in this scope?');
-    equals(typeof(innerVariable), __, 'is innerVariable defined in this scope?');
+    equals(typeof(innerVariable), "undefined", 'is innerVariable defined in this scope?');
 });

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ test("hasOwnProperty", function() {`
`37`	`37`	`keys.push(propertyName);`
`38`	`38`	`}`
`39`	`39`	`equals(keys.length, __, 'how many elements are in the keys array?');`
`40`		`- deepEqual(keys, [__, __], 'what are the properties of the array?');`
	`40`	`+ ok(keys.equalTo([__, __]), 'what are the properties of the array?');`
`41`	`41`
`42`	`42`	`// hasOwnProperty returns true if the parameter is a property directly on the object,`
`43`	`43`	`// but not if it is a property accessible via the prototype chain.`
`@@ -48,7 +48,7 @@ test("hasOwnProperty", function() {`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`	`equals(ownKeys.length, __, 'how many elements are in the ownKeys array?');`
`51`		`- deepEqual(ownKeys, [__], 'what are the own properties of the array?');`
	`51`	`+ ok(ownKeys.equalTo([__, __]), 'what are the own properties of the array?');`
`52`	`52`	`});`
`53`	`53`
`54`	`54`	`test("constructor property", function () {`