From 0fa52c11cbfe70780648b99717f1dd3502befaff Mon Sep 17 00:00:00 2001 From: Timmy Willison Date: Tue, 9 Apr 2013 11:45:09 -0400 Subject: Update jshintrc to conform to new style guide. Conform to onevar and unused in tests. Fixes #13755. --- test/data/testinit.js | 131 ++++++++++++++++++++++++-------------------------- 1 file changed, 64 insertions(+), 67 deletions(-) (limited to 'test/data/testinit.js') diff --git a/test/data/testinit.js b/test/data/testinit.js index 87edfde29..0351f0264 100644 --- a/test/data/testinit.js +++ b/test/data/testinit.js @@ -3,11 +3,12 @@ var amdDefined, fireNative, originaljQuery = this.jQuery || "jQuery", original$ = this.$ || "$", - hasPHP = true, - isLocal = window.location.protocol === "file:", // see RFC 2606 externalHost = "example.com"; +this.hasPHP = true; +this.isLocal = window.location.protocol === "file:"; + // For testing .noConflict() this.jQuery = originaljQuery; this.$ = original$; @@ -26,7 +27,7 @@ define.amd = {}; * @example q("main", "foo", "bar") * @result [
, , ] */ -function q() { +this.q = function() { var r = [], i = 0; @@ -34,7 +35,7 @@ function q() { r.push( document.getElementById( arguments[i] ) ); } return r; -} +}; /** * Asserts that a select matches the given IDs @@ -44,7 +45,7 @@ function q() { * @example t("Check for something", "//[a]", ["foo", "baar"]); * @result returns true if "//[a]" return two elements with the IDs 'foo' and 'baar' */ -function t( a, b, c ) { +this.t = function( a, b, c ) { var f = jQuery(b).get(), s = "", i = 0; @@ -54,9 +55,9 @@ function t( a, b, c ) { } deepEqual(f, q.apply( q, c ), a + " (" + b + ")"); -} +}; -function createDashboardXML() { +this.createDashboardXML = function() { var string = ' \ \ \ @@ -70,9 +71,9 @@ function createDashboardXML() { '; return jQuery.parseXML(string); -} +}; -function createWithFriesXML() { +this.createWithFriesXML = function() { var string = ' \ '; return jQuery.parseXML( string.replace( /\{\{\s*externalHost\s*\}\}/g, externalHost ) ); -} +}; -function createXMLFragment() { +this.createXMLFragment = function() { var xml, frag; if ( window.ActiveXObject ) { xml = new ActiveXObject("msxml2.domdocument"); @@ -115,7 +116,7 @@ function createXMLFragment() { } return frag; -} +}; fireNative = document.createEvent ? function( node, type ) { @@ -142,7 +143,7 @@ function url( value ) { } // Ajax testing helper -function ajaxTest( title, expect, options ) { +this.ajaxTest = function( title, expect, options ) { var requestOptions; if ( jQuery.isFunction( options ) ) { options = options(); @@ -205,63 +206,59 @@ function ajaxTest( title, expect, options ) { } }; }); -} +}; -(function () { - - this.testIframe = function( fileName, name, fn ) { - - test(name, function() { - // pause execution for now - stop(); - - // load fixture in iframe - var iframe = loadFixture(), - win = iframe.contentWindow, - interval = setInterval( function() { - if ( win && win.jQuery && win.jQuery.isReady ) { - clearInterval( interval ); - // continue - start(); - // call actual tests passing the correct jQuery instance to use - fn.call( this, win.jQuery, win, win.document ); - document.body.removeChild( iframe ); - iframe = null; - } - }, 15 ); - }); - - function loadFixture() { - var src = url("./data/" + fileName + ".html"), - iframe = jQuery("