From ba48be3ada51aee683ce5992c5f00a8458f385f8 Mon Sep 17 00:00:00 2001 From: Ariel Flesler Date: Tue, 6 May 2008 18:56:02 +0000 Subject: [PATCH] test runner: translated all the ok() with '==' to equals(), as it gives more information on failures. --- test/unit/ajax.js | 38 ++--- test/unit/core.js | 362 +++++++++++++++++++++--------------------- test/unit/event.js | 36 ++--- test/unit/fx.js | 24 +-- test/unit/selector.js | 8 +- 5 files changed, 234 insertions(+), 234 deletions(-) diff --git a/test/unit/ajax.js b/test/unit/ajax.js index c6557f4ed..c8bf2ce4b 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -167,8 +167,8 @@ test("$.ajax - dataType html", function() { testFoo = undefined; var verifyEvaluation = function() { - ok( testFoo == "foo", 'Check if script was evaluated for datatype html' ); - ok( foobar == "bar", 'Check if script src was evaluated for datatype html' ); + equals( testFoo, "foo", 'Check if script was evaluated for datatype html' ); + equals( foobar, "bar", 'Check if script src was evaluated for datatype html' ); start(); }; @@ -383,8 +383,8 @@ test("load(String, Function) - check file with only a script tag", function() { stop(); testFoo = undefined; $('#first').load(url('data/test2.html'), function() { - ok( $('#foo').html() == 'foo', 'Check if script evaluation has modified DOM'); - ok( testFoo == "foo", 'Check if script was evaluated after load' ); + equals( $('#foo').html(), 'foo', 'Check if script evaluation has modified DOM'); + equals( testFoo, "foo", 'Check if script was evaluated after load' ); start(); }); }); @@ -652,10 +652,10 @@ test("$.getJSON(String, Hash, Function) - JSON array", function() { expect(4); stop(); $.getJSON(url("data/json.php"), {json: "array"}, function(json) { - ok( json[0].name == 'John', 'Check JSON: first, name' ); - ok( json[0].age == 21, 'Check JSON: first, age' ); - ok( json[1].name == 'Peter', 'Check JSON: second, name' ); - ok( json[1].age == 25, 'Check JSON: second, age' ); + equals( json[0].name, 'John', 'Check JSON: first, name' ); + equals( json[0].age, 21, 'Check JSON: first, age' ); + equals( json[1].name, 'Peter', 'Check JSON: second, name' ); + equals( json[1].age, 25, 'Check JSON: second, age' ); start(); }); }); @@ -664,8 +664,8 @@ test("$.getJSON(String, Function) - JSON object", function() { expect(2); stop(); $.getJSON(url("data/json.php"), function(json) { - ok( json.data.lang == 'en', 'Check JSON: lang' ); - ok( json.data.length == 25, 'Check JSON: length' ); + equals( json.data.lang, 'en', 'Check JSON: lang' ); + equals( json.data.length, 25, 'Check JSON: length' ); start(); }); }); @@ -677,8 +677,8 @@ test("$.getJSON(String, Function) - JSON object with absolute url to local conte stop(); $.getJSON(url(base + "data/json.php"), function(json) { - ok( json.data.lang == 'en', 'Check JSON: lang' ); - ok( json.data.length == 25, 'Check JSON: length' ); + equals( json.data.lang, 'en', 'Check JSON: lang' ); + equals( json.data.length, 25, 'Check JSON: length' ); start(); }); }); @@ -688,15 +688,15 @@ test("$.post(String, Hash, Function) - simple with xml", function() { stop(); $.post(url("data/name.php"), {xml: "5-2"}, function(xml){ $('math', xml).each(function() { - ok( $('calculation', this).text() == '5-2', 'Check for XML' ); - ok( $('result', this).text() == '3', 'Check for XML' ); + equals( $('calculation', this).text(), '5-2', 'Check for XML' ); + equals( $('result', this).text(), '3', 'Check for XML' ); }); }); $.post(url("data/name.php?xml=5-2"), {}, function(xml){ $('math', xml).each(function() { - ok( $('calculation', this).text() == '5-2', 'Check for XML' ); - ok( $('result', this).text() == '3', 'Check for XML' ); + equals( $('calculation', this).text(), '5-2', 'Check for XML' ); + equals( $('result', this).text(), '3', 'Check for XML' ); }); start(); }); @@ -765,7 +765,7 @@ test("$.ajax - simple get", function() { type: "GET", url: url("data/name.php?name=foo"), success: function(msg){ - ok( msg == 'bar', 'Check for GET' ); + equals( msg, 'bar', 'Check for GET' ); start(); } }); @@ -779,7 +779,7 @@ test("$.ajax - simple post", function() { url: url("data/name.php"), data: "name=peter", success: function(msg){ - ok( msg == 'pan', 'Check for POST' ); + equals( msg, 'pan', 'Check for POST' ); start(); } }); @@ -791,7 +791,7 @@ test("ajaxSetup()", function() { $.ajaxSetup({ url: url("data/name.php?name=foo"), success: function(msg){ - ok( msg == 'bar', 'Check for GET' ); + equals( msg, 'bar', 'Check for GET' ); start(); } }); diff --git a/test/unit/core.js b/test/unit/core.js index 4cca7d967..282747693 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -94,17 +94,17 @@ test("noConflict", function() { var old = jQuery; var newjQuery = jQuery.noConflict(); - ok( newjQuery == old, "noConflict returned the jQuery object" ); - ok( jQuery == old, "Make sure jQuery wasn't touched." ); - ok( $ == "$", "Make sure $ was reverted." ); + equals( newjQuery, old, "noConflict returned the jQuery object" ); + equals( jQuery, old, "Make sure jQuery wasn't touched." ); + equals( $, "$", "Make sure $ was reverted." ); jQuery = $ = old; newjQuery = jQuery.noConflict(true); - ok( newjQuery == old, "noConflict returned the jQuery object" ); - ok( jQuery == "jQuery", "Make sure jQuery was reverted." ); - ok( $ == "$", "Make sure $ was reverted." ); + equals( newjQuery, old, "noConflict returned the jQuery object" ); + equals( jQuery, "jQuery", "Make sure jQuery was reverted." ); + equals( $, "$", "Make sure $ was reverted." ); jQuery = $ = old; }); @@ -242,12 +242,12 @@ test("$(selector, xml).text(str) - Loaded via XML document", function() { test("length", function() { expect(1); - ok( $("p").length == 6, "Get Number of Elements Found" ); + equals( $("p").length, 6, "Get Number of Elements Found" ); }); test("size()", function() { expect(1); - ok( $("p").size() == 6, "Get Number of Elements Found" ); + equals( $("p").size(), 6, "Get Number of Elements Found" ); }); test("get()", function() { @@ -257,7 +257,7 @@ test("get()", function() { test("get(Number)", function() { expect(1); - ok( $("p").get(0) == document.getElementById("firstp"), "Get A Single Element" ); + equals( $("p").get(0), document.getElementById("firstp"), "Get A Single Element" ); }); test("add(String|Element|Array|undefined)", function() { @@ -271,12 +271,12 @@ test("add(String|Element|Array|undefined)", function() { //equals( $([]).add($("#form")[0].elements).length, $($("#form")[0].elements).length, "Array in constructor must equals array in add()" ); var x = $([]).add($("

xxx

")).add($("

xxx

")); - ok( x[0].id == "x1", "Check on-the-fly element1" ); - ok( x[1].id == "x2", "Check on-the-fly element2" ); + equals( x[0].id, "x1", "Check on-the-fly element1" ); + equals( x[1].id, "x2", "Check on-the-fly element2" ); var x = $([]).add("

xxx

").add("

xxx

"); - ok( x[0].id == "x1", "Check on-the-fly element1" ); - ok( x[1].id == "x2", "Check on-the-fly element2" ); + equals( x[0].id, "x1", "Check on-the-fly element1" ); + equals( x[1].id, "x2", "Check on-the-fly element2" ); var notDefined; equals( $([]).add(notDefined).length, 0, "Check that undefined adds nothing." ); @@ -295,41 +295,41 @@ test("each(Function)", function() { test("index(Object)", function() { expect(8); - ok( $([window, document]).index(window) == 0, "Check for index of elements" ); - ok( $([window, document]).index(document) == 1, "Check for index of elements" ); + equals( $([window, document]).index(window), 0, "Check for index of elements" ); + equals( $([window, document]).index(document), 1, "Check for index of elements" ); var inputElements = $('#radio1,#radio2,#check1,#check2'); - ok( inputElements.index(document.getElementById('radio1')) == 0, "Check for index of elements" ); - ok( inputElements.index(document.getElementById('radio2')) == 1, "Check for index of elements" ); - ok( inputElements.index(document.getElementById('check1')) == 2, "Check for index of elements" ); - ok( inputElements.index(document.getElementById('check2')) == 3, "Check for index of elements" ); - ok( inputElements.index(window) == -1, "Check for not found index" ); - ok( inputElements.index(document) == -1, "Check for not found index" ); + equals( inputElements.index(document.getElementById('radio1')), 0, "Check for index of elements" ); + equals( inputElements.index(document.getElementById('radio2')), 1, "Check for index of elements" ); + equals( inputElements.index(document.getElementById('check1')), 2, "Check for index of elements" ); + equals( inputElements.index(document.getElementById('check2')), 3, "Check for index of elements" ); + equals( inputElements.index(window), -1, "Check for not found index" ); + equals( inputElements.index(document), -1, "Check for not found index" ); }); test("attr(String)", function() { expect(20); - ok( $('#text1').attr('value') == "Test", 'Check for value attribute' ); - ok( $('#text1').attr('value', "Test2").attr('defaultValue') == "Test", 'Check for defaultValue attribute' ); - ok( $('#text1').attr('type') == "text", 'Check for type attribute' ); - ok( $('#radio1').attr('type') == "radio", 'Check for type attribute' ); - ok( $('#check1').attr('type') == "checkbox", 'Check for type attribute' ); - ok( $('#simon1').attr('rel') == "bookmark", 'Check for rel attribute' ); - ok( $('#google').attr('title') == "Google!", 'Check for title attribute' ); - ok( $('#mark').attr('hreflang') == "en", 'Check for hreflang attribute' ); - ok( $('#en').attr('lang') == "en", 'Check for lang attribute' ); - ok( $('#simon').attr('class') == "blog link", 'Check for class attribute' ); - ok( $('#name').attr('name') == "name", 'Check for name attribute' ); - ok( $('#text1').attr('name') == "action", 'Check for name attribute' ); + equals( $('#text1').attr('value'), "Test", 'Check for value attribute' ); + equals( $('#text1').attr('value', "Test2").attr('defaultValue'), "Test", 'Check for defaultValue attribute' ); + equals( $('#text1').attr('type'), "text", 'Check for type attribute' ); + equals( $('#radio1').attr('type'), "radio", 'Check for type attribute' ); + equals( $('#check1').attr('type'), "checkbox", 'Check for type attribute' ); + equals( $('#simon1').attr('rel'), "bookmark", 'Check for rel attribute' ); + equals( $('#google').attr('title'), "Google!", 'Check for title attribute' ); + equals( $('#mark').attr('hreflang'), "en", 'Check for hreflang attribute' ); + equals( $('#en').attr('lang'), "en", 'Check for lang attribute' ); + equals( $('#simon').attr('class'), "blog link", 'Check for class attribute' ); + equals( $('#name').attr('name'), "name", 'Check for name attribute' ); + equals( $('#text1').attr('name'), "action", 'Check for name attribute' ); ok( $('#form').attr('action').indexOf("formaction") >= 0, 'Check for action attribute' ); - ok( $('#text1').attr('maxlength') == '30', 'Check for maxlength attribute' ); - ok( $('#text1').attr('maxLength') == '30', 'Check for maxLength attribute' ); - ok( $('#area1').attr('maxLength') == '30', 'Check for maxLength attribute' ); - ok( $('#select2').attr('selectedIndex') == 3, 'Check for selectedIndex attribute' ); - ok( $('#foo').attr('nodeName') == 'DIV', 'Check for nodeName attribute' ); - ok( $('#foo').attr('tagName') == 'DIV', 'Check for tagName attribute' ); + equals( $('#text1').attr('maxlength'), '30', 'Check for maxlength attribute' ); + equals( $('#text1').attr('maxLength'), '30', 'Check for maxLength attribute' ); + equals( $('#area1').attr('maxLength'), '30', 'Check for maxLength attribute' ); + equals( $('#select2').attr('selectedIndex'), 3, 'Check for selectedIndex attribute' ); + equals( $('#foo').attr('nodeName'), 'DIV', 'Check for nodeName attribute' ); + equals( $('#foo').attr('tagName'), 'DIV', 'Check for tagName attribute' ); $('').attr('href', '#5').appendTo('#main'); // using innerHTML in IE causes href attribute to be serialized to the full path - ok( $('#tAnchor5').attr('href') == "#5", 'Check for non-absolute href (an anchor)' ); + equals( $('#tAnchor5').attr('href'), "#5", 'Check for non-absolute href (an anchor)' ); }); if ( !isLocal ) { @@ -337,8 +337,8 @@ if ( !isLocal ) { expect(2); stop(); $.get("data/dashboard.xml", function(xml) { - ok( $("locations", xml).attr("class") == "foo", "Check class attribute in XML document" ); - ok( $("location", xml).attr("for") == "bar", "Check for attribute in XML document" ); + equals( $("locations", xml).attr("class"), "foo", "Check class attribute in XML document" ); + equals( $("location", xml).attr("for"), "bar", "Check for attribute in XML document" ); start(); }); }); @@ -346,8 +346,8 @@ if ( !isLocal ) { test("attr(String, Function)", function() { expect(2); - ok( $('#text1').attr('value', function() { return this.id })[0].value == "text1", "Set value from id" ); - ok( $('#text1').attr('title', function(i) { return i }).attr('title') == "0", "Set value with an index"); + equals( $('#text1').attr('value', function() { return this.id })[0].value, "text1", "Set value from id" ); + equals( $('#text1').attr('title', function(i) { return i }).attr('title'), "0", "Set value with an index"); }); test("attr(Hash)", function() { @@ -372,19 +372,19 @@ test("attr(String, Object)", function() { ok( $("#foo").attr({"width": null}), "Try to set an attribute to nothing" ); $("#name").attr('name', 'something'); - ok( $("#name").attr('name') == 'something', 'Set name attribute' ); + equals( $("#name").attr('name'), 'something', 'Set name attribute' ); $("#check2").attr('checked', true); - ok( document.getElementById('check2').checked == true, 'Set checked attribute' ); + equals( document.getElementById('check2').checked, true, 'Set checked attribute' ); $("#check2").attr('checked', false); - ok( document.getElementById('check2').checked == false, 'Set checked attribute' ); + equals( document.getElementById('check2').checked, false, 'Set checked attribute' ); $("#text1").attr('readonly', true); - ok( document.getElementById('text1').readOnly == true, 'Set readonly attribute' ); + equals( document.getElementById('text1').readOnly, true, 'Set readonly attribute' ); $("#text1").attr('readonly', false); - ok( document.getElementById('text1').readOnly == false, 'Set readonly attribute' ); + equals( document.getElementById('text1').readOnly, false, 'Set readonly attribute' ); $("#name").attr('maxlength', '5'); - ok( document.getElementById('name').maxLength == '5', 'Set maxlength attribute' ); + equals( document.getElementById('name').maxLength, '5', 'Set maxlength attribute' ); $("#name").attr('maxLength', '10'); - ok( document.getElementById('name').maxLength == '10', 'Set maxlength attribute' ); + equals( document.getElementById('name').maxLength, '10', 'Set maxlength attribute' ); // for #1070 $("#name").attr('someAttr', '0'); @@ -443,7 +443,7 @@ if ( !isLocal ) { test("css(String|Hash)", function() { expect(19); - ok( $('#main').css("display") == 'none', 'Check for css property "display"'); + equals( $('#main').css("display"), 'none', 'Check for css property "display"'); ok( $('#foo').is(':visible'), 'Modifying CSS display: Assert element is visible'); $('#foo').css({display: 'none'}); @@ -452,22 +452,22 @@ test("css(String|Hash)", function() { ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible'); $('#floatTest').css({styleFloat: 'right'}); - ok( $('#floatTest').css('styleFloat') == 'right', 'Modified CSS float using "styleFloat": Assert float is right'); + equals( $('#floatTest').css('styleFloat'), 'right', 'Modified CSS float using "styleFloat": Assert float is right'); $('#floatTest').css({cssFloat: 'left'}); - ok( $('#floatTest').css('cssFloat') == 'left', 'Modified CSS float using "cssFloat": Assert float is left'); + equals( $('#floatTest').css('cssFloat'), 'left', 'Modified CSS float using "cssFloat": Assert float is left'); $('#floatTest').css({'float': 'right'}); - ok( $('#floatTest').css('float') == 'right', 'Modified CSS float using "float": Assert float is right'); + equals( $('#floatTest').css('float'), 'right', 'Modified CSS float using "float": Assert float is right'); $('#floatTest').css({'font-size': '30px'}); - ok( $('#floatTest').css('font-size') == '30px', 'Modified CSS font-size: Assert font-size is 30px'); + equals( $('#floatTest').css('font-size'), '30px', 'Modified CSS font-size: Assert font-size is 30px'); $.each("0,0.25,0.5,0.75,1".split(','), function(i, n) { $('#foo').css({opacity: n}); - ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" ); + equals( $('#foo').css('opacity'), parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" ); $('#foo').css({opacity: parseFloat(n)}); - ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" ); + equals( $('#foo').css('opacity'), parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" ); }); $('#foo').css({opacity: ''}); - ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" ); + equals( $('#foo').css('opacity'), '1', "Assert opacity is 1 when set to an empty String" ); }); test("css(String, Object)", function() { @@ -479,22 +479,22 @@ test("css(String, Object)", function() { ok( $('#foo').is(':visible'), 'Modified CSS display: Assert element is visible'); $('#floatTest').css('styleFloat', 'left'); - ok( $('#floatTest').css('styleFloat') == 'left', 'Modified CSS float using "styleFloat": Assert float is left'); + equals( $('#floatTest').css('styleFloat'), 'left', 'Modified CSS float using "styleFloat": Assert float is left'); $('#floatTest').css('cssFloat', 'right'); - ok( $('#floatTest').css('cssFloat') == 'right', 'Modified CSS float using "cssFloat": Assert float is right'); + equals( $('#floatTest').css('cssFloat'), 'right', 'Modified CSS float using "cssFloat": Assert float is right'); $('#floatTest').css('float', 'left'); - ok( $('#floatTest').css('float') == 'left', 'Modified CSS float using "float": Assert float is left'); + equals( $('#floatTest').css('float'), 'left', 'Modified CSS float using "float": Assert float is left'); $('#floatTest').css('font-size', '20px'); - ok( $('#floatTest').css('font-size') == '20px', 'Modified CSS font-size: Assert font-size is 20px'); + equals( $('#floatTest').css('font-size'), '20px', 'Modified CSS font-size: Assert font-size is 20px'); $.each("0,0.25,0.5,0.75,1".split(','), function(i, n) { $('#foo').css('opacity', n); - ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" ); + equals( $('#foo').css('opacity'), parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" ); $('#foo').css('opacity', parseFloat(n)); - ok( $('#foo').css('opacity') == parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" ); + equals( $('#foo').css('opacity'), parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" ); }); $('#foo').css('opacity', ''); - ok( $('#foo').css('opacity') == '1', "Assert opacity is 1 when set to an empty String" ); + equals( $('#foo').css('opacity'), '1', "Assert opacity is 1 when set to an empty String" ); // for #1438, IE throws JS error when filter exists but doesn't have opacity in it if (jQuery.browser.msie) { $('#foo').css("filter", "progid:DXImageTransform.Microsoft.Chroma(color='red');"); @@ -578,21 +578,21 @@ test("height()", function() { test("text()", function() { expect(1); var expected = "This link has class=\"blog\": Simon Willison's Weblog"; - ok( $('#sap').text() == expected, 'Check for merged text of more then one element.' ); + equals( $('#sap').text(), expected, 'Check for merged text of more then one element.' ); }); test("wrap(String|Element)", function() { expect(8); var defaultText = 'Try them out:' var result = $('#first').wrap('
').text(); - ok( defaultText == result, 'Check for wrapping of on-the-fly html' ); + equals( defaultText, result, 'Check for wrapping of on-the-fly html' ); ok( $('#first').parent().parent().is('.red'), 'Check if wrapper has class "red"' ); reset(); var defaultText = 'Try them out:' var result = $('#first').wrap(document.getElementById('empty')).parent(); ok( result.is('ol'), 'Check for element wrapping' ); - ok( result.text() == defaultText, 'Check for element wrapping' ); + equals( result.text(), defaultText, 'Check for element wrapping' ); reset(); $('#check1').click(function() { @@ -649,23 +649,23 @@ test("append(String|Element|Array<Element>|jQuery)", function() { expect(21); var defaultText = 'Try them out:' var result = $('#first').append('buga'); - ok( result.text() == defaultText + 'buga', 'Check if text appending works' ); - ok( $('#select3').append('').find('option:last-child').attr('value') == 'appendTest', 'Appending html options to select element'); + equals( result.text(), defaultText + 'buga', 'Check if text appending works' ); + equals( $('#select3').append('').find('option:last-child').attr('value'), 'appendTest', 'Appending html options to select element'); reset(); var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:"; $('#sap').append(document.getElementById('first')); - ok( expected == $('#sap').text(), "Check for appending of element" ); + equals( expected, $('#sap').text(), "Check for appending of element" ); reset(); expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo"; $('#sap').append([document.getElementById('first'), document.getElementById('yahoo')]); - ok( expected == $('#sap').text(), "Check for appending of array of elements" ); + equals( expected, $('#sap').text(), "Check for appending of array of elements" ); reset(); expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo"; $('#sap').append($("#first, #yahoo")); - ok( expected == $('#sap').text(), "Check for appending of jQuery object" ); + equals( expected, $('#sap').text(), "Check for appending of jQuery object" ); reset(); $("#sap").append( 5 ); @@ -682,7 +682,7 @@ test("append(String|Element|Array<Element>|jQuery)", function() { reset(); $("#sap").append(document.getElementById('form')); - ok( $("#sap>form").size() == 1, "Check for appending a form" ); // Bug #910 + equals( $("#sap>form").size(), 1, "Check for appending a form" ); // Bug #910 reset(); var pass = true; @@ -700,7 +700,7 @@ test("append(String|Element|Array<Element>|jQuery)", function() { reset(); $('#select1').append(''); - ok( $('#select1 option:last').text() == "Test", "Appending <OPTION> (all caps)" ); + equals( $('#select1 option:last').text(), "Test", "Appending <OPTION> (all caps)" ); $('#table').append(''); ok( $('#table colgroup').length, "Append colgroup" ); @@ -733,23 +733,23 @@ test("appendTo(String|Element|Array<Element>|jQuery)", function() { expect(6); var defaultText = 'Try them out:' $('buga').appendTo('#first'); - ok( $("#first").text() == defaultText + 'buga', 'Check if text appending works' ); - ok( $('').appendTo('#select3').parent().find('option:last-child').attr('value') == 'appendTest', 'Appending html options to select element'); + equals( $("#first").text(), defaultText + 'buga', 'Check if text appending works' ); + equals( $('').appendTo('#select3').parent().find('option:last-child').attr('value'), 'appendTest', 'Appending html options to select element'); reset(); var expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:"; $(document.getElementById('first')).appendTo('#sap'); - ok( expected == $('#sap').text(), "Check for appending of element" ); + equals( expected, $('#sap').text(), "Check for appending of element" ); reset(); expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo"; $([document.getElementById('first'), document.getElementById('yahoo')]).appendTo('#sap'); - ok( expected == $('#sap').text(), "Check for appending of array of elements" ); + equals( expected, $('#sap').text(), "Check for appending of array of elements" ); reset(); expected = "This link has class=\"blog\": Simon Willison's WeblogTry them out:Yahoo"; $("#first, #yahoo").appendTo('#sap'); - ok( expected == $('#sap').text(), "Check for appending of jQuery object" ); + equals( expected, $('#sap').text(), "Check for appending of jQuery object" ); reset(); $('#select1').appendTo('#foo'); @@ -760,46 +760,46 @@ test("prepend(String|Element|Array<Element>|jQuery)", function() { expect(5); var defaultText = 'Try them out:' var result = $('#first').prepend('buga'); - ok( result.text() == 'buga' + defaultText, 'Check if text prepending works' ); - ok( $('#select3').prepend('').find('option:first-child').attr('value') == 'prependTest', 'Prepending html options to select element'); + equals( result.text(), 'buga' + defaultText, 'Check if text prepending works' ); + equals( $('#select3').prepend('').find('option:first-child').attr('value'), 'prependTest', 'Prepending html options to select element'); reset(); var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog"; $('#sap').prepend(document.getElementById('first')); - ok( expected == $('#sap').text(), "Check for prepending of element" ); + equals( expected, $('#sap').text(), "Check for prepending of element" ); reset(); expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog"; $('#sap').prepend([document.getElementById('first'), document.getElementById('yahoo')]); - ok( expected == $('#sap').text(), "Check for prepending of array of elements" ); + equals( expected, $('#sap').text(), "Check for prepending of array of elements" ); reset(); expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog"; $('#sap').prepend($("#first, #yahoo")); - ok( expected == $('#sap').text(), "Check for prepending of jQuery object" ); + equals( expected, $('#sap').text(), "Check for prepending of jQuery object" ); }); test("prependTo(String|Element|Array<Element>|jQuery)", function() { expect(6); var defaultText = 'Try them out:' $('buga').prependTo('#first'); - ok( $('#first').text() == 'buga' + defaultText, 'Check if text prepending works' ); - ok( $('').prependTo('#select3').parent().find('option:first-child').attr('value') == 'prependTest', 'Prepending html options to select element'); + equals( $('#first').text(), 'buga' + defaultText, 'Check if text prepending works' ); + equals( $('').prependTo('#select3').parent().find('option:first-child').attr('value'), 'prependTest', 'Prepending html options to select element'); reset(); var expected = "Try them out:This link has class=\"blog\": Simon Willison's Weblog"; $(document.getElementById('first')).prependTo('#sap'); - ok( expected == $('#sap').text(), "Check for prepending of element" ); + equals( expected, $('#sap').text(), "Check for prepending of element" ); reset(); expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog"; $([document.getElementById('yahoo'), document.getElementById('first')]).prependTo('#sap'); - ok( expected == $('#sap').text(), "Check for prepending of array of elements" ); + equals( expected, $('#sap').text(), "Check for prepending of array of elements" ); reset(); expected = "Try them out:YahooThis link has class=\"blog\": Simon Willison's Weblog"; $("#yahoo, #first").prependTo('#sap'); - ok( expected == $('#sap').text(), "Check for prepending of jQuery object" ); + equals( expected, $('#sap').text(), "Check for prepending of jQuery object" ); reset(); $('').prependTo('form:last'); @@ -812,88 +812,88 @@ test("before(String|Element|Array<Element>|jQuery)", function() { expect(4); var expected = 'This is a normal link: bugaYahoo'; $('#yahoo').before('buga'); - ok( expected == $('#en').text(), 'Insert String before' ); + equals( expected, $('#en').text(), 'Insert String before' ); reset(); expected = "This is a normal link: Try them out:Yahoo"; $('#yahoo').before(document.getElementById('first')); - ok( expected == $('#en').text(), "Insert element before" ); + equals( expected, $('#en').text(), "Insert element before" ); reset(); expected = "This is a normal link: Try them out:diveintomarkYahoo"; $('#yahoo').before([document.getElementById('first'), document.getElementById('mark')]); - ok( expected == $('#en').text(), "Insert array of elements before" ); + equals( expected, $('#en').text(), "Insert array of elements before" ); reset(); expected = "This is a normal link: Try them out:diveintomarkYahoo"; $('#yahoo').before($("#first, #mark")); - ok( expected == $('#en').text(), "Insert jQuery before" ); + equals( expected, $('#en').text(), "Insert jQuery before" ); }); test("insertBefore(String|Element|Array<Element>|jQuery)", function() { expect(4); var expected = 'This is a normal link: bugaYahoo'; $('buga').insertBefore('#yahoo'); - ok( expected == $('#en').text(), 'Insert String before' ); + equals( expected, $('#en').text(), 'Insert String before' ); reset(); expected = "This is a normal link: Try them out:Yahoo"; $(document.getElementById('first')).insertBefore('#yahoo'); - ok( expected == $('#en').text(), "Insert element before" ); + equals( expected, $('#en').text(), "Insert element before" ); reset(); expected = "This is a normal link: Try them out:diveintomarkYahoo"; $([document.getElementById('first'), document.getElementById('mark')]).insertBefore('#yahoo'); - ok( expected == $('#en').text(), "Insert array of elements before" ); + equals( expected, $('#en').text(), "Insert array of elements before" ); reset(); expected = "This is a normal link: Try them out:diveintomarkYahoo"; $("#first, #mark").insertBefore('#yahoo'); - ok( expected == $('#en').text(), "Insert jQuery before" ); + equals( expected, $('#en').text(), "Insert jQuery before" ); }); test("after(String|Element|Array<Element>|jQuery)", function() { expect(4); var expected = 'This is a normal link: Yahoobuga'; $('#yahoo').after('buga'); - ok( expected == $('#en').text(), 'Insert String after' ); + equals( expected, $('#en').text(), 'Insert String after' ); reset(); expected = "This is a normal link: YahooTry them out:"; $('#yahoo').after(document.getElementById('first')); - ok( expected == $('#en').text(), "Insert element after" ); + equals( expected, $('#en').text(), "Insert element after" ); reset(); expected = "This is a normal link: YahooTry them out:diveintomark"; $('#yahoo').after([document.getElementById('first'), document.getElementById('mark')]); - ok( expected == $('#en').text(), "Insert array of elements after" ); + equals( expected, $('#en').text(), "Insert array of elements after" ); reset(); expected = "This is a normal link: YahooTry them out:diveintomark"; $('#yahoo').after($("#first, #mark")); - ok( expected == $('#en').text(), "Insert jQuery after" ); + equals( expected, $('#en').text(), "Insert jQuery after" ); }); test("insertAfter(String|Element|Array<Element>|jQuery)", function() { expect(4); var expected = 'This is a normal link: Yahoobuga'; $('buga').insertAfter('#yahoo'); - ok( expected == $('#en').text(), 'Insert String after' ); + equals( expected, $('#en').text(), 'Insert String after' ); reset(); expected = "This is a normal link: YahooTry them out:"; $(document.getElementById('first')).insertAfter('#yahoo'); - ok( expected == $('#en').text(), "Insert element after" ); + equals( expected, $('#en').text(), "Insert element after" ); reset(); expected = "This is a normal link: YahooTry them out:diveintomark"; $([document.getElementById('mark'), document.getElementById('first')]).insertAfter('#yahoo'); - ok( expected == $('#en').text(), "Insert array of elements after" ); + equals( expected, $('#en').text(), "Insert array of elements after" ); reset(); expected = "This is a normal link: YahooTry them out:diveintomark"; $("#mark, #first").insertAfter('#yahoo'); - ok( expected == $('#en').text(), "Insert jQuery after" ); + equals( expected, $('#en').text(), "Insert jQuery after" ); }); test("replaceWith(String|Element|Array<Element>|jQuery)", function() { @@ -946,17 +946,17 @@ test("replaceAll(String|Element|Array<Element>|jQuery)", function() { test("end()", function() { expect(3); - ok( 'Yahoo' == $('#yahoo').parent().end().text(), 'Check for end' ); + equals( 'Yahoo', $('#yahoo').parent().end().text(), 'Check for end' ); ok( $('#yahoo').end(), 'Check for end with nothing to end' ); var x = $('#yahoo'); x.parent(); - ok( 'Yahoo' == $('#yahoo').text(), 'Check for non-destructive behaviour' ); + equals( 'Yahoo', $('#yahoo').text(), 'Check for non-destructive behaviour' ); }); test("find(String)", function() { expect(2); - ok( 'Yahoo' == $('#foo').find('.blogTest').text(), 'Check for find' ); + equals( 'Yahoo', $('#foo').find('.blogTest').text(), 'Check for find' ); // using contents will get comments regular, text, and comment nodes var j = $("#nonnodes").contents(); @@ -965,10 +965,10 @@ test("find(String)", function() { test("clone()", function() { expect(20); - ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Assert text for #en' ); + equals( 'This is a normal link: Yahoo', $('#en').text(), 'Assert text for #en' ); var clone = $('#yahoo').clone(); - ok( 'Try them out:Yahoo' == $('#first').append(clone).text(), 'Check for clone' ); - ok( 'This is a normal link: Yahoo' == $('#en').text(), 'Reassert text for #en' ); + equals( 'Try them out:Yahoo', $('#first').append(clone).text(), 'Check for clone' ); + equals( 'This is a normal link: Yahoo', $('#en').text(), 'Reassert text for #en' ); var cloneTags = [ "", "", "
", "
", @@ -1075,7 +1075,7 @@ test("$.extend(Object, Object)", function() { isObj( target, { bar:5 }, "Check to make sure a recursive obj doesn't go never-ending loop by not copying it over" ); var ret = jQuery.extend(true, { foo: [] }, { foo: [0] } ); // 1907 - ok( ret.foo.length == 1, "Check to make sure a value with coersion 'false' copies over when necessary to fix #1907" ); + equals( ret.foo.length, 1, "Check to make sure a value with coersion 'false' copies over when necessary to fix #1907" ); var ret = jQuery.extend(true, { foo: "1,2,3" }, { foo: [1, 2, 3] } ); ok( typeof ret.foo != "string", "Check to make sure values equal with coersion (but not actually equal) overwrite correctly" ); @@ -1108,22 +1108,22 @@ test("$.extend(Object, Object)", function() { test("val()", function() { expect(4); - ok( $("#text1").val() == "Test", "Check for value of input element" ); - ok( !$("#text1").val() == "", "Check for value of input element" ); + equals( $("#text1").val(), "Test", "Check for value of input element" ); + equals( !$("#text1").val(), "", "Check for value of input element" ); // ticket #1714 this caused a JS error in IE - ok( $("#first").val() == "", "Check a paragraph element to see if it has a value" ); + equals( $("#first").val(), "", "Check a paragraph element to see if it has a value" ); ok( $([]).val() === undefined, "Check an empty jQuery object will return undefined from val" ); }); test("val(String)", function() { expect(4); document.getElementById('text1').value = "bla"; - ok( $("#text1").val() == "bla", "Check for modified value of input element" ); + equals( $("#text1").val(), "bla", "Check for modified value of input element" ); $("#text1").val('test'); ok ( document.getElementById('text1').value == "test", "Check for modified (via val(String)) value of input element" ); $("#select1").val("3"); - ok( $("#select1").val() == "3", "Check for modified (via val(String)) value of select element" ); + equals( $("#select1").val(), "3", "Check for modified (via val(String)) value of select element" ); // using contents will get comments regular, text, and comment nodes var j = $("#nonnodes").contents(); @@ -1161,7 +1161,7 @@ test("html(String)", function() { $("#main").html('foo
'); // it was decided that waiting to execute ALL scripts makes sense since nested ones have to wait anyway so this test case is changed, see #1959 - $("#main").html("