worked on assignment, control structures, and strings koans

jlbattle · jlbattle · commit 706a9121bf2f · 2015-02-11T07:23:59.000-08: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.__, temp, 'global variables are assigned to the window object');
+    equal(window.temp, 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;
 	}
-	equal(__, isPositive,  'what is the value of isPositive?');
+	equal(true, isPositive,  'what is the value of isPositive?');
 });
 
 test("for", function() {
 	var counter = 10;
 	for (var i = 1; i <= 3; i++) {
 		counter = counter + i;
 	}
-	equal(__, counter, 'what is the value of counter?');
+	equal(16, counter, 'what is the value of counter?');
 });
 
 test("for in", function() {
@@ -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_strings.js b/topics/about_strings.js
@@ -4,13 +4,13 @@ module("About Strings (topics/about_strings.js)");
 test("delimiters", function() {
     var singleQuotedString = 'apple';
     var doubleQuotedString = "apple";
-    equal(__, singleQuotedString === doubleQuotedString, 'are the two strings equal?');
+    equal(true, singleQuotedString === doubleQuotedString, 'are the two strings equal?');
 });
 
 test("concatenation", function() {
     var fruit = "apple";
     var dish = "pie";
-    equal(__, fruit + " " + dish, 'what is the value of fruit + " " + dish?');
+    equal("apple pie", fruit + " " + dish, 'what is the value of fruit + " " + dish?');
 });
 
 test("character Type", function() {
