about_assignment, control, equality, truthyness changes

ElvisLives · ElvisLives · commit 98b39cd87c6b · 2012-11-06T09:05:44.000-07:00
diff --git a/topics/about_arrays.js b/topics/about_arrays.js
@@ -3,25 +3,25 @@ module("About Arrays (topics/about_arrays.js)");
 
 test("array literal syntax and indexing", function() {
     var favouriteThings = ["cellar door", 42, true]; // note that array elements do not have to be of the same type
-    equals(favouriteThings[0], __, 'what is in the first position of the array?');
-    equals(favouriteThings[1], __, 'what is in the second position of the array?');
-    equals(favouriteThings[2], __, 'what is in the third position of the array?');
+    equals(favouriteThings[0], "cellar door", 'what is in the first position of the array?');
+    equals(favouriteThings[1], 42, 'what is in the second position of the array?');
+    equals(favouriteThings[2], true, 'what is in the third position of the array?');
 });
 
 test("array type", function() {
-    equals(typeof([]), __, 'what is the type of an array?');
+    equals(typeof([]), "object", 'what is the type of an array?');
 });
 
 test("length", function() {
     var collection = ['a','b','c'];
-    equals(collection.length, __, 'what is the length of the collection array?');
+    equals(collection.length, 3, 'what is the length of the collection array?');
 });
 
 test("splice", function() {
     var daysOfWeek = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'];
-    var workingWeek = daysOfWeek.splice(__, __);
-    ok(workingWeek.equalTo([__]), 'what is the value of workingWeek?');
-    ok(daysOfWeek.equalTo([__]), 'what is the value of daysOfWeek?');
+    var workingWeek = daysOfWeek.splice('Monday','Wednesday');
+    ok(workingWeek.equalTo(['Tuesday']), 'what is the value of workingWeek?');
+    ok(daysOfWeek.equalTo(['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']), 'what is the value of daysOfWeek?');
 });
 
 test("stack methods", function() {
diff --git a/topics/about_assignment.js b/topics/about_assignment.js
@@ -2,11 +2,11 @@
 module("About Assignment (topics/about_assignment.js)");
 
 test("local variables", function() {
-    var temp = __;
+    var temp = 1;
     equals(1, temp, "Assign a value to the variable temp");
 });
 
 test("global variables", function() {
     temp = 1;
-    equals(temp, window.__, 'global variables are assigned to the window object');
+    equals(temp, window.temp, 'global variables are assigned to the window object');
 });
diff --git a/topics/about_control_structures.js b/topics/about_control_structures.js
@@ -5,15 +5,15 @@ test("if", function() {
 	if (2 > 0) {
 		isPositive = true;
 	}
-	equals(isPositive, __,  'what is the value of isPositive?');
+	equals(isPositive, true,  'what is the value of isPositive?');
 });
 
 test("for", function() {
 	var counter = 10;
 	for (var i = 1; i <= 3; i++) {
-		counter = counter + i;
+	    counter = counter + i;
 	}
-	equals(counter, __, 'what is the value of counter?');
+	equals(counter, 16, 'what is the value of counter?');
 });
 
 test("for in", function() {
@@ -25,17 +25,18 @@ test("for in", function() {
 	var result = "";
 	// for in enumerates the property names of an object
 	for (property_name in person) {
+//	    console.log(person[property_name]);
   result = result + property_name;
 	};
-	equals(result, __, 'what is the value of result?');
+	equals(result, "nameage", 'what is the value of result?');
 });
 
 test("ternary operator", function() {
 	var fruit = true ? "apple" : "orange";
-	equals(fruit, __, 'what is the value of fruit?');
+	equals(fruit, "apple", 'what is the value of fruit?');
 
 	fruit = false ? "apple" : "orange";
-	equals(fruit, __, 'now what is the value of fruit?');
+	equals(fruit, "orange",'now what is the value of fruit?');
 });
 
 test("switch", function() {
@@ -48,7 +49,7 @@ test("switch", function() {
 			result = 2;
 			break;
 	}
-	equals(result, __, 'what is the value of result?');
+	equals(result, 2, 'what is the value of result?');
 });
 
 test("switch default case", function() {
@@ -64,10 +65,10 @@ test("switch default case", function() {
             result = "Merry";
             break;
     }
-    equals(result, __, 'what is the value of result?');
+    equals(result, "Merry", 'what is the value of result?');
 });
 
 test("null coalescing", function() {
     var result = null || "a value";
-    equals(result, __, 'what is the value of result?');
+    equals(result, "a value", 'what is the value of result?');
 });
diff --git a/topics/about_equality.js b/topics/about_equality.js
@@ -2,21 +2,21 @@
 module("About Equality (topics/about_equality.js)");
 
 test("numeric equality", function() {
-    equals(3 + __,  7, 'hmmmm?');
+    equals(3 + 4,  7, 'hmmmm?');
 });
 
 test("string equality", function() {
-    equals("3" + __, "37", "concatenate the strings");
+    equals("3" + "7", "37", "concatenate the strings");
 });
 
 test("equality without type coercion", function() {
-    ok(3 === __, 'what is exactly equal to 3?');
+    ok(3 === 3, 'what is exactly equal to 3?');
 });
 
 test("equality with type coercion", function() {
-    ok(3 == "__", 'what string is equal to 3, with type coercion?');
+    ok(3 == "3", 'what string is equal to 3, with type coercion?');
 });
 
 test("string literals", function() {
-    equals("frankenstein", '__', "quote types are interchangable, but must match.");
+    equals("frankenstein", 'frankenstein', "quote types are interchangable, but must match.");
 });
diff --git a/topics/about_truthyness.js b/topics/about_truthyness.js
@@ -1,22 +1,36 @@
-
+// http://www.sitepoint.com/javascript-truthy-falsy/
 module("About Truthyness (topics/about_truthyness.js)");
 
 test("truthyness of positive numbers", function() {
     var oneIsTruthy = 1 ? true : false;
-    equals(oneIsTruthy, __, 'is one truthy?');
+    equals(oneIsTruthy, true, 'is one truthy?');
 });
 
 test("truthyness of negative numbers", function() {
     var negativeOneIsTruthy = -1 ? true : false;
-    equals(negativeOneIsTruthy, __, 'is -1 truthy?');
+    equals(negativeOneIsTruthy, true, 'is -1 truthy?');
 });
 
 test("truthyness of zero", function() {
     var zeroIsTruthy = 0 ? true : false;
-    equals(zeroIsTruthy, __, 'is 0 truthy?');
+    equals(zeroIsTruthy, false, 'is 0 truthy?');
 });
 
 test("truthyness of null", function() {
     var nullIsTruthy = null ? true : false;
-    equals(nullIsTruthy, __, 'is null truthy?');
+    equals(nullIsTruthy, false, 'is null truthy?');
+});
+
+test("truthyness of null against undefined", function () {
+    ok(null == undefined, 'is null truthy against undefined?');
+});
+
+test("truthyness of undefined against undefined", function () {
+    ok(undefined == undefined, 'is undefined truthy against undefined?');
 });
+
+test("truthyness of NaN against undefined", function () {
+    ok(NaN != undefined, 'is NaN ever truthy');
+});
+
+
