got more donesy

royschuyler · royschuyler · commit b68ec224401c · 2015-04-23T15:45:29.000-05:00
diff --git a/topics/about_assignment.js b/topics/about_assignment.js
@@ -8,5 +8,5 @@ test("local variables", function() {
 
 test("global variables", function() {
     temp = 1; // Not using var is an example. Always use var in practise.
-    equal(window.1, temp, 'global variables are assigned to the window object');
+    equal(1, temp, 'global variables are assigned to the window object');
 });
diff --git a/topics/about_control_structures.js b/topics/about_control_structures.js
@@ -27,15 +27,15 @@ test("for in", function() {
 	for (var property_name in person) {
   		result = result + property_name;
 	}
-	equal(__), result, 'what is the value of result?');
+	equal("nameage", result, 'what is the value of result?');
 });
 
 test("ternary operator", function() {
 	var fruit = true ? "apple" : "orange";
-	equal(__, fruit, 'what is the value of fruit?');
+	equal("apple", fruit, 'what is the value of fruit?');
 
 	fruit = false ? "apple" : "orange";
-	equal(__, fruit, 'now what is the value of fruit?');
+	equal("orange", fruit, 'now what is the value of fruit?');
 });
 
 test("switch", function() {
@@ -48,7 +48,7 @@ test("switch", function() {
 			result = 2;
 			break;
 	}
-	equal(__, result, 'what is the value of result?');
+	equal(2, result, 'what is the value of result?');
 });
 
 test("switch default case", function() {
@@ -64,10 +64,10 @@ test("switch default case", function() {
             result = "Merry";
             break;
     }
-    equal(__, result, 'what is the value of result?');
+    equal("Merry", result, 'what is the value of result?');
 });
 
 test("null coalescing", function() {
     var result = null || "a value";
-    equal(__, result, 'what is the value of result?');
+    equal("a value", result, 'what is the value of result?');
 });
diff --git a/topics/about_numbers.js b/topics/about_numbers.js
@@ -4,13 +4,13 @@ module("About Numbers (topics/about_numbers.js)");
 test("types", function() {
     var typeOfIntegers = typeof(6);
     var typeOfFloats = typeof(3.14159);
-    equal(false, typeOfIntegers === typeOfFloats, 'are ints and floats the same type?');
-    equal(__, typeOfIntegers, 'what is the javascript numeric type?');
-    equal(__, 1.0, 'what is a integer number equivalent to 1.0?');
+    equal(true, typeOfIntegers === typeOfFloats, 'are ints and floats the same type?');
+    equal("number", typeOfIntegers, 'what is the javascript numeric type?');
+    equal(1, 1.0, 'what is a integer number equivalent to 1.0?');
 });
 
 test("NaN", function() {
     var resultOfFailedOperations = 7/'apple';
-    equal(__, isNaN(resultOfFailedOperations), 'what will satisfy the equals assertion?');
-    equal(__, resultOfFailedOperations == NaN, 'is NaN == NaN?');
+    equal(true, isNaN(resultOfFailedOperations), 'what will satisfy the equals assertion?');
+    equal(false, resultOfFailedOperations == NaN, 'is NaN == NaN?');
 });
diff --git a/topics/about_objects.js b/topics/about_objects.js
@@ -3,16 +3,16 @@ module("About Objects (topics/about_objects.js)");
 
 test("object type", function() {
     var empty_object = {};
-    equal(literal, typeof(empty_object), 'what is the type of an object?');
+    equal("object", typeof(empty_object), 'what is the type of an object?');
 });
 
 test("object literal notation", function() {
     var person = {
-        name:"Amory Blaine",
-        age:"102"
+        name:{},
+        age:{}
     };
-    equal("Amory Blaine", person.name, "what is the person's name?");
-    equal(102, person.age, "what is the person's age?");
+    equal(undefined, person.name, "what is the person's name?");
+    equal(undefined, person.age, "what is the person's age?");
 });
 
 test("dynamically adding properties", function() {
@@ -21,12 +21,12 @@ test("dynamically adding properties", function() {
     person.__ = 102;
     equal("Amory Blaine", person.name, "what is the person's name?");
     equal(102, person.age, "what is the person's age?");
-});
+}); 
 
 test("adding properties from strings", function() {
     var person = {};
-    person["__"] = "Amory Blaine";
-    person["__"] = 102;
+    person["name"] = "Amory Blaine";
+    person["age"] = 102;
     equal("Amory Blaine", person.name, "what is the person's name?");
     equal(102, person.age, "what is the person's age?");
 });
diff --git a/topics/about_strings.js b/topics/about_strings.js
@@ -15,7 +15,7 @@ test("concatenation", function() {
 
 test("character Type", function() {
     var characterType = typeof("Amory".charAt(1)); // typeof will be explained in about reflection
-    equal("m", var characterType = typeof("Amory".charAt(1));, 'Javascript has no character type');
+    equal("string", characterType, 'Javascript has no character type');
 });
 
 test("escape character", function() {
