2nd commit now I'm about a third of the way through

Tom Atkins · Tom Atkins · commit 260167749c28 · 2012-12-08T08:25:07.000Z
diff --git a/jskoans.htm b/jskoans.htm
@@ -22,9 +22,8 @@
   <script type="text/javascript" src="topics/about_functions_and_closure.js"></script>
   <script type="text/javascript" src="topics/about_this.js"></script>
   <script type="text/javascript" src="topics/about_scope.js"></script>
-  <script type="text/javascript" src="topics/about_regular_expressions.js"></script> 
-  
-</head>
+  <script type="text/javascript" src="topics/about_regular_expressions.js"></script>
+  </head>
 <body>
   <h1 id="qunit-header">QUnit example</h1>
  <h2 id="qunit-banner"></h2>
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;
 	}
-	equals(counter, __, 'what is the value of counter?');
+	equals(counter, 16, 'what is the value of counter?');
 });
 
 test("for in", function() {
@@ -27,15 +27,15 @@ test("for in", function() {
 	for (property_name in person) {
   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 +48,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 +64,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_strings.js b/topics/about_strings.js
@@ -4,18 +4,18 @@ module("About Strings (topics/about_strings.js)");
 test("delimiters", function() {
     var singleQuotedString = 'apple';
     var doubleQuotedString = "apple";
-    equals(singleQuotedString === doubleQuotedString, __, 'are the two strings equal?');
+    equals(singleQuotedString === doubleQuotedString, true, 'are the two strings equal?');
 });
 
 test("concatenation", function() {
     var fruit = "apple";
     var dish = "pie";
-    equals(fruit + " " + dish, __, 'what is the value of fruit + " " + dish?');
+    equals(fruit + " " + dish, "apple pie", 'what is the value of fruit + " " + dish?');
 });
 
 test("character Type", function() {
     var characterType = typeof("Amory".charAt(1)); // typeof will be explained in about reflection
-    equals(characterType, __, 'Javascript has no character type');
+    equals(characterType, "string", 'Javascript has no character type');
 });
 
 test("escape character", function() {
diff --git a/topics/about_truthyness.js b/topics/about_truthyness.js
@@ -3,20 +3,20 @@ 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?');
 });
