40 koans

Alex Weiksnar · Alex Weiksnar · commit b9d47916f541 · 2013-11-03T19:29:19.000-06:00
diff --git a/topics/about_arrays.js b/topics/about_arrays.js
@@ -2,9 +2,9 @@ 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
-    equal(__, favouriteThings[0], 'what is in the first position of the array?');
-    equal(__, favouriteThings[1], 'what is in the second position of the array?');
-    equal(__, favouriteThings[2], 'what is in the third position of the array?');
+    equal("cellar door", favouriteThings[0], 'what is in the first position of the array?');
+    equal(42, favouriteThings[1], 'what is in the second position of the array?');
+    equal(true, favouriteThings[2], 'what is in the third position of the array?');
 });
 
 test("array type", function() {
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(__, 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,30 +3,30 @@ module("About Objects (topics/about_objects.js)");
 
 test("object type", function() {
     var empty_object = {};
-    equal(__, 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
     };
     equal("Amory Blaine", person.name, "what is the person's name?");
     equal(102, person.age, "what is the person's age?");
 });
 
 test("dynamically adding properties", 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?");
 }); 
 
 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?");
 });
@@ -36,7 +36,7 @@ test("adding functions", function() {
         name: "Amory Blaine",
         age: 102,
         toString: function() {
-            return __;  // HINT: use the 'this' keyword to refer to the person object.
+            return ("I " + this.name + " am " + this.age + " years old.") ;  // HINT: use the 'this' keyword to refer to the person object.
         }
     };
     equal("I Amory Blaine am 102 years old.", person.toString(), "what should the toString function be?");
diff --git a/topics/about_strings.js b/topics/about_strings.js
@@ -25,10 +25,10 @@ test("escape character", function() {
 
 test("string.length", function() {
     var fruit = "apple";
-    equal(__, fruit.length, 'what is the value of fruit.length?');
+    equal(5, fruit.length, 'what is the value of fruit.length?');
 });
 
 test("slice", function() {
     var fruit = "apple pie";
-    equal(__, fruit.slice(0,5), 'what is the value of fruit.slice(0,5)?');
+    equal("apple", fruit.slice(0,5), 'what is the value of fruit.slice(0,5)?');
 });
