Convert equals to equal

equals has been deprecated for a long time.

Author: sukima

topics/about_arrays.js

@@ -2,18 +2,18 @@ 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?');
+    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?');
 });
 
 test("array type", function() {
-    equals(typeof([]), __, 'what is the type of an array?');
+    equal(__, typeof([]), '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?');
+    equal(__, collection.length, 'what is the length of the collection array?');
 });
 
 test("splice", function() {
@@ -28,8 +28,8 @@ test("stack methods", function() {
     stack.push("first");
     stack.push("second");
 
-    equals(stack.pop(), __, 'what will be the first value popped off the stack?');
-    equals(stack.pop(), __, 'what will be the second value popped off the stack?');
+    equal(__, stack.pop(), 'what will be the first value popped off the stack?');
+    equal(__, stack.pop(), 'what will be the second value popped off the stack?');
 });
 
 test("queue methods", function() {
@@ -38,6 +38,6 @@ test("queue methods", function() {
     queue.push("second");
     queue.unshift("third");
 
-    equals(queue.shift(), "__", 'what will be shifted out first?');
-    equals(queue.shift(), "__", 'what will be shifted out second?');
+    equal(__, queue.shift(), 'what will be shifted out first?');
+    equal(__, queue.shift(), 'what will be shifted out second?');
 });

topics/about_asserts.js

@@ -9,6 +9,6 @@ test("not ok", function() {
     ok(__ === false, 'what is a false value?');
 });
 
-test("equals", function() {
-    equals(1+1, __, 'what will satisfy the equals assertion?');
+test("equal", function() {
+    equal(__, 1 + 1, 'what will satisfy the equal assertion?');
 });

topics/about_assignment.js

@@ -3,10 +3,10 @@ module("About Assignment (topics/about_assignment.js)");
 
 test("local variables", function() {
     var temp = __;
-    equals(1, temp, "Assign a value to the variable temp");
+    equal(temp, 1, "Assign a value to the variable temp");
 });
 
 test("global variables", function() {
-    temp = 1;
-    equals(temp, window.__, 'global variables are assigned to the window object');
+    temp = 1; // Not using var is an example. Always use var in practise.
+    equal(window.__, temp, 'global variables are assigned to the window object');
 });

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?');
+	equal(__, isPositive,  '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?');
+	equal(__, 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;
 	};
-	equals(result, __, 'what is the value of result?');
+	equal(__, result, 'what is the value of result?');
 });
 
 test("ternary operator", function() {
 	var fruit = true ? "apple" : "orange";
-	equals(fruit, __, 'what is the value of fruit?');
+	equal(__, fruit, 'what is the value of fruit?');
 
 	fruit = false ? "apple" : "orange";
-	equals(fruit, __, 'now what is the value of fruit?');
+	equal(__, fruit, '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?');
+	equal(__, result, '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?');
+    equal(__, result, 'what is the value of result?');
 });
 
 test("null coalescing", function() {
     var result = null || "a value";
-    equals(result, __, 'what is the value of result?');
+    equal(__, result, 'what is the value of result?');
 });

topics/about_equality.js

@@ -2,11 +2,11 @@
 module("About Equality (topics/about_equality.js)");
 
 test("numeric equality", function() {
-    equals(3 + __,  7, 'hmmmm?');
+    equal(3 + __,  7, "");
 });
 
 test("string equality", function() {
-    equals("3" + __, "37", "concatenate the strings");
+    equal("3" + __, "37", "concatenate the strings");
 });
 
 test("equality without type coercion", function() {
@@ -18,5 +18,6 @@ test("equality with type coercion", function() {
 });
 
 test("string literals", function() {
-    equals("frankenstein", '__', "quote types are interchangable, but must match.");
+    equal(__, "frankenstein", "quote types are interchangable, but must match.");
+    equal(__, 'frankenstein', "quote types can use both single and double quotes.");
 });

topics/about_functions_and_closure.js

@@ -5,31 +5,31 @@ test("defining functions directly", function() {
     function changeResult() {
         // the ability to access a variables defined in the same scope as the function is known as 'closure'
         result = "b";
-    };	
+    };
     changeResult();
-    equals(result, __, 'what is the value of result?');
+    equal(__, result, 'what is the value of result?');
 });
 
 test("assigning functions to variables", function() {
     var triple = function(input) {
         return input * 3;
     };
-    equals(triple(4), __, 'what is triple 4?');		
+    equal(__, triple(4), 'what is triple 4?');
 });
 
-test("self invoking functions", function() {		
+test("self invoking functions", function() {
     var publicValue = "shared";
 
     // self invoking functions are used to provide scoping and to alias variables
     (function(pv) {
         var secretValue = "password";
-        equals(pv, __, 'what is the value of pv?');
-        equals(typeof(secretValue), "__", "is secretValue available in this context?");
-        equals(typeof(publicValue), "__", "is publicValue available in this context?");
+        equal(__, pv, 'what is the value of pv?');
+        equal("__", typeof(secretValue), "is secretValue available in this context?");
+        equal("__", typeof(publicValue), "is publicValue available in this context?");
     })(publicValue);
 
-    equals(typeof(secretValue), "__", "is secretValue available in this context?");
-    equals(typeof(publicValue), "__", "is publicValue available in this context?");
+    equal("__", typeof(secretValue), "is secretValue available in this context?");
+    equal("__", typeof(publicValue), "is publicValue available in this context?");
 });
 
 test("arguments array", function() {
@@ -42,8 +42,8 @@ test("arguments array", function() {
         // __
     };
 
-    equals(add(1,2,3,4,5), 15, "add 1,2,3,4,5");
-    equals(add(4,7,-2), 9, "add 4,7,-2");
+    equal(15, add(1,2,3,4,5), "add 1,2,3,4,5");
+    equal(9, add(4,7,-2), "add 4,7,-2");
 });
 
 test("using call to invoke function",function(){
@@ -57,7 +57,7 @@ test("using call to invoke function",function(){
     //function, and the arguments to be sent to the function,multiple arguments are separated by commas.
     var result = invokee.call("I am this!", "Where did it come from?");
 
-    equals(result,__,"what will the value of invokee's this be?");
+    equal(__, result, "what will the value of invokee's this be?");
 });
 
 test("using apply to invoke function",function(){
@@ -70,6 +70,6 @@ test("using apply to invoke function",function(){
     //function and and array of arguments to be passed into the called function.
     var result = invokee.apply("I am this!", ["I am arg1","I am arg2"]);
 
-    equals(result,__,"what will the value of invokee's this be?");
+    equal(__, result, "what will the value of invokee's this be?");
 });
 

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);
-    equals(typeOfIntegers === typeOfFloats, __, 'are ints and floats the same type?');
-    equals(typeOfIntegers, __, 'what is the javascript numeric type?');
-    equals(1.0, __, 'what is a integer number equivalent to 1.0?');
+    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?');
 });
 
 test("NaN", function() {
     var resultOfFailedOperations = 7/'apple';
-    equals(isNaN(resultOfFailedOperations), __, 'what will satisfy the equals assertion?');
-    equals(resultOfFailedOperations == NaN, __, 'is NaN == NaN?');
+    equal(__, isNaN(resultOfFailedOperations), 'what will satisfy the equals assertion?');
+    equal(__, resultOfFailedOperations == NaN, 'is NaN == NaN?');
 });

topics/about_objects.js

@@ -3,32 +3,32 @@ module("About Objects (topics/about_objects.js)");
 
 test("object type", function() {
     var empty_object = {};
-    equals(typeof(empty_object), __, 'what is the type of an object?');
+    equal(__, typeof(empty_object), 'what is the type of an object?');
 });
 
 test("object literal notation", function() {
     var person = {
         __:__,
         __:__
-    };		
-    equals(person.name, "Amory Blaine", 'what is the person\'s name?');
-    equals(person.age, 102, 'what is the person\'s age?');
+    };
+    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;
-    equals(person.name, "Amory Blaine", 'what is the person\'s name?');
-    equals(person.age, 102, 'what is the person\'s age?');
+    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;
-    equals(person.name, "Amory Blaine", 'what is the person\'s name?');
-    equals(person.age, 102, 'what is the person\'s age?');
+    equal("Amory Blaine", person.name, "what is the person's name?");
+    equal(102, person.age, "what is the person's age?");
 });
 
 test("adding functions", function() {
@@ -39,5 +39,5 @@ test("adding functions", function() {
             return __;  // HINT: use the 'this' keyword to refer to the person object.
         }
     };
-    equals(person.toString(), "I Amory Blaine am 102 years old.", 'what should the toString function be?');
+    equal("I Amory Blaine am 102 years old.", person.toString(), "what should the toString function be?");
 });

topics/about_operators.js

@@ -7,7 +7,7 @@ test("addition", function() {
   for (var i = 0; i <= 5; i++) {
     result = result + i;
   }
-  equals(result, __, "What is the value of result?");
+  equal(__, result, "What is the value of result?");
 });
 
 test("assignment addition", function() {
@@ -16,23 +16,23 @@ test("assignment addition", function() {
     //the code below is just like saying result = result + i; but is more concise
     result += i;
   }
-  equals(result, __, "What is the value of result?");
+  equal(__, result, "What is the value of result?");
 });
 
 test("subtraction", function() {
   var result = 5;
   for (var i = 0; i <= 2; i++) {
     result = result - i;
   }
-  equals(result, __, "What is the value of result?");
+  equal(__, result, "What is the value of result?");
 });
 
 test("assignment subtraction", function() {
   var result = 5;
   for (var i = 0; i <= 2; i++) {
     result -= i;
   }
-  equals(result, __, "What is the value of result?");
+  equal(__, result, "What is the value of result?");
 });
 
 //Assignment operators are available for multiplication and division as well
@@ -43,5 +43,5 @@ test("modulus", function() {
   var x = 5;
   //again this is exactly the same as result = result % x
   result %= x;
-  equals(result, __, "What is the value of result?");
+  equal(__, result, "What is the value of result?");
 });

topics/about_prototypal_inheritance.js

@@ -16,7 +16,7 @@ Mammal.prototype = {
 
 test("defining a 'class'", function() {
     var eric  = new Mammal("Eric");
-    equals(eric.sayHi(), __, 'what will Eric say?');
+    equal(__, eric.sayHi(), 'what will Eric say?');
 });
 
 // add another function to the Mammal 'type' that uses the sayHi function
@@ -26,7 +26,7 @@ Mammal.prototype.favouriteSaying = function() {
 
 test("more functions", function() {
     var bobby = new Mammal("Bobby");
-    equals(bobby.favouriteSaying(), __, "what is Bobby's favourite saying?"); 
+    equal(__, bobby.favouriteSaying(), "what is Bobby's favourite saying?"); 
 });
 
 test("calling functions added to a prototype after an object was created", function() {
@@ -36,7 +36,7 @@ test("calling functions added to a prototype after an object was created", funct
     };
     // the following statement asks the paul object to call a function that was added
     // to the Mammal prototype after paul was constructed.
-    equals(paul.numberOfLettersInName(), __, "how long is Paul's name?");
+    equal(__, paul.numberOfLettersInName(), "how long is Paul's name?");
 });
 
 // helper function for inheritance. 
@@ -56,6 +56,6 @@ extend(Bat, Mammal);
 
 test("Inheritance", function() {
     var lenny = new Bat("Lenny", "1.5m");
-    equals(lenny.sayHi(), __, "what does Lenny say?");
-    equals(lenny.wingspan, __, "what is Lenny's wingspan?");
+    equal(__, lenny.sayHi(), "what does Lenny say?");
+    equal(__, lenny.wingspan, "what is Lenny's wingspan?");
 });