diff --git a/topics/about_arrays.js b/topics/about_arrays.js index b2de2547..170b4f43 100644 --- a/topics/about_arrays.js +++ b/topics/about_arrays.js @@ -2,23 +2,23 @@ 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() { - equal(__, typeof([]), 'what is the type of an array?'); + equal('object', typeof([]), 'what is the type of an array?'); }); test("length", function() { var collection = ['a','b','c']; - equal(__, collection.length, 'what is the length of the collection array?'); + equal(3, collection.length, 'what is the length of the collection array?'); }); test("splice", function() { var daysOfWeek = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']; - var workingWeek = daysOfWeek.splice(__, __); + var workingWeek = daysOfWeek.splice(0, 5); var weekend = daysOfWeek; deepEqual(workingWeek, ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday'], 'what is the value of workingWeek?'); @@ -30,8 +30,8 @@ test("stack methods", function() { stack.push("first"); stack.push("second"); - 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?'); + equal('second', stack.pop(), 'what will be the first value popped off the stack?'); + equal('first', stack.pop(), 'what will be the second value popped off the stack?'); }); test("queue methods", function() { @@ -40,6 +40,6 @@ test("queue methods", function() { queue.push("second"); queue.unshift("third"); - equal(__, queue.shift(), 'what will be shifted out first?'); - equal(__, queue.shift(), 'what will be shifted out second?'); + equal('third', queue.shift(), 'what will be shifted out first?'); + equal('first', queue.shift(), 'what will be shifted out second?'); }); diff --git a/topics/about_asserts.js b/topics/about_asserts.js index baf7fc75..a2146770 100644 --- a/topics/about_asserts.js +++ b/topics/about_asserts.js @@ -2,13 +2,13 @@ module("About Asserts (topics/about_asserts.js)"); test("ok", function() { - ok(__ === true, 'what will satisfy the ok assertion?'); + ok(true === true, 'what will satisfy the ok assertion?'); }); test("not ok", function() { - ok(__ === false, 'what is a false value?'); + ok(false === false, 'what is a false value?'); }); test("equal", function() { - equal(__, 1 + 1, 'what will satisfy the equal assertion?'); + equal(2, 1 + 1, 'what will satisfy the equal assertion?'); }); diff --git a/topics/about_assignment.js b/topics/about_assignment.js index 4532861e..cba47c77 100644 --- 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; equal(temp, 1, "Assign a value to the variable temp"); }); 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 index aca1623b..8ad0522b 100644 --- a/topics/about_control_structures.js +++ b/topics/about_control_structures.js @@ -5,7 +5,7 @@ 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() { @@ -13,7 +13,7 @@ test("for", function() { 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_equality.js b/topics/about_equality.js index fe3e3d21..3976089c 100644 --- a/topics/about_equality.js +++ b/topics/about_equality.js @@ -2,22 +2,22 @@ module("About Equality (topics/about_equality.js)"); test("numeric equality", function() { - equal(3 + __, 7, ""); + equal(3 + 4, 7, ""); }); test("string equality", function() { - equal("3" + __, "37", "concatenate the strings"); + equal("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() { - equal(__, "frankenstein", "quote types are interchangable, but must match."); - equal(__, 'frankenstein', "quote types can use both single and double quotes."); + equal("frankenstein", "frankenstein", "quote types are interchangable, but must match."); + equal("frankenstein", 'frankenstein', "quote types can use both single and double quotes."); }); diff --git a/topics/about_functions_and_closure.js b/topics/about_functions_and_closure.js index 7477278f..3c68d7c4 100644 --- a/topics/about_functions_and_closure.js +++ b/topics/about_functions_and_closure.js @@ -7,14 +7,14 @@ test("defining functions directly", function() { result = "b"; }; changeResult(); - equal(__, result, 'what is the value of result?'); + equal('b', result, 'what is the value of result?'); }); test("assigning functions to variables", function() { var triple = function(input) { return input * 3; }; - equal(__, triple(4), 'what is triple 4?'); + equal(12, triple(4), 'what is triple 4?'); }); test("self invoking functions", function() { @@ -23,13 +23,13 @@ test("self invoking functions", function() { // self invoking functions are used to provide scoping and to alias variables (function(pv) { var secretValue = "password"; - 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?"); + equal('shared', pv, 'what is the value of pv?'); + equal("string", typeof(secretValue), "is secretValue available in this context?"); + equal("string", typeof(publicValue), "is publicValue available in this context?"); })(publicValue); - equal("__", typeof(secretValue), "is secretValue available in this context?"); - equal("__", typeof(publicValue), "is publicValue available in this context?"); + equal('undefined', typeof(secretValue), "is secretValue available in this context?"); + equal("string", typeof(publicValue), "is publicValue available in this context?"); }); test("arguments array", function() { @@ -38,7 +38,9 @@ test("arguments array", function() { for(var i = 0; i < arguments.length; i++) { // complete the implementation of this method so that it returns the sum of its arguments // __ + total += arguments[i]; } + return total; // __ }; @@ -57,7 +59,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?"); - equal(__, result, "what will the value of invokee's this be?"); + equal("I am this!Where did it come from?", result, "what will the value of invokee's this be?"); }); test("using apply to invoke function",function(){ @@ -70,6 +72,6 @@ test("using apply to invoke function",function(){ //function and the second is the array of arguments to be passed into the called function. var result = invokee.apply("I am this!", ["I am arg1","I am arg2"]); - equal(__, result, "what will the value of invokee's this be?"); + equal("I am this!I am arg1I am arg2", result, "what will the value of invokee's this be?"); }); diff --git a/topics/about_numbers.js b/topics/about_numbers.js index 1319acd8..12b508af 100644 --- 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 index 24c03533..0f6417fb 100644 --- a/topics/about_objects.js +++ b/topics/about_objects.js @@ -3,13 +3,13 @@ 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?"); @@ -17,16 +17,16 @@ test("object literal notation", function() { 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_operators.js b/topics/about_operators.js index 9859900b..9d5ce763 100644 --- a/topics/about_operators.js +++ b/topics/about_operators.js @@ -7,7 +7,7 @@ test("addition", function() { for (var i = 0; i <= 5; i++) { result = result + i; } - equal(__, result, "What is the value of result?"); + equal(15, result, "What is the value of result?"); }); test("assignment addition", function() { @@ -16,7 +16,7 @@ test("assignment addition", function() { //the code below is just like saying result = result + i; but is more concise result += i; } - equal(__, result, "What is the value of result?"); + equal(15, result, "What is the value of result?"); }); test("subtraction", function() { @@ -24,7 +24,7 @@ test("subtraction", function() { for (var i = 0; i <= 2; i++) { result = result - i; } - equal(__, result, "What is the value of result?"); + equal(2, result, "What is the value of result?"); }); test("assignment subtraction", function() { @@ -32,7 +32,7 @@ test("assignment subtraction", function() { for (var i = 0; i <= 2; i++) { result -= i; } - equal(__, result, "What is the value of result?"); + equal(2, 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; - equal(__, result, "What is the value of result?"); + equal(0, result, "What is the value of result?"); }); diff --git a/topics/about_prototypal_inheritance.js b/topics/about_prototypal_inheritance.js index 811c040e..77d5fdb3 100644 --- a/topics/about_prototypal_inheritance.js +++ b/topics/about_prototypal_inheritance.js @@ -16,7 +16,7 @@ Mammal.prototype = { test("defining a 'class'", function() { var eric = new Mammal("Eric"); - equal(__, eric.sayHi(), 'what will Eric say?'); + equal('Hello, my name is Eric', 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"); - equal(__, bobby.favouriteSaying(), "what is Bobby's favourite saying?"); + equal("Bobby's favourite saying is Hello, my name is Bobby", 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. - equal(__, paul.numberOfLettersInName(), "how long is Paul's name?"); + equal(4, 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"); - equal(__, lenny.sayHi(), "what does Lenny say?"); - equal(__, lenny.wingspan, "what is Lenny's wingspan?"); + equal("Hello, my name is Lenny", lenny.sayHi(), "what does Lenny say?"); + equal('1.5m', lenny.wingspan, "what is Lenny's wingspan?"); }); diff --git a/topics/about_prototype_chain.js b/topics/about_prototype_chain.js index 46e3b4df..d602da13 100644 --- a/topics/about_prototype_chain.js +++ b/topics/about_prototype_chain.js @@ -27,29 +27,29 @@ child.b = 2; * */ test("Is there an 'a' and 'b' own property on child?", function () { - equal(__, child.hasOwnProperty('a'), 'child.hasOwnProperty(\'a\')?'); - equal(__, child.hasOwnProperty('b'), 'child.hasOwnProperty(\'b\')?'); + equal(true, child.hasOwnProperty('a'), 'child.hasOwnProperty(\'a\')?'); + equal(true, child.hasOwnProperty('b'), 'child.hasOwnProperty(\'b\')?'); }); test("Is there an 'a' and 'b' property on child?", function () { - equal(__, child.a, 'what is \'a\' value?'); - equal(__, child.b, 'what is \'b\' value?'); + equal(1, child.a, 'what is \'a\' value?'); + equal(2, child.b, 'what is \'b\' value?'); }); test("If 'b' was removed, whats b value?", function () { delete child.b; - equal(__, child.b, 'what is \'b\' value now?'); + equal(3, child.b, 'what is \'b\' value now?'); }); test("Is there a 'c' own property on child?", function () { - equal(__, child.hasOwnProperty('c'), 'child.hasOwnProperty(\'c\')?'); + equal(false, child.hasOwnProperty('c'), 'child.hasOwnProperty(\'c\')?'); }); // Is there a 'c' own property on child? No, check its prototype // Is there a 'c' own property on child.[[Prototype]]? Yes, its value is... test("Is there a 'c' property on child?", function () { - equal(__, child.c, 'what is the value of child.c?'); + equal(4, child.c, 'what is the value of child.c?'); }); @@ -57,7 +57,7 @@ test("Is there a 'c' property on child?", function () { // Is there a 'd' own property on child.[[Prototype]]? No, check it prototype // child.[[Prototype]].[[Prototype]] is null, stop searching, no property found, return... test("Is there an 'd' property on child?", function () { - equal(__, child.d, 'what is the value of child.d?'); + equal(undefined, child.d, 'what is the value of child.d?'); }); diff --git a/topics/about_reflection.js b/topics/about_reflection.js index 63868648..35f1a9ff 100644 --- a/topics/about_reflection.js +++ b/topics/about_reflection.js @@ -11,10 +11,10 @@ function B() { B.prototype = new A(); test("typeof", function() { - equal(__, typeof({}), 'what is the type of an empty object?'); - equal(__, typeof('apple'), 'what is the type of a string?'); - equal(__, typeof(-5), 'what is the type of -5?'); - equal(__, typeof(false), 'what is the type of false?'); + equal('object', typeof({}), 'what is the type of an empty object?'); + equal('string', typeof('apple'), 'what is the type of a string?'); + equal('number', typeof(-5), 'what is the type of -5?'); + equal('boolean', typeof(false), 'what is the type of false?'); }); test("property enumeration", function() { @@ -25,8 +25,8 @@ test("property enumeration", function() { keys.push(propertyName); values.push(person[propertyName]); } - ok(keys.equalTo(['__','__','__']), 'what are the property names of the object?'); - ok(values.equalTo(['__',__,__]), 'what are the property values of the object?'); + ok(keys.equalTo(['name','age','unemployed']), 'what are the property names of the object?'); + ok(values.equalTo(['Amory Blaine',102,true]), 'what are the property values of the object?'); }); test("hasOwnProperty", function() { @@ -37,8 +37,8 @@ test("hasOwnProperty", function() { for (propertyName in b) { keys.push(propertyName); } - equal(__, keys.length, 'how many elements are in the keys array?'); - deepEqual([__, __], keys, 'what are the properties of the array?'); + equal(2, keys.length, 'how many elements are in the keys array?'); + deepEqual(['bprop', 'aprop'], keys, 'what are the properties of the array?'); // hasOwnProperty returns true if the parameter is a property directly on the object, // but not if it is a property accessible via the prototype chain. @@ -48,21 +48,21 @@ test("hasOwnProperty", function() { ownKeys.push(propertyName); } } - equal(__, ownKeys.length, 'how many elements are in the ownKeys array?'); - deepEqual([__], ownKeys, 'what are the own properties of the array?'); + equal(1, ownKeys.length, 'how many elements are in the ownKeys array?'); + deepEqual(['bprop'], ownKeys, 'what are the own properties of the array?'); }); test("constructor property", function () { var a = new A(); var b = new B(); - equal(__, typeof(a.constructor), "what is the type of a's constructor?"); - equal(__, a.constructor.name, "what is the name of a's constructor?"); - equal(__, b.constructor.name, "what is the name of b's constructor?"); + equal('function', typeof(a.constructor), "what is the type of a's constructor?"); + equal('A', a.constructor.name, "what is the name of a's constructor?"); + equal('A', b.constructor.name, "what is the name of b's constructor?"); }); test("eval", function() { // eval executes a string var result = ""; eval("result = 'apple' + ' ' + 'pie'"); - equal(__, result, 'what is the value of result?'); + equal('apple pie', result, 'what is the value of result?'); }); diff --git a/topics/about_regular_expressions.js b/topics/about_regular_expressions.js index b49bc723..57b2b242 100644 --- a/topics/about_regular_expressions.js +++ b/topics/about_regular_expressions.js @@ -4,28 +4,29 @@ module("About Regular Expressions (topics/about_regular_expressions.js)"); test("exec", function() { var numberFinder = /(\d).*(\d)/; var results = numberFinder.exec("what if 6 turned out to be 9?"); - ok(results.equalTo([__, __, __]), 'what is the value of results?'); + console.log(results); + ok(results.equalTo(['6 turned out to be 9', '6', '9']), 'what is the value of results?'); }); test("test", function() { var containsSelect = /select/.test(" select * from users "); - equal(__, containsSelect, 'does the string provided contain "select"?'); + equal(true, containsSelect, 'does the string provided contain "select"?'); }); test("match", function() { var matches = "what if 6 turned out to be 9?".match(/(\d)/g); - ok(matches.equalTo([__, __]), 'what is the value of matches?'); + ok(matches.equalTo(['6', '9']), 'what is the value of matches?'); }); test("replace", function() { var pie = "apple pie".replace("apple", "strawberry"); - equal(__, pie, 'what is the value of pie?'); + equal('strawberry pie', pie, 'what is the value of pie?'); pie = "what if 6 turned out to be 9?".replace(/\d/g, function(number) { // the second parameter can be a string or a function var map = {'6': 'six','9': 'nine'}; return map[number]; }); - equal(__, pie, 'what is the value of pie?'); + equal("what if six turned out to be nine?", pie, 'what is the value of pie?'); }); // THE END diff --git a/topics/about_scope.js b/topics/about_scope.js index efa802a0..05cee017 100644 --- a/topics/about_scope.js +++ b/topics/about_scope.js @@ -3,7 +3,7 @@ module("About Scope (topics/about_scope.js)"); thisIsAGlobalVariable = 77; test("global variables", function() { - equal(__, thisIsAGlobalVariable, 'is thisIsAGlobalVariable defined in this scope?'); + equal(77, thisIsAGlobalVariable, 'is thisIsAGlobalVariable defined in this scope?'); }); test("variables declared inside of a function", function() { @@ -12,10 +12,10 @@ test("variables declared inside of a function", function() { // this is a self-invoking function. Notice that it calls itself at the end (). (function() { var innerVariable = "inner"; - equal(__, outerVariable, 'is outerVariable defined in this scope?'); - equal(__, innerVariable, 'is innerVariable defined in this scope?'); + equal('outer', outerVariable, 'is outerVariable defined in this scope?'); + equal('inner', innerVariable, 'is innerVariable defined in this scope?'); })(); - equal(__, outerVariable, 'is outerVariable defined in this scope?'); - equal(__, typeof(innerVariable), 'is innerVariable defined in this scope?'); + equal('outer', outerVariable, 'is outerVariable defined in this scope?'); + equal('undefined', typeof(innerVariable), 'is innerVariable defined in this scope?'); }); diff --git a/topics/about_strings.js b/topics/about_strings.js index 18f9c68a..9451dcc4 100644 --- a/topics/about_strings.js +++ b/topics/about_strings.js @@ -4,31 +4,31 @@ 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() { var characterType = typeof("Amory".charAt(1)); // typeof will be explained in about reflection - equal(__, characterType, 'Javascript has no character type'); + equal('string', characterType, 'Javascript has no character type'); }); test("escape character", function() { var stringWithAnEscapedCharacter = "\u0041pple"; - equal(__, stringWithAnEscapedCharacter, 'what is the value of stringWithAnEscapedCharacter?'); + equal("\u0041pple", stringWithAnEscapedCharacter, 'what is the value of stringWithAnEscapedCharacter?'); }); 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)?'); }); diff --git a/topics/about_this.js b/topics/about_this.js index 85185f04..1bab963b 100644 --- a/topics/about_this.js +++ b/topics/about_this.js @@ -4,7 +4,7 @@ test("'this' inside a method", function () { var person = { name: 'bob', intro: function () { - return "Hello, my name is " + this.__; + return "Hello, my name is " + this.name; } } equal(person.intro(), "Hello, my name is bob", "If an object has a method can you access properties inside it?"); @@ -22,7 +22,7 @@ test("'this' on unattached function", function () { // if the function is not called as an object property 'this' is the global context // (window in a browser). This is an example. Please do not do this in practise. - window.__ = 'Peter'; + window.globalName = 'Peter'; equal(alias(), "Hello, my name is Peter", "What does 'this' refer to when it is not part of an object?"); }); @@ -35,7 +35,7 @@ test("'this' set explicitly", function () { } // calling a function with 'call' lets us assign 'this' explicitly - var message = person.intro.call({__: "Frank"}); + var message = person.intro.call({name: "Frank"}); equal(message, "Hello, my name is Frank", "What does 'this' refer to when you use the 'call()' method?"); }); diff --git a/topics/about_truthyness.js b/topics/about_truthyness.js index 9b524c14..1b48421d 100644 --- 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; - equal(__, oneIsTruthy, 'is one truthy?'); + equal(true, oneIsTruthy, 'is one truthy?'); }); test("truthyness of negative numbers", function() { var negativeOneIsTruthy = -1 ? true : false; - equal(__, negativeOneIsTruthy, 'is -1 truthy?'); + equal(true, negativeOneIsTruthy, 'is -1 truthy?'); }); test("truthyness of zero", function() { var zeroIsTruthy = 0 ? true : false; - equal(__, zeroIsTruthy, 'is 0 truthy?'); + equal(false, zeroIsTruthy, 'is 0 truthy?'); }); test("truthyness of null", function() { var nullIsTruthy = null ? true : false; - equal(__, nullIsTruthy, 'is null truthy?'); + equal(false, nullIsTruthy, 'is null truthy?'); });