From bb47aad39b838fd4b9476ff7cd322a3f770ffcef Mon Sep 17 00:00:00 2001 From: Rafael Xavier de Souza Date: Thu, 12 Dec 2013 10:24:09 -0200 Subject: [PATCH 01/20] Tests: Replace resource loader with AMD --- external/require.js | 2054 +++++++++++++++++ tests/jquery.js | 24 - tests/unit/accordion/accordion.html | 47 +- tests/unit/accordion/accordion.js | 15 + tests/unit/accordion/accordion_common.js | 47 +- tests/unit/accordion/accordion_core.js | 227 +- tests/unit/accordion/accordion_events.js | 316 +-- tests/unit/accordion/accordion_methods.js | 251 +- tests/unit/accordion/accordion_options.js | 828 +++---- .../unit/accordion/accordion_test_helpers.js | 55 +- tests/unit/helper/css.js | 18 + tests/unit/helper/jquery.js | 33 + tests/unit/helper/testsuite.js | 251 ++ tests/unit/testsuite.js | 292 +-- 14 files changed, 3297 insertions(+), 1161 deletions(-) create mode 100644 external/require.js delete mode 100644 tests/jquery.js create mode 100644 tests/unit/accordion/accordion.js create mode 100644 tests/unit/helper/css.js create mode 100644 tests/unit/helper/jquery.js create mode 100644 tests/unit/helper/testsuite.js diff --git a/external/require.js b/external/require.js new file mode 100644 index 00000000000..2ce09b5e3b2 --- /dev/null +++ b/external/require.js @@ -0,0 +1,2054 @@ +/** vim: et:ts=4:sw=4:sts=4 + * @license RequireJS 2.1.9 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved. + * Available via the MIT or new BSD license. + * see: http://github.com/jrburke/requirejs for details + */ +//Not using strict: uneven strict support in browsers, #392, and causes +//problems with requirejs.exec()/transpiler plugins that may not be strict. +/*jslint regexp: true, nomen: true, sloppy: true */ +/*global window, navigator, document, importScripts, setTimeout, opera */ + +var requirejs, require, define; +(function (global) { + var req, s, head, baseElement, dataMain, src, + interactiveScript, currentlyAddingScript, mainScript, subPath, + version = '2.1.9', + commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg, + cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g, + jsSuffixRegExp = /\.js$/, + currDirRegExp = /^\.\//, + op = Object.prototype, + ostring = op.toString, + hasOwn = op.hasOwnProperty, + ap = Array.prototype, + apsp = ap.splice, + isBrowser = !!(typeof window !== 'undefined' && typeof navigator !== 'undefined' && window.document), + isWebWorker = !isBrowser && typeof importScripts !== 'undefined', + //PS3 indicates loaded and complete, but need to wait for complete + //specifically. Sequence is 'loading', 'loaded', execution, + // then 'complete'. The UA check is unfortunate, but not sure how + //to feature test w/o causing perf issues. + readyRegExp = isBrowser && navigator.platform === 'PLAYSTATION 3' ? + /^complete$/ : /^(complete|loaded)$/, + defContextName = '_', + //Oh the tragedy, detecting opera. See the usage of isOpera for reason. + isOpera = typeof opera !== 'undefined' && opera.toString() === '[object Opera]', + contexts = {}, + cfg = {}, + globalDefQueue = [], + useInteractive = false; + + function isFunction(it) { + return ostring.call(it) === '[object Function]'; + } + + function isArray(it) { + return ostring.call(it) === '[object Array]'; + } + + /** + * Helper function for iterating over an array. If the func returns + * a true value, it will break out of the loop. + */ + function each(ary, func) { + if (ary) { + var i; + for (i = 0; i < ary.length; i += 1) { + if (ary[i] && func(ary[i], i, ary)) { + break; + } + } + } + } + + /** + * Helper function for iterating over an array backwards. If the func + * returns a true value, it will break out of the loop. + */ + function eachReverse(ary, func) { + if (ary) { + var i; + for (i = ary.length - 1; i > -1; i -= 1) { + if (ary[i] && func(ary[i], i, ary)) { + break; + } + } + } + } + + function hasProp(obj, prop) { + return hasOwn.call(obj, prop); + } + + function getOwn(obj, prop) { + return hasProp(obj, prop) && obj[prop]; + } + + /** + * Cycles over properties in an object and calls a function for each + * property value. If the function returns a truthy value, then the + * iteration is stopped. + */ + function eachProp(obj, func) { + var prop; + for (prop in obj) { + if (hasProp(obj, prop)) { + if (func(obj[prop], prop)) { + break; + } + } + } + } + + /** + * Simple function to mix in properties from source into target, + * but only if target does not already have a property of the same name. + */ + function mixin(target, source, force, deepStringMixin) { + if (source) { + eachProp(source, function (value, prop) { + if (force || !hasProp(target, prop)) { + if (deepStringMixin && typeof value !== 'string') { + if (!target[prop]) { + target[prop] = {}; + } + mixin(target[prop], value, force, deepStringMixin); + } else { + target[prop] = value; + } + } + }); + } + return target; + } + + //Similar to Function.prototype.bind, but the 'this' object is specified + //first, since it is easier to read/figure out what 'this' will be. + function bind(obj, fn) { + return function () { + return fn.apply(obj, arguments); + }; + } + + function scripts() { + return document.getElementsByTagName('script'); + } + + function defaultOnError(err) { + throw err; + } + + //Allow getting a global that expressed in + //dot notation, like 'a.b.c'. + function getGlobal(value) { + if (!value) { + return value; + } + var g = global; + each(value.split('.'), function (part) { + g = g[part]; + }); + return g; + } + + /** + * Constructs an error with a pointer to an URL with more information. + * @param {String} id the error ID that maps to an ID on a web page. + * @param {String} message human readable error. + * @param {Error} [err] the original error, if there is one. + * + * @returns {Error} + */ + function makeError(id, msg, err, requireModules) { + var e = new Error(msg + '\nhttp://requirejs.org/docs/errors.html#' + id); + e.requireType = id; + e.requireModules = requireModules; + if (err) { + e.originalError = err; + } + return e; + } + + if (typeof define !== 'undefined') { + //If a define is already in play via another AMD loader, + //do not overwrite. + return; + } + + if (typeof requirejs !== 'undefined') { + if (isFunction(requirejs)) { + //Do not overwrite and existing requirejs instance. + return; + } + cfg = requirejs; + requirejs = undefined; + } + + //Allow for a require config object + if (typeof require !== 'undefined' && !isFunction(require)) { + //assume it is a config object. + cfg = require; + require = undefined; + } + + function newContext(contextName) { + var inCheckLoaded, Module, context, handlers, + checkLoadedTimeoutId, + config = { + //Defaults. Do not set a default for map + //config to speed up normalize(), which + //will run faster if there is no default. + waitSeconds: 7, + baseUrl: './', + paths: {}, + pkgs: {}, + shim: {}, + config: {} + }, + registry = {}, + //registry of just enabled modules, to speed + //cycle breaking code when lots of modules + //are registered, but not activated. + enabledRegistry = {}, + undefEvents = {}, + defQueue = [], + defined = {}, + urlFetched = {}, + requireCounter = 1, + unnormalizedCounter = 1; + + /** + * Trims the . and .. from an array of path segments. + * It will keep a leading path segment if a .. will become + * the first path segment, to help with module name lookups, + * which act like paths, but can be remapped. But the end result, + * all paths that use this function should look normalized. + * NOTE: this method MODIFIES the input array. + * @param {Array} ary the array of path segments. + */ + function trimDots(ary) { + var i, part; + for (i = 0; ary[i]; i += 1) { + part = ary[i]; + if (part === '.') { + ary.splice(i, 1); + i -= 1; + } else if (part === '..') { + if (i === 1 && (ary[2] === '..' || ary[0] === '..')) { + //End of the line. Keep at least one non-dot + //path segment at the front so it can be mapped + //correctly to disk. Otherwise, there is likely + //no path mapping for a path starting with '..'. + //This can still fail, but catches the most reasonable + //uses of .. + break; + } else if (i > 0) { + ary.splice(i - 1, 2); + i -= 2; + } + } + } + } + + /** + * Given a relative module name, like ./something, normalize it to + * a real name that can be mapped to a path. + * @param {String} name the relative name + * @param {String} baseName a real name that the name arg is relative + * to. + * @param {Boolean} applyMap apply the map config to the value. Should + * only be done if this normalization is for a dependency ID. + * @returns {String} normalized name + */ + function normalize(name, baseName, applyMap) { + var pkgName, pkgConfig, mapValue, nameParts, i, j, nameSegment, + foundMap, foundI, foundStarMap, starI, + baseParts = baseName && baseName.split('/'), + normalizedBaseParts = baseParts, + map = config.map, + starMap = map && map['*']; + + //Adjust any relative paths. + if (name && name.charAt(0) === '.') { + //If have a base name, try to normalize against it, + //otherwise, assume it is a top-level require that will + //be relative to baseUrl in the end. + if (baseName) { + if (getOwn(config.pkgs, baseName)) { + //If the baseName is a package name, then just treat it as one + //name to concat the name with. + normalizedBaseParts = baseParts = [baseName]; + } else { + //Convert baseName to array, and lop off the last part, + //so that . matches that 'directory' and not name of the baseName's + //module. For instance, baseName of 'one/two/three', maps to + //'one/two/three.js', but we want the directory, 'one/two' for + //this normalization. + normalizedBaseParts = baseParts.slice(0, baseParts.length - 1); + } + + name = normalizedBaseParts.concat(name.split('/')); + trimDots(name); + + //Some use of packages may use a . path to reference the + //'main' module name, so normalize for that. + pkgConfig = getOwn(config.pkgs, (pkgName = name[0])); + name = name.join('/'); + if (pkgConfig && name === pkgName + '/' + pkgConfig.main) { + name = pkgName; + } + } else if (name.indexOf('./') === 0) { + // No baseName, so this is ID is resolved relative + // to baseUrl, pull off the leading dot. + name = name.substring(2); + } + } + + //Apply map config if available. + if (applyMap && map && (baseParts || starMap)) { + nameParts = name.split('/'); + + for (i = nameParts.length; i > 0; i -= 1) { + nameSegment = nameParts.slice(0, i).join('/'); + + if (baseParts) { + //Find the longest baseName segment match in the config. + //So, do joins on the biggest to smallest lengths of baseParts. + for (j = baseParts.length; j > 0; j -= 1) { + mapValue = getOwn(map, baseParts.slice(0, j).join('/')); + + //baseName segment has config, find if it has one for + //this name. + if (mapValue) { + mapValue = getOwn(mapValue, nameSegment); + if (mapValue) { + //Match, update name to the new value. + foundMap = mapValue; + foundI = i; + break; + } + } + } + } + + if (foundMap) { + break; + } + + //Check for a star map match, but just hold on to it, + //if there is a shorter segment match later in a matching + //config, then favor over this star map. + if (!foundStarMap && starMap && getOwn(starMap, nameSegment)) { + foundStarMap = getOwn(starMap, nameSegment); + starI = i; + } + } + + if (!foundMap && foundStarMap) { + foundMap = foundStarMap; + foundI = starI; + } + + if (foundMap) { + nameParts.splice(0, foundI, foundMap); + name = nameParts.join('/'); + } + } + + return name; + } + + function removeScript(name) { + if (isBrowser) { + each(scripts(), function (scriptNode) { + if (scriptNode.getAttribute('data-requiremodule') === name && + scriptNode.getAttribute('data-requirecontext') === context.contextName) { + scriptNode.parentNode.removeChild(scriptNode); + return true; + } + }); + } + } + + function hasPathFallback(id) { + var pathConfig = getOwn(config.paths, id); + if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) { + //Pop off the first array value, since it failed, and + //retry + pathConfig.shift(); + context.require.undef(id); + context.require([id]); + return true; + } + } + + //Turns a plugin!resource to [plugin, resource] + //with the plugin being undefined if the name + //did not have a plugin prefix. + function splitPrefix(name) { + var prefix, + index = name ? name.indexOf('!') : -1; + if (index > -1) { + prefix = name.substring(0, index); + name = name.substring(index + 1, name.length); + } + return [prefix, name]; + } + + /** + * Creates a module mapping that includes plugin prefix, module + * name, and path. If parentModuleMap is provided it will + * also normalize the name via require.normalize() + * + * @param {String} name the module name + * @param {String} [parentModuleMap] parent module map + * for the module name, used to resolve relative names. + * @param {Boolean} isNormalized: is the ID already normalized. + * This is true if this call is done for a define() module ID. + * @param {Boolean} applyMap: apply the map config to the ID. + * Should only be true if this map is for a dependency. + * + * @returns {Object} + */ + function makeModuleMap(name, parentModuleMap, isNormalized, applyMap) { + var url, pluginModule, suffix, nameParts, + prefix = null, + parentName = parentModuleMap ? parentModuleMap.name : null, + originalName = name, + isDefine = true, + normalizedName = ''; + + //If no name, then it means it is a require call, generate an + //internal name. + if (!name) { + isDefine = false; + name = '_@r' + (requireCounter += 1); + } + + nameParts = splitPrefix(name); + prefix = nameParts[0]; + name = nameParts[1]; + + if (prefix) { + prefix = normalize(prefix, parentName, applyMap); + pluginModule = getOwn(defined, prefix); + } + + //Account for relative paths if there is a base name. + if (name) { + if (prefix) { + if (pluginModule && pluginModule.normalize) { + //Plugin is loaded, use its normalize method. + normalizedName = pluginModule.normalize(name, function (name) { + return normalize(name, parentName, applyMap); + }); + } else { + normalizedName = normalize(name, parentName, applyMap); + } + } else { + //A regular module. + normalizedName = normalize(name, parentName, applyMap); + + //Normalized name may be a plugin ID due to map config + //application in normalize. The map config values must + //already be normalized, so do not need to redo that part. + nameParts = splitPrefix(normalizedName); + prefix = nameParts[0]; + normalizedName = nameParts[1]; + isNormalized = true; + + url = context.nameToUrl(normalizedName); + } + } + + //If the id is a plugin id that cannot be determined if it needs + //normalization, stamp it with a unique ID so two matching relative + //ids that may conflict can be separate. + suffix = prefix && !pluginModule && !isNormalized ? + '_unnormalized' + (unnormalizedCounter += 1) : + ''; + + return { + prefix: prefix, + name: normalizedName, + parentMap: parentModuleMap, + unnormalized: !!suffix, + url: url, + originalName: originalName, + isDefine: isDefine, + id: (prefix ? + prefix + '!' + normalizedName : + normalizedName) + suffix + }; + } + + function getModule(depMap) { + var id = depMap.id, + mod = getOwn(registry, id); + + if (!mod) { + mod = registry[id] = new context.Module(depMap); + } + + return mod; + } + + function on(depMap, name, fn) { + var id = depMap.id, + mod = getOwn(registry, id); + + if (hasProp(defined, id) && + (!mod || mod.defineEmitComplete)) { + if (name === 'defined') { + fn(defined[id]); + } + } else { + mod = getModule(depMap); + if (mod.error && name === 'error') { + fn(mod.error); + } else { + mod.on(name, fn); + } + } + } + + function onError(err, errback) { + var ids = err.requireModules, + notified = false; + + if (errback) { + errback(err); + } else { + each(ids, function (id) { + var mod = getOwn(registry, id); + if (mod) { + //Set error on module, so it skips timeout checks. + mod.error = err; + if (mod.events.error) { + notified = true; + mod.emit('error', err); + } + } + }); + + if (!notified) { + req.onError(err); + } + } + } + + /** + * Internal method to transfer globalQueue items to this context's + * defQueue. + */ + function takeGlobalQueue() { + //Push all the globalDefQueue items into the context's defQueue + if (globalDefQueue.length) { + //Array splice in the values since the context code has a + //local var ref to defQueue, so cannot just reassign the one + //on context. + apsp.apply(defQueue, + [defQueue.length - 1, 0].concat(globalDefQueue)); + globalDefQueue = []; + } + } + + handlers = { + 'require': function (mod) { + if (mod.require) { + return mod.require; + } else { + return (mod.require = context.makeRequire(mod.map)); + } + }, + 'exports': function (mod) { + mod.usingExports = true; + if (mod.map.isDefine) { + if (mod.exports) { + return mod.exports; + } else { + return (mod.exports = defined[mod.map.id] = {}); + } + } + }, + 'module': function (mod) { + if (mod.module) { + return mod.module; + } else { + return (mod.module = { + id: mod.map.id, + uri: mod.map.url, + config: function () { + var c, + pkg = getOwn(config.pkgs, mod.map.id); + // For packages, only support config targeted + // at the main module. + c = pkg ? getOwn(config.config, mod.map.id + '/' + pkg.main) : + getOwn(config.config, mod.map.id); + return c || {}; + }, + exports: defined[mod.map.id] + }); + } + } + }; + + function cleanRegistry(id) { + //Clean up machinery used for waiting modules. + delete registry[id]; + delete enabledRegistry[id]; + } + + function breakCycle(mod, traced, processed) { + var id = mod.map.id; + + if (mod.error) { + mod.emit('error', mod.error); + } else { + traced[id] = true; + each(mod.depMaps, function (depMap, i) { + var depId = depMap.id, + dep = getOwn(registry, depId); + + //Only force things that have not completed + //being defined, so still in the registry, + //and only if it has not been matched up + //in the module already. + if (dep && !mod.depMatched[i] && !processed[depId]) { + if (getOwn(traced, depId)) { + mod.defineDep(i, defined[depId]); + mod.check(); //pass false? + } else { + breakCycle(dep, traced, processed); + } + } + }); + processed[id] = true; + } + } + + function checkLoaded() { + var map, modId, err, usingPathFallback, + waitInterval = config.waitSeconds * 1000, + //It is possible to disable the wait interval by using waitSeconds of 0. + expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(), + noLoads = [], + reqCalls = [], + stillLoading = false, + needCycleCheck = true; + + //Do not bother if this call was a result of a cycle break. + if (inCheckLoaded) { + return; + } + + inCheckLoaded = true; + + //Figure out the state of all the modules. + eachProp(enabledRegistry, function (mod) { + map = mod.map; + modId = map.id; + + //Skip things that are not enabled or in error state. + if (!mod.enabled) { + return; + } + + if (!map.isDefine) { + reqCalls.push(mod); + } + + if (!mod.error) { + //If the module should be executed, and it has not + //been inited and time is up, remember it. + if (!mod.inited && expired) { + if (hasPathFallback(modId)) { + usingPathFallback = true; + stillLoading = true; + } else { + noLoads.push(modId); + removeScript(modId); + } + } else if (!mod.inited && mod.fetched && map.isDefine) { + stillLoading = true; + if (!map.prefix) { + //No reason to keep looking for unfinished + //loading. If the only stillLoading is a + //plugin resource though, keep going, + //because it may be that a plugin resource + //is waiting on a non-plugin cycle. + return (needCycleCheck = false); + } + } + } + }); + + if (expired && noLoads.length) { + //If wait time expired, throw error of unloaded modules. + err = makeError('timeout', 'Load timeout for modules: ' + noLoads, null, noLoads); + err.contextName = context.contextName; + return onError(err); + } + + //Not expired, check for a cycle. + if (needCycleCheck) { + each(reqCalls, function (mod) { + breakCycle(mod, {}, {}); + }); + } + + //If still waiting on loads, and the waiting load is something + //other than a plugin resource, or there are still outstanding + //scripts, then just try back later. + if ((!expired || usingPathFallback) && stillLoading) { + //Something is still waiting to load. Wait for it, but only + //if a timeout is not already in effect. + if ((isBrowser || isWebWorker) && !checkLoadedTimeoutId) { + checkLoadedTimeoutId = setTimeout(function () { + checkLoadedTimeoutId = 0; + checkLoaded(); + }, 50); + } + } + + inCheckLoaded = false; + } + + Module = function (map) { + this.events = getOwn(undefEvents, map.id) || {}; + this.map = map; + this.shim = getOwn(config.shim, map.id); + this.depExports = []; + this.depMaps = []; + this.depMatched = []; + this.pluginMaps = {}; + this.depCount = 0; + + /* this.exports this.factory + this.depMaps = [], + this.enabled, this.fetched + */ + }; + + Module.prototype = { + init: function (depMaps, factory, errback, options) { + options = options || {}; + + //Do not do more inits if already done. Can happen if there + //are multiple define calls for the same module. That is not + //a normal, common case, but it is also not unexpected. + if (this.inited) { + return; + } + + this.factory = factory; + + if (errback) { + //Register for errors on this module. + this.on('error', errback); + } else if (this.events.error) { + //If no errback already, but there are error listeners + //on this module, set up an errback to pass to the deps. + errback = bind(this, function (err) { + this.emit('error', err); + }); + } + + //Do a copy of the dependency array, so that + //source inputs are not modified. For example + //"shim" deps are passed in here directly, and + //doing a direct modification of the depMaps array + //would affect that config. + this.depMaps = depMaps && depMaps.slice(0); + + this.errback = errback; + + //Indicate this module has be initialized + this.inited = true; + + this.ignore = options.ignore; + + //Could have option to init this module in enabled mode, + //or could have been previously marked as enabled. However, + //the dependencies are not known until init is called. So + //if enabled previously, now trigger dependencies as enabled. + if (options.enabled || this.enabled) { + //Enable this module and dependencies. + //Will call this.check() + this.enable(); + } else { + this.check(); + } + }, + + defineDep: function (i, depExports) { + //Because of cycles, defined callback for a given + //export can be called more than once. + if (!this.depMatched[i]) { + this.depMatched[i] = true; + this.depCount -= 1; + this.depExports[i] = depExports; + } + }, + + fetch: function () { + if (this.fetched) { + return; + } + this.fetched = true; + + context.startTime = (new Date()).getTime(); + + var map = this.map; + + //If the manager is for a plugin managed resource, + //ask the plugin to load it now. + if (this.shim) { + context.makeRequire(this.map, { + enableBuildCallback: true + })(this.shim.deps || [], bind(this, function () { + return map.prefix ? this.callPlugin() : this.load(); + })); + } else { + //Regular dependency. + return map.prefix ? this.callPlugin() : this.load(); + } + }, + + load: function () { + var url = this.map.url; + + //Regular dependency. + if (!urlFetched[url]) { + urlFetched[url] = true; + context.load(this.map.id, url); + } + }, + + /** + * Checks if the module is ready to define itself, and if so, + * define it. + */ + check: function () { + if (!this.enabled || this.enabling) { + return; + } + + var err, cjsModule, + id = this.map.id, + depExports = this.depExports, + exports = this.exports, + factory = this.factory; + + if (!this.inited) { + this.fetch(); + } else if (this.error) { + this.emit('error', this.error); + } else if (!this.defining) { + //The factory could trigger another require call + //that would result in checking this module to + //define itself again. If already in the process + //of doing that, skip this work. + this.defining = true; + + if (this.depCount < 1 && !this.defined) { + if (isFunction(factory)) { + //If there is an error listener, favor passing + //to that instead of throwing an error. However, + //only do it for define()'d modules. require + //errbacks should not be called for failures in + //their callbacks (#699). However if a global + //onError is set, use that. + if ((this.events.error && this.map.isDefine) || + req.onError !== defaultOnError) { + try { + exports = context.execCb(id, factory, depExports, exports); + } catch (e) { + err = e; + } + } else { + exports = context.execCb(id, factory, depExports, exports); + } + + if (this.map.isDefine) { + //If setting exports via 'module' is in play, + //favor that over return value and exports. After that, + //favor a non-undefined return value over exports use. + cjsModule = this.module; + if (cjsModule && + cjsModule.exports !== undefined && + //Make sure it is not already the exports value + cjsModule.exports !== this.exports) { + exports = cjsModule.exports; + } else if (exports === undefined && this.usingExports) { + //exports already set the defined value. + exports = this.exports; + } + } + + if (err) { + err.requireMap = this.map; + err.requireModules = this.map.isDefine ? [this.map.id] : null; + err.requireType = this.map.isDefine ? 'define' : 'require'; + return onError((this.error = err)); + } + + } else { + //Just a literal value + exports = factory; + } + + this.exports = exports; + + if (this.map.isDefine && !this.ignore) { + defined[id] = exports; + + if (req.onResourceLoad) { + req.onResourceLoad(context, this.map, this.depMaps); + } + } + + //Clean up + cleanRegistry(id); + + this.defined = true; + } + + //Finished the define stage. Allow calling check again + //to allow define notifications below in the case of a + //cycle. + this.defining = false; + + if (this.defined && !this.defineEmitted) { + this.defineEmitted = true; + this.emit('defined', this.exports); + this.defineEmitComplete = true; + } + + } + }, + + callPlugin: function () { + var map = this.map, + id = map.id, + //Map already normalized the prefix. + pluginMap = makeModuleMap(map.prefix); + + //Mark this as a dependency for this plugin, so it + //can be traced for cycles. + this.depMaps.push(pluginMap); + + on(pluginMap, 'defined', bind(this, function (plugin) { + var load, normalizedMap, normalizedMod, + name = this.map.name, + parentName = this.map.parentMap ? this.map.parentMap.name : null, + localRequire = context.makeRequire(map.parentMap, { + enableBuildCallback: true + }); + + //If current map is not normalized, wait for that + //normalized name to load instead of continuing. + if (this.map.unnormalized) { + //Normalize the ID if the plugin allows it. + if (plugin.normalize) { + name = plugin.normalize(name, function (name) { + return normalize(name, parentName, true); + }) || ''; + } + + //prefix and name should already be normalized, no need + //for applying map config again either. + normalizedMap = makeModuleMap(map.prefix + '!' + name, + this.map.parentMap); + on(normalizedMap, + 'defined', bind(this, function (value) { + this.init([], function () { return value; }, null, { + enabled: true, + ignore: true + }); + })); + + normalizedMod = getOwn(registry, normalizedMap.id); + if (normalizedMod) { + //Mark this as a dependency for this plugin, so it + //can be traced for cycles. + this.depMaps.push(normalizedMap); + + if (this.events.error) { + normalizedMod.on('error', bind(this, function (err) { + this.emit('error', err); + })); + } + normalizedMod.enable(); + } + + return; + } + + load = bind(this, function (value) { + this.init([], function () { return value; }, null, { + enabled: true + }); + }); + + load.error = bind(this, function (err) { + this.inited = true; + this.error = err; + err.requireModules = [id]; + + //Remove temp unnormalized modules for this module, + //since they will never be resolved otherwise now. + eachProp(registry, function (mod) { + if (mod.map.id.indexOf(id + '_unnormalized') === 0) { + cleanRegistry(mod.map.id); + } + }); + + onError(err); + }); + + //Allow plugins to load other code without having to know the + //context or how to 'complete' the load. + load.fromText = bind(this, function (text, textAlt) { + /*jslint evil: true */ + var moduleName = map.name, + moduleMap = makeModuleMap(moduleName), + hasInteractive = useInteractive; + + //As of 2.1.0, support just passing the text, to reinforce + //fromText only being called once per resource. Still + //support old style of passing moduleName but discard + //that moduleName in favor of the internal ref. + if (textAlt) { + text = textAlt; + } + + //Turn off interactive script matching for IE for any define + //calls in the text, then turn it back on at the end. + if (hasInteractive) { + useInteractive = false; + } + + //Prime the system by creating a module instance for + //it. + getModule(moduleMap); + + //Transfer any config to this other module. + if (hasProp(config.config, id)) { + config.config[moduleName] = config.config[id]; + } + + try { + req.exec(text); + } catch (e) { + return onError(makeError('fromtexteval', + 'fromText eval for ' + id + + ' failed: ' + e, + e, + [id])); + } + + if (hasInteractive) { + useInteractive = true; + } + + //Mark this as a dependency for the plugin + //resource + this.depMaps.push(moduleMap); + + //Support anonymous modules. + context.completeLoad(moduleName); + + //Bind the value of that module to the value for this + //resource ID. + localRequire([moduleName], load); + }); + + //Use parentName here since the plugin's name is not reliable, + //could be some weird string with no path that actually wants to + //reference the parentName's path. + plugin.load(map.name, localRequire, load, config); + })); + + context.enable(pluginMap, this); + this.pluginMaps[pluginMap.id] = pluginMap; + }, + + enable: function () { + enabledRegistry[this.map.id] = this; + this.enabled = true; + + //Set flag mentioning that the module is enabling, + //so that immediate calls to the defined callbacks + //for dependencies do not trigger inadvertent load + //with the depCount still being zero. + this.enabling = true; + + //Enable each dependency + each(this.depMaps, bind(this, function (depMap, i) { + var id, mod, handler; + + if (typeof depMap === 'string') { + //Dependency needs to be converted to a depMap + //and wired up to this module. + depMap = makeModuleMap(depMap, + (this.map.isDefine ? this.map : this.map.parentMap), + false, + !this.skipMap); + this.depMaps[i] = depMap; + + handler = getOwn(handlers, depMap.id); + + if (handler) { + this.depExports[i] = handler(this); + return; + } + + this.depCount += 1; + + on(depMap, 'defined', bind(this, function (depExports) { + this.defineDep(i, depExports); + this.check(); + })); + + if (this.errback) { + on(depMap, 'error', bind(this, this.errback)); + } + } + + id = depMap.id; + mod = registry[id]; + + //Skip special modules like 'require', 'exports', 'module' + //Also, don't call enable if it is already enabled, + //important in circular dependency cases. + if (!hasProp(handlers, id) && mod && !mod.enabled) { + context.enable(depMap, this); + } + })); + + //Enable each plugin that is used in + //a dependency + eachProp(this.pluginMaps, bind(this, function (pluginMap) { + var mod = getOwn(registry, pluginMap.id); + if (mod && !mod.enabled) { + context.enable(pluginMap, this); + } + })); + + this.enabling = false; + + this.check(); + }, + + on: function (name, cb) { + var cbs = this.events[name]; + if (!cbs) { + cbs = this.events[name] = []; + } + cbs.push(cb); + }, + + emit: function (name, evt) { + each(this.events[name], function (cb) { + cb(evt); + }); + if (name === 'error') { + //Now that the error handler was triggered, remove + //the listeners, since this broken Module instance + //can stay around for a while in the registry. + delete this.events[name]; + } + } + }; + + function callGetModule(args) { + //Skip modules already defined. + if (!hasProp(defined, args[0])) { + getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]); + } + } + + function removeListener(node, func, name, ieName) { + //Favor detachEvent because of IE9 + //issue, see attachEvent/addEventListener comment elsewhere + //in this file. + if (node.detachEvent && !isOpera) { + //Probably IE. If not it will throw an error, which will be + //useful to know. + if (ieName) { + node.detachEvent(ieName, func); + } + } else { + node.removeEventListener(name, func, false); + } + } + + /** + * Given an event from a script node, get the requirejs info from it, + * and then removes the event listeners on the node. + * @param {Event} evt + * @returns {Object} + */ + function getScriptData(evt) { + //Using currentTarget instead of target for Firefox 2.0's sake. Not + //all old browsers will be supported, but this one was easy enough + //to support and still makes sense. + var node = evt.currentTarget || evt.srcElement; + + //Remove the listeners once here. + removeListener(node, context.onScriptLoad, 'load', 'onreadystatechange'); + removeListener(node, context.onScriptError, 'error'); + + return { + node: node, + id: node && node.getAttribute('data-requiremodule') + }; + } + + function intakeDefines() { + var args; + + //Any defined modules in the global queue, intake them now. + takeGlobalQueue(); + + //Make sure any remaining defQueue items get properly processed. + while (defQueue.length) { + args = defQueue.shift(); + if (args[0] === null) { + return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1])); + } else { + //args are id, deps, factory. Should be normalized by the + //define() function. + callGetModule(args); + } + } + } + + context = { + config: config, + contextName: contextName, + registry: registry, + defined: defined, + urlFetched: urlFetched, + defQueue: defQueue, + Module: Module, + makeModuleMap: makeModuleMap, + nextTick: req.nextTick, + onError: onError, + + /** + * Set a configuration for the context. + * @param {Object} cfg config object to integrate. + */ + configure: function (cfg) { + //Make sure the baseUrl ends in a slash. + if (cfg.baseUrl) { + if (cfg.baseUrl.charAt(cfg.baseUrl.length - 1) !== '/') { + cfg.baseUrl += '/'; + } + } + + //Save off the paths and packages since they require special processing, + //they are additive. + var pkgs = config.pkgs, + shim = config.shim, + objs = { + paths: true, + config: true, + map: true + }; + + eachProp(cfg, function (value, prop) { + if (objs[prop]) { + if (prop === 'map') { + if (!config.map) { + config.map = {}; + } + mixin(config[prop], value, true, true); + } else { + mixin(config[prop], value, true); + } + } else { + config[prop] = value; + } + }); + + //Merge shim + if (cfg.shim) { + eachProp(cfg.shim, function (value, id) { + //Normalize the structure + if (isArray(value)) { + value = { + deps: value + }; + } + if ((value.exports || value.init) && !value.exportsFn) { + value.exportsFn = context.makeShimExports(value); + } + shim[id] = value; + }); + config.shim = shim; + } + + //Adjust packages if necessary. + if (cfg.packages) { + each(cfg.packages, function (pkgObj) { + var location; + + pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj; + location = pkgObj.location; + + //Create a brand new object on pkgs, since currentPackages can + //be passed in again, and config.pkgs is the internal transformed + //state for all package configs. + pkgs[pkgObj.name] = { + name: pkgObj.name, + location: location || pkgObj.name, + //Remove leading dot in main, so main paths are normalized, + //and remove any trailing .js, since different package + //envs have different conventions: some use a module name, + //some use a file name. + main: (pkgObj.main || 'main') + .replace(currDirRegExp, '') + .replace(jsSuffixRegExp, '') + }; + }); + + //Done with modifications, assing packages back to context config + config.pkgs = pkgs; + } + + //If there are any "waiting to execute" modules in the registry, + //update the maps for them, since their info, like URLs to load, + //may have changed. + eachProp(registry, function (mod, id) { + //If module already has init called, since it is too + //late to modify them, and ignore unnormalized ones + //since they are transient. + if (!mod.inited && !mod.map.unnormalized) { + mod.map = makeModuleMap(id); + } + }); + + //If a deps array or a config callback is specified, then call + //require with those args. This is useful when require is defined as a + //config object before require.js is loaded. + if (cfg.deps || cfg.callback) { + context.require(cfg.deps || [], cfg.callback); + } + }, + + makeShimExports: function (value) { + function fn() { + var ret; + if (value.init) { + ret = value.init.apply(global, arguments); + } + return ret || (value.exports && getGlobal(value.exports)); + } + return fn; + }, + + makeRequire: function (relMap, options) { + options = options || {}; + + function localRequire(deps, callback, errback) { + var id, map, requireMod; + + if (options.enableBuildCallback && callback && isFunction(callback)) { + callback.__requireJsBuild = true; + } + + if (typeof deps === 'string') { + if (isFunction(callback)) { + //Invalid call + return onError(makeError('requireargs', 'Invalid require call'), errback); + } + + //If require|exports|module are requested, get the + //value for them from the special handlers. Caveat: + //this only works while module is being defined. + if (relMap && hasProp(handlers, deps)) { + return handlers[deps](registry[relMap.id]); + } + + //Synchronous access to one module. If require.get is + //available (as in the Node adapter), prefer that. + if (req.get) { + return req.get(context, deps, relMap, localRequire); + } + + //Normalize module name, if it contains . or .. + map = makeModuleMap(deps, relMap, false, true); + id = map.id; + + if (!hasProp(defined, id)) { + return onError(makeError('notloaded', 'Module name "' + + id + + '" has not been loaded yet for context: ' + + contextName + + (relMap ? '' : '. Use require([])'))); + } + return defined[id]; + } + + //Grab defines waiting in the global queue. + intakeDefines(); + + //Mark all the dependencies as needing to be loaded. + context.nextTick(function () { + //Some defines could have been added since the + //require call, collect them. + intakeDefines(); + + requireMod = getModule(makeModuleMap(null, relMap)); + + //Store if map config should be applied to this require + //call for dependencies. + requireMod.skipMap = options.skipMap; + + requireMod.init(deps, callback, errback, { + enabled: true + }); + + checkLoaded(); + }); + + return localRequire; + } + + mixin(localRequire, { + isBrowser: isBrowser, + + /** + * Converts a module name + .extension into an URL path. + * *Requires* the use of a module name. It does not support using + * plain URLs like nameToUrl. + */ + toUrl: function (moduleNamePlusExt) { + var ext, + index = moduleNamePlusExt.lastIndexOf('.'), + segment = moduleNamePlusExt.split('/')[0], + isRelative = segment === '.' || segment === '..'; + + //Have a file extension alias, and it is not the + //dots from a relative path. + if (index !== -1 && (!isRelative || index > 1)) { + ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length); + moduleNamePlusExt = moduleNamePlusExt.substring(0, index); + } + + return context.nameToUrl(normalize(moduleNamePlusExt, + relMap && relMap.id, true), ext, true); + }, + + defined: function (id) { + return hasProp(defined, makeModuleMap(id, relMap, false, true).id); + }, + + specified: function (id) { + id = makeModuleMap(id, relMap, false, true).id; + return hasProp(defined, id) || hasProp(registry, id); + } + }); + + //Only allow undef on top level require calls + if (!relMap) { + localRequire.undef = function (id) { + //Bind any waiting define() calls to this context, + //fix for #408 + takeGlobalQueue(); + + var map = makeModuleMap(id, relMap, true), + mod = getOwn(registry, id); + + removeScript(id); + + delete defined[id]; + delete urlFetched[map.url]; + delete undefEvents[id]; + + if (mod) { + //Hold on to listeners in case the + //module will be attempted to be reloaded + //using a different config. + if (mod.events.defined) { + undefEvents[id] = mod.events; + } + + cleanRegistry(id); + } + }; + } + + return localRequire; + }, + + /** + * Called to enable a module if it is still in the registry + * awaiting enablement. A second arg, parent, the parent module, + * is passed in for context, when this method is overriden by + * the optimizer. Not shown here to keep code compact. + */ + enable: function (depMap) { + var mod = getOwn(registry, depMap.id); + if (mod) { + getModule(depMap).enable(); + } + }, + + /** + * Internal method used by environment adapters to complete a load event. + * A load event could be a script load or just a load pass from a synchronous + * load call. + * @param {String} moduleName the name of the module to potentially complete. + */ + completeLoad: function (moduleName) { + var found, args, mod, + shim = getOwn(config.shim, moduleName) || {}, + shExports = shim.exports; + + takeGlobalQueue(); + + while (defQueue.length) { + args = defQueue.shift(); + if (args[0] === null) { + args[0] = moduleName; + //If already found an anonymous module and bound it + //to this name, then this is some other anon module + //waiting for its completeLoad to fire. + if (found) { + break; + } + found = true; + } else if (args[0] === moduleName) { + //Found matching define call for this script! + found = true; + } + + callGetModule(args); + } + + //Do this after the cycle of callGetModule in case the result + //of those calls/init calls changes the registry. + mod = getOwn(registry, moduleName); + + if (!found && !hasProp(defined, moduleName) && mod && !mod.inited) { + if (config.enforceDefine && (!shExports || !getGlobal(shExports))) { + if (hasPathFallback(moduleName)) { + return; + } else { + return onError(makeError('nodefine', + 'No define call for ' + moduleName, + null, + [moduleName])); + } + } else { + //A script that does not call define(), so just simulate + //the call for it. + callGetModule([moduleName, (shim.deps || []), shim.exportsFn]); + } + } + + checkLoaded(); + }, + + /** + * Converts a module name to a file path. Supports cases where + * moduleName may actually be just an URL. + * Note that it **does not** call normalize on the moduleName, + * it is assumed to have already been normalized. This is an + * internal API, not a public one. Use toUrl for the public API. + */ + nameToUrl: function (moduleName, ext, skipExt) { + var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url, + parentPath; + + //If a colon is in the URL, it indicates a protocol is used and it is just + //an URL to a file, or if it starts with a slash, contains a query arg (i.e. ?) + //or ends with .js, then assume the user meant to use an url and not a module id. + //The slash is important for protocol-less URLs as well as full paths. + if (req.jsExtRegExp.test(moduleName)) { + //Just a plain path, not module name lookup, so just return it. + //Add extension if it is included. This is a bit wonky, only non-.js things pass + //an extension, this method probably needs to be reworked. + url = moduleName + (ext || ''); + } else { + //A module that needs to be converted to a path. + paths = config.paths; + pkgs = config.pkgs; + + syms = moduleName.split('/'); + //For each module name segment, see if there is a path + //registered for it. Start with most specific name + //and work up from it. + for (i = syms.length; i > 0; i -= 1) { + parentModule = syms.slice(0, i).join('/'); + pkg = getOwn(pkgs, parentModule); + parentPath = getOwn(paths, parentModule); + if (parentPath) { + //If an array, it means there are a few choices, + //Choose the one that is desired + if (isArray(parentPath)) { + parentPath = parentPath[0]; + } + syms.splice(0, i, parentPath); + break; + } else if (pkg) { + //If module name is just the package name, then looking + //for the main module. + if (moduleName === pkg.name) { + pkgPath = pkg.location + '/' + pkg.main; + } else { + pkgPath = pkg.location; + } + syms.splice(0, i, pkgPath); + break; + } + } + + //Join the path parts together, then figure out if baseUrl is needed. + url = syms.join('/'); + url += (ext || (/^data\:|\?/.test(url) || skipExt ? '' : '.js')); + url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url; + } + + return config.urlArgs ? url + + ((url.indexOf('?') === -1 ? '?' : '&') + + config.urlArgs) : url; + }, + + //Delegates to req.load. Broken out as a separate function to + //allow overriding in the optimizer. + load: function (id, url) { + req.load(context, id, url); + }, + + /** + * Executes a module callback function. Broken out as a separate function + * solely to allow the build system to sequence the files in the built + * layer in the right sequence. + * + * @private + */ + execCb: function (name, callback, args, exports) { + return callback.apply(exports, args); + }, + + /** + * callback for script loads, used to check status of loading. + * + * @param {Event} evt the event from the browser for the script + * that was loaded. + */ + onScriptLoad: function (evt) { + //Using currentTarget instead of target for Firefox 2.0's sake. Not + //all old browsers will be supported, but this one was easy enough + //to support and still makes sense. + if (evt.type === 'load' || + (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) { + //Reset interactive script so a script node is not held onto for + //to long. + interactiveScript = null; + + //Pull out the name of the module and the context. + var data = getScriptData(evt); + context.completeLoad(data.id); + } + }, + + /** + * Callback for script errors. + */ + onScriptError: function (evt) { + var data = getScriptData(evt); + if (!hasPathFallback(data.id)) { + return onError(makeError('scripterror', 'Script error for: ' + data.id, evt, [data.id])); + } + } + }; + + context.require = context.makeRequire(); + return context; + } + + /** + * Main entry point. + * + * If the only argument to require is a string, then the module that + * is represented by that string is fetched for the appropriate context. + * + * If the first argument is an array, then it will be treated as an array + * of dependency string names to fetch. An optional function callback can + * be specified to execute when all of those dependencies are available. + * + * Make a local req variable to help Caja compliance (it assumes things + * on a require that are not standardized), and to give a short + * name for minification/local scope use. + */ + req = requirejs = function (deps, callback, errback, optional) { + + //Find the right context, use default + var context, config, + contextName = defContextName; + + // Determine if have config object in the call. + if (!isArray(deps) && typeof deps !== 'string') { + // deps is a config object + config = deps; + if (isArray(callback)) { + // Adjust args if there are dependencies + deps = callback; + callback = errback; + errback = optional; + } else { + deps = []; + } + } + + if (config && config.context) { + contextName = config.context; + } + + context = getOwn(contexts, contextName); + if (!context) { + context = contexts[contextName] = req.s.newContext(contextName); + } + + if (config) { + context.configure(config); + } + + return context.require(deps, callback, errback); + }; + + /** + * Support require.config() to make it easier to cooperate with other + * AMD loaders on globally agreed names. + */ + req.config = function (config) { + return req(config); + }; + + /** + * Execute something after the current tick + * of the event loop. Override for other envs + * that have a better solution than setTimeout. + * @param {Function} fn function to execute later. + */ + req.nextTick = typeof setTimeout !== 'undefined' ? function (fn) { + setTimeout(fn, 4); + } : function (fn) { fn(); }; + + /** + * Export require as a global, but only if it does not already exist. + */ + if (!require) { + require = req; + } + + req.version = version; + + //Used to filter out dependencies that are already paths. + req.jsExtRegExp = /^\/|:|\?|\.js$/; + req.isBrowser = isBrowser; + s = req.s = { + contexts: contexts, + newContext: newContext + }; + + //Create default context. + req({}); + + //Exports some context-sensitive methods on global require. + each([ + 'toUrl', + 'undef', + 'defined', + 'specified' + ], function (prop) { + //Reference from contexts instead of early binding to default context, + //so that during builds, the latest instance of the default context + //with its config gets used. + req[prop] = function () { + var ctx = contexts[defContextName]; + return ctx.require[prop].apply(ctx, arguments); + }; + }); + + if (isBrowser) { + head = s.head = document.getElementsByTagName('head')[0]; + //If BASE tag is in play, using appendChild is a problem for IE6. + //When that browser dies, this can be removed. Details in this jQuery bug: + //http://dev.jquery.com/ticket/2709 + baseElement = document.getElementsByTagName('base')[0]; + if (baseElement) { + head = s.head = baseElement.parentNode; + } + } + + /** + * Any errors that require explicitly generates will be passed to this + * function. Intercept/override it if you want custom error handling. + * @param {Error} err the error object. + */ + req.onError = defaultOnError; + + /** + * Creates the node for the load command. Only used in browser envs. + */ + req.createNode = function (config, moduleName, url) { + var node = config.xhtml ? + document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') : + document.createElement('script'); + node.type = config.scriptType || 'text/javascript'; + node.charset = 'utf-8'; + node.async = true; + return node; + }; + + /** + * Does the request to load a module for the browser case. + * Make this a separate function to allow other environments + * to override it. + * + * @param {Object} context the require context to find state. + * @param {String} moduleName the name of the module. + * @param {Object} url the URL to the module. + */ + req.load = function (context, moduleName, url) { + var config = (context && context.config) || {}, + node; + if (isBrowser) { + //In the browser so use a script tag + node = req.createNode(config, moduleName, url); + + node.setAttribute('data-requirecontext', context.contextName); + node.setAttribute('data-requiremodule', moduleName); + + //Set up load listener. Test attachEvent first because IE9 has + //a subtle issue in its addEventListener and script onload firings + //that do not match the behavior of all other browsers with + //addEventListener support, which fire the onload event for a + //script right after the script execution. See: + //https://connect.microsoft.com/IE/feedback/details/648057/script-onload-event-is-not-fired-immediately-after-script-execution + //UNFORTUNATELY Opera implements attachEvent but does not follow the script + //script execution mode. + if (node.attachEvent && + //Check if node.attachEvent is artificially added by custom script or + //natively supported by browser + //read https://github.com/jrburke/requirejs/issues/187 + //if we can NOT find [native code] then it must NOT natively supported. + //in IE8, node.attachEvent does not have toString() + //Note the test for "[native code" with no closing brace, see: + //https://github.com/jrburke/requirejs/issues/273 + !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) && + !isOpera) { + //Probably IE. IE (at least 6-8) do not fire + //script onload right after executing the script, so + //we cannot tie the anonymous define call to a name. + //However, IE reports the script as being in 'interactive' + //readyState at the time of the define call. + useInteractive = true; + + node.attachEvent('onreadystatechange', context.onScriptLoad); + //It would be great to add an error handler here to catch + //404s in IE9+. However, onreadystatechange will fire before + //the error handler, so that does not help. If addEventListener + //is used, then IE will fire error before load, but we cannot + //use that pathway given the connect.microsoft.com issue + //mentioned above about not doing the 'script execute, + //then fire the script load event listener before execute + //next script' that other browsers do. + //Best hope: IE10 fixes the issues, + //and then destroys all installs of IE 6-9. + //node.attachEvent('onerror', context.onScriptError); + } else { + node.addEventListener('load', context.onScriptLoad, false); + node.addEventListener('error', context.onScriptError, false); + } + node.src = url; + + //For some cache cases in IE 6-8, the script executes before the end + //of the appendChild execution, so to tie an anonymous define + //call to the module name (which is stored on the node), hold on + //to a reference to this node, but clear after the DOM insertion. + currentlyAddingScript = node; + if (baseElement) { + head.insertBefore(node, baseElement); + } else { + head.appendChild(node); + } + currentlyAddingScript = null; + + return node; + } else if (isWebWorker) { + try { + //In a web worker, use importScripts. This is not a very + //efficient use of importScripts, importScripts will block until + //its script is downloaded and evaluated. However, if web workers + //are in play, the expectation that a build has been done so that + //only one script needs to be loaded anyway. This may need to be + //reevaluated if other use cases become common. + importScripts(url); + + //Account for anonymous modules + context.completeLoad(moduleName); + } catch (e) { + context.onError(makeError('importscripts', + 'importScripts failed for ' + + moduleName + ' at ' + url, + e, + [moduleName])); + } + } + }; + + function getInteractiveScript() { + if (interactiveScript && interactiveScript.readyState === 'interactive') { + return interactiveScript; + } + + eachReverse(scripts(), function (script) { + if (script.readyState === 'interactive') { + return (interactiveScript = script); + } + }); + return interactiveScript; + } + + //Look for a data-main script attribute, which could also adjust the baseUrl. + if (isBrowser && !cfg.skipDataMain) { + //Figure out baseUrl. Get it from the script tag with require.js in it. + eachReverse(scripts(), function (script) { + //Set the 'head' where we can append children by + //using the script's parent. + if (!head) { + head = script.parentNode; + } + + //Look for a data-main attribute to set main script for the page + //to load. If it is there, the path to data main becomes the + //baseUrl, if it is not already set. + dataMain = script.getAttribute('data-main'); + if (dataMain) { + //Preserve dataMain in case it is a path (i.e. contains '?') + mainScript = dataMain; + + //Set final baseUrl if there is not already an explicit one. + if (!cfg.baseUrl) { + //Pull off the directory of data-main for use as the + //baseUrl. + src = mainScript.split('/'); + mainScript = src.pop(); + subPath = src.length ? src.join('/') + '/' : './'; + + cfg.baseUrl = subPath; + } + + //Strip off any trailing .js since mainScript is now + //like a module name. + mainScript = mainScript.replace(jsSuffixRegExp, ''); + + //If mainScript is still a path, fall back to dataMain + if (req.jsExtRegExp.test(mainScript)) { + mainScript = dataMain; + } + + //Put the data-main script in the files to load. + cfg.deps = cfg.deps ? cfg.deps.concat(mainScript) : [mainScript]; + + return true; + } + }); + } + + /** + * The function that handles definitions of modules. Differs from + * require() in that a string for the module should be the first argument, + * and the function to execute after dependencies are loaded should + * return a value to define the module corresponding to the first argument's + * name. + */ + define = function (name, deps, callback) { + var node, context; + + //Allow for anonymous modules + if (typeof name !== 'string') { + //Adjust args appropriately + callback = deps; + deps = name; + name = null; + } + + //This module may not have dependencies + if (!isArray(deps)) { + callback = deps; + deps = null; + } + + //If no name, and callback is a function, then figure out if it a + //CommonJS thing with dependencies. + if (!deps && isFunction(callback)) { + deps = []; + //Remove comments from the callback string, + //look for require calls, and pull them into the dependencies, + //but only if there are function args. + if (callback.length) { + callback + .toString() + .replace(commentRegExp, '') + .replace(cjsRequireRegExp, function (match, dep) { + deps.push(dep); + }); + + //May be a CommonJS thing even without require calls, but still + //could use exports, and module. Avoid doing exports and module + //work though if it just needs require. + //REQUIRES the function to expect the CommonJS variables in the + //order listed below. + deps = (callback.length === 1 ? ['require'] : ['require', 'exports', 'module']).concat(deps); + } + } + + //If in IE 6-8 and hit an anonymous define() call, do the interactive + //work. + if (useInteractive) { + node = currentlyAddingScript || getInteractiveScript(); + if (node) { + if (!name) { + name = node.getAttribute('data-requiremodule'); + } + context = contexts[node.getAttribute('data-requirecontext')]; + } + } + + //Always save off evaluating the def call until the script onload handler. + //This allows multiple modules to be in a file without prematurely + //tracing dependencies, and allows for anonymous module support, + //where the module name is not known until the script onload event + //occurs. If no context, use the global queue, and get it processed + //in the onscript load callback. + (context ? context.defQueue : globalDefQueue).push([name, deps, callback]); + }; + + define.amd = { + jQuery: true + }; + + + /** + * Executes the text. Normally just uses eval, but can be modified + * to use a better, environment-specific call. Only used for transpiling + * loader plugins, not for plain JS modules. + * @param {String} text the text to execute/evaluate. + */ + req.exec = function (text) { + /*jslint evil: true */ + return eval(text); + }; + + //Set up with config info. + req(cfg); +}(this)); diff --git a/tests/jquery.js b/tests/jquery.js deleted file mode 100644 index 67511667d91..00000000000 --- a/tests/jquery.js +++ /dev/null @@ -1,24 +0,0 @@ -(function() { - -var current, version, url, - parts = document.location.search.slice( 1 ).split( "&" ), - length = parts.length, - i = 0; - -for ( ; i < length; i++ ) { - current = parts[ i ].split( "=" ); - if ( current[ 0 ] === "jquery" ) { - version = current[ 1 ]; - break; - } -} - -if ( version === "git" ) { - url = "http://code.jquery.com/jquery-git.js"; -} else { - url = "../../../external/jquery-" + ( version || "1.10.2" ) + "/jquery.js"; -} - -document.write( "" ); - -}() ); diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html index 5a76ba566de..2972f66c9f8 100644 --- a/tests/unit/accordion/accordion.html +++ b/tests/unit/accordion/accordion.html @@ -4,30 +4,12 @@ jQuery UI Accordion Test Suite - - - - - + - - - - - - - - + - - - + - - - - - - - - + @@ -122,5 +99,25 @@ + + + + + + + + diff --git a/tests/unit/draggable/draggable_common.js b/tests/unit/draggable/draggable_common.js index 5abd09e4935..baf9f533c89 100644 --- a/tests/unit/draggable/draggable_common.js +++ b/tests/unit/draggable/draggable_common.js @@ -1,4 +1,8 @@ -TestHelpers.commonWidgetTests( "draggable", { +define([ + "helper/testsuite" +], function( testHelper ) { + +testHelper.commonWidgetTests( "draggable", { defaults: { appendTo: "parent", axis: false, @@ -38,3 +42,5 @@ TestHelpers.commonWidgetTests( "draggable", { stop: null } }); + +}); diff --git a/tests/unit/draggable/draggable_core.js b/tests/unit/draggable/draggable_core.js index 81c31e22f1d..81f3188f3ee 100644 --- a/tests/unit/draggable/draggable_core.js +++ b/tests/unit/draggable/draggable_core.js @@ -1,9 +1,12 @@ +define([ + "jquery", + "ui/draggable" +], function( $ ) { + /* * draggable_core.js */ -(function( $ ) { - module( "draggable: core" ); test( "element types", function() { @@ -374,4 +377,4 @@ test( "setting right/bottom css shouldn't cause resize", function() { closeEnough( finalOffset.top, origOffset.top, "element moves the correct horizontal distance" ); }); -})( jQuery ); +}); diff --git a/tests/unit/draggable/draggable_events.js b/tests/unit/draggable/draggable_events.js index dd5c315b0b4..66fa3b7eed6 100644 --- a/tests/unit/draggable/draggable_events.js +++ b/tests/unit/draggable/draggable_events.js @@ -1,7 +1,11 @@ +define([ + "jquery", + "ui/draggable" +], function( $ ) { + /* * draggable_events.js */ -(function( $ ) { var element; @@ -161,4 +165,4 @@ test( "position and offset in hash is consistent between start, drag, and stop", deepEqual( dragOffset, stopOffset, "drag offset equals stop offset" ); }); -})( jQuery ); +}); diff --git a/tests/unit/draggable/draggable_methods.js b/tests/unit/draggable/draggable_methods.js index 351d57764f0..b7182be85c1 100644 --- a/tests/unit/draggable/draggable_methods.js +++ b/tests/unit/draggable/draggable_methods.js @@ -1,7 +1,11 @@ +define([ + "jquery", + "ui/draggable" +], function( $ ) { + /* * draggable_methods.js */ -(function( $ ) { var element; @@ -100,4 +104,4 @@ test( "disable", function() { equal( actual, expected, "disable is chainable" ); }); -})( jQuery ); +}); diff --git a/tests/unit/draggable/draggable_options.js b/tests/unit/draggable/draggable_options.js index e54ae1df46d..fbea78e1fbf 100644 --- a/tests/unit/draggable/draggable_options.js +++ b/tests/unit/draggable/draggable_options.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/draggable" +], function( $ ) { module( "draggable: options" ); @@ -1463,4 +1466,4 @@ test( "iframeFix", function() { }); }); -})( jQuery ); +}); diff --git a/tests/unit/draggable/draggable_test_helpers.js b/tests/unit/draggable/draggable_test_helpers.js index 1b004e7cfab..47786e2a20b 100644 --- a/tests/unit/draggable/draggable_test_helpers.js +++ b/tests/unit/draggable/draggable_test_helpers.js @@ -1,3 +1,8 @@ +define([ + "jquery", + "helper/testsuite" +], function( $, testHelper ) { + TestHelpers.draggable = { // TODO: remove the unreliable offset hacks unreliableOffset: $.ui.ie && ( !document.documentMode || document.documentMode < 8 ) ? 2 : 0, @@ -129,3 +134,5 @@ TestHelpers.draggable = { }); } }; + +}); diff --git a/tests/unit/droppable/droppable.html b/tests/unit/droppable/droppable.html index 03ff888e87b..e48cb89015f 100644 --- a/tests/unit/droppable/droppable.html +++ b/tests/unit/droppable/droppable.html @@ -4,32 +4,12 @@ jQuery UI Droppable Test Suite - - - - - + - - - - - - - - + @@ -42,5 +22,25 @@
 
+ + + + + + + + diff --git a/tests/unit/droppable/droppable_common.js b/tests/unit/droppable/droppable_common.js index c112def3cf4..b65fac44a85 100644 --- a/tests/unit/droppable/droppable_common.js +++ b/tests/unit/droppable/droppable_common.js @@ -1,4 +1,8 @@ -TestHelpers.commonWidgetTests( "droppable", { +define([ + "helper/testsuite" +], function( testHelper ) { + +testHelper.commonWidgetTests( "droppable", { defaults: { accept: "*", activeClass: false, @@ -18,3 +22,5 @@ TestHelpers.commonWidgetTests( "droppable", { over: null } }); + +}); diff --git a/tests/unit/droppable/droppable_core.js b/tests/unit/droppable/droppable_core.js index 53b08fd8565..7ab92409cb6 100644 --- a/tests/unit/droppable/droppable_core.js +++ b/tests/unit/droppable/droppable_core.js @@ -1,9 +1,13 @@ +define([ + "jquery", + "./droppable_test_helpers", + "ui/droppable" +], function( $, droppableTestHelpers ) { + /* * droppable_core.js */ -(function($) { - module("droppable: core"); test("element types", function() { @@ -20,10 +24,10 @@ test("element types", function() { (typeName === "table" && el.append("content")); el.droppable(); - TestHelpers.droppable.shouldDrop(); + droppableTestHelpers.shouldDrop(); el.droppable("destroy"); el.remove(); }); }); -})(jQuery); +}); diff --git a/tests/unit/droppable/droppable_events.js b/tests/unit/droppable/droppable_events.js index 4b8fe5acd2c..811d4dc21b3 100644 --- a/tests/unit/droppable/droppable_events.js +++ b/tests/unit/droppable/droppable_events.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/droppable" +], function( $ ) { module( "droppable: events" ); @@ -60,4 +63,4 @@ test("drop", function() { }); */ -})( jQuery ); +}); diff --git a/tests/unit/droppable/droppable_methods.js b/tests/unit/droppable/droppable_methods.js index a8a2a078c2e..ad15e7003da 100644 --- a/tests/unit/droppable/droppable_methods.js +++ b/tests/unit/droppable/droppable_methods.js @@ -1,7 +1,7 @@ -/* - * droppable_methods.js - */ -(function($) { +define([ + "jquery", + "ui/droppable" +], function( $ ) { module("droppable: methods"); @@ -88,4 +88,4 @@ test( "disable", function() { equal( actual, expected, "disable is chainable" ); }); -})( jQuery ); +}); diff --git a/tests/unit/droppable/droppable_options.js b/tests/unit/droppable/droppable_options.js index 047858abf11..84778d3a60c 100644 --- a/tests/unit/droppable/droppable_options.js +++ b/tests/unit/droppable/droppable_options.js @@ -1,7 +1,11 @@ +define([ + "jquery", + "ui/droppable" +], function( $ ) { + /* * droppable_options.js */ -(function($) { module( "droppable: options" ); @@ -201,4 +205,4 @@ test( "tolerance, touch", function() { ok(false, 'missing test - untested code is broken code'); }); */ -})(jQuery); +}); diff --git a/tests/unit/droppable/droppable_test_helpers.js b/tests/unit/droppable/droppable_test_helpers.js index ffd37452999..627afcf8a89 100644 --- a/tests/unit/droppable/droppable_test_helpers.js +++ b/tests/unit/droppable/droppable_test_helpers.js @@ -1,4 +1,6 @@ -TestHelpers.droppable = { +define(function() { + +return { shouldDrop: function() { // todo: actually implement this ok(true, "missing test - untested code is broken code"); @@ -7,4 +9,6 @@ TestHelpers.droppable = { // todo: actually implement this ok(true, "missing test - untested code is broken code"); } -}; \ No newline at end of file +}; + +}); diff --git a/tests/unit/effects/effects.html b/tests/unit/effects/effects.html index d6cfdb7973b..a07be49ed8b 100644 --- a/tests/unit/effects/effects.html +++ b/tests/unit/effects/effects.html @@ -4,38 +4,12 @@ jQuery UI Effects Test Suite - - - - - + - - - - + #qunit-fixture { width: 1000px; @@ -111,5 +85,21 @@

Slide with relative width

+ + + + + + + + diff --git a/tests/unit/effects/effects_core.js b/tests/unit/effects/effects_core.js index 05db494e6af..881dcac6825 100644 --- a/tests/unit/effects/effects_core.js +++ b/tests/unit/effects/effects_core.js @@ -1,4 +1,7 @@ -(function($) { +define([ + "jquery", + "ui/effect" +], function( $ ) { function present( value, array, message ) { QUnit.push( jQuery.inArray( value, array ) !== -1 , value, array, message ); @@ -268,4 +271,4 @@ $.each( $.effects.effect, function( effect ) { }); }); -})(jQuery); +}); diff --git a/tests/unit/effects/effects_scale.js b/tests/unit/effects/effects_scale.js index 6abbcb5382f..c30f043847a 100644 --- a/tests/unit/effects/effects_scale.js +++ b/tests/unit/effects/effects_scale.js @@ -1,4 +1,8 @@ -(function( $ ) { +define([ + "jquery", + "ui/effect-scale" +], function( $ ) { + module( "effect.scale: Scale" ); function run( position, v, h, vo, ho ) { @@ -65,4 +69,4 @@ $(function() { } }); -})( jQuery ); +}); diff --git a/tests/unit/helper/require.js b/tests/unit/helper/require.js index 5c3c007a02f..c299db81a88 100644 --- a/tests/unit/helper/require.js +++ b/tests/unit/helper/require.js @@ -1,5 +1,5 @@ -// Common require.configs. +// Common require.config. require.config({ paths: { "helper": "../helper", diff --git a/tests/unit/helper/testsuite.js b/tests/unit/helper/testsuite.js index 0f33b0d515a..b549c8b958f 100644 --- a/tests/unit/helper/testsuite.js +++ b/tests/unit/helper/testsuite.js @@ -200,6 +200,18 @@ exports.domEqual = function( selector, modifier, message ) { } }; +exports.onFocus = function( element, onFocus ) { + var fn = function( event ){ + if( !event.originalEvent ) { + return; + } + element.unbind( "focus", fn ); + onFocus(); + }; + + element.bind( "focus", fn )[ 0 ].focus(); +}; + exports.testJshint = function( module ) { // Function.prototype.bind check is needed because JSHint doesn't work in ES3 browsers anymore // https://github.com/jshint/jshint/issues/1384 diff --git a/tests/unit/menu/menu.html b/tests/unit/menu/menu.html index 2aa286c69fb..93311fd8909 100644 --- a/tests/unit/menu/menu.html +++ b/tests/unit/menu/menu.html @@ -4,30 +4,12 @@ jQuery UI Menu Test Suite - - - - - + - - - - - - - - + .ui-menu { font-size: 15px; @@ -316,5 +298,25 @@ + + + + + + + + diff --git a/tests/unit/menu/menu_common.js b/tests/unit/menu/menu_common.js index 099dd091e03..ace6a7231e4 100644 --- a/tests/unit/menu/menu_common.js +++ b/tests/unit/menu/menu_common.js @@ -1,4 +1,8 @@ -TestHelpers.commonWidgetTests( "menu", { +define([ + "helper/testsuite" +], function( testHelper ) { + +testHelper.commonWidgetTests( "menu", { defaults: { disabled: false, icons: { @@ -19,3 +23,5 @@ TestHelpers.commonWidgetTests( "menu", { select: null } }); + +}); diff --git a/tests/unit/menu/menu_core.js b/tests/unit/menu/menu_core.js index df039c9e49d..b7d33d1d81d 100644 --- a/tests/unit/menu/menu_core.js +++ b/tests/unit/menu/menu_core.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/menu" +], function( $ ) { module( "menu: core" ); @@ -58,4 +61,4 @@ asyncTest( "#9532: Need a way in Menu to keep ui-state-active class on selected }, 500 ); }); -})( jQuery ); +}); diff --git a/tests/unit/menu/menu_events.js b/tests/unit/menu/menu_events.js index 0a02cc01b5f..8384af0fa39 100644 --- a/tests/unit/menu/menu_events.js +++ b/tests/unit/menu/menu_events.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/menu" +], function( $ ) { var log = TestHelpers.menu.log, logOutput = TestHelpers.menu.logOutput, @@ -661,4 +664,4 @@ asyncTest( "#10571: When typing in a menu, only menu-items should be focused", f }); }); -})( jQuery ); +}); diff --git a/tests/unit/menu/menu_methods.js b/tests/unit/menu/menu_methods.js index 5a633998d82..4c945fbcaa0 100644 --- a/tests/unit/menu/menu_methods.js +++ b/tests/unit/menu/menu_methods.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/menu" +], function( $ ) { var log = TestHelpers.menu.log, logOutput = TestHelpers.menu.logOutput, @@ -114,4 +117,4 @@ test( "widget", function() { // TODO: test select method -})( jQuery ); +}); diff --git a/tests/unit/menu/menu_options.js b/tests/unit/menu/menu_options.js index c7667334583..3236eb94c98 100644 --- a/tests/unit/menu/menu_options.js +++ b/tests/unit/menu/menu_options.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/menu" +], function( $ ) { var log = TestHelpers.menu.log, logOutput = TestHelpers.menu.logOutput, @@ -106,4 +109,4 @@ test( "{ role: null }", function() { }); }); -})( jQuery ); +}); diff --git a/tests/unit/menu/menu_test_helpers.js b/tests/unit/menu/menu_test_helpers.js index 77737c39045..1841dd086d2 100644 --- a/tests/unit/menu/menu_test_helpers.js +++ b/tests/unit/menu/menu_test_helpers.js @@ -1,9 +1,9 @@ -(function() { +define(function() { var lastItem, log = []; -TestHelpers.menu = { +return { log: function( message, clear ) { if ( clear ) { log.length = 0; @@ -28,4 +28,4 @@ TestHelpers.menu = { } }; -})(); +}); diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html index 0cad7d322a7..cbf8359e401 100644 --- a/tests/unit/position/position.html +++ b/tests/unit/position/position.html @@ -4,20 +4,12 @@ jQuery UI Position Test Suite - - - - - + - - - +
@@ -49,5 +41,19 @@ + + + + + + + diff --git a/tests/unit/position/position_core.js b/tests/unit/position/position_core.js index 5b1872af983..3fdf2e2508c 100644 --- a/tests/unit/position/position_core.js +++ b/tests/unit/position/position_core.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/position" +], function( $ ) { var win = $( window ), scrollTopSupport = function() { @@ -726,4 +729,4 @@ test( "bug #5280: consistent results (avoid fractional values)", function() { deepEqual( offset1, offset2 ); }); -}( jQuery ) ); +}(; diff --git a/tests/unit/progressbar/progressbar.html b/tests/unit/progressbar/progressbar.html index 56a02bcd4d6..f7330473f27 100644 --- a/tests/unit/progressbar/progressbar.html +++ b/tests/unit/progressbar/progressbar.html @@ -4,29 +4,12 @@ jQuery UI Progressbar Test Suite - - - - - + - - - - - - - + @@ -36,5 +19,24 @@
+ + + + + + + + diff --git a/tests/unit/progressbar/progressbar_common.js b/tests/unit/progressbar/progressbar_common.js index 0768576f568..a40ae3e3995 100644 --- a/tests/unit/progressbar/progressbar_common.js +++ b/tests/unit/progressbar/progressbar_common.js @@ -1,4 +1,8 @@ -TestHelpers.commonWidgetTests( "progressbar", { +define([ + "helper/testsuite" +], function( testHelper ) { + +testHelper.commonWidgetTests( "progressbar", { defaults: { disabled: false, max: 100, @@ -10,3 +14,5 @@ TestHelpers.commonWidgetTests( "progressbar", { create: null } }); + +}); diff --git a/tests/unit/progressbar/progressbar_core.js b/tests/unit/progressbar/progressbar_core.js index 8f4a138ce9c..4ce80d8a6ef 100644 --- a/tests/unit/progressbar/progressbar_core.js +++ b/tests/unit/progressbar/progressbar_core.js @@ -1,3 +1,8 @@ +define([ + "jquery", + "ui/progressbar" +], function( $ ) { + module( "progressbar: core" ); test( "markup structure", function() { @@ -51,3 +56,5 @@ test( "accessibility", function() { equal( element.attr( "aria-valuemax" ), 150, "aria-valuemax" ); strictEqual( element.attr( "aria-valuenow" ), undefined, "aria-valuenow" ); }); + +}); diff --git a/tests/unit/progressbar/progressbar_events.js b/tests/unit/progressbar/progressbar_events.js index 95effda7511..4552fc3fb9a 100644 --- a/tests/unit/progressbar/progressbar_events.js +++ b/tests/unit/progressbar/progressbar_events.js @@ -1,3 +1,8 @@ +define([ + "jquery", + "ui/progressbar" +], function( $ ) { + module( "progressbar: events" ); test( "create", function() { @@ -49,3 +54,5 @@ test( "complete", function() { value = 100; element.progressbar( "value", value ); }); + +}); diff --git a/tests/unit/progressbar/progressbar_methods.js b/tests/unit/progressbar/progressbar_methods.js index 004eacf90d2..1727ca58095 100644 --- a/tests/unit/progressbar/progressbar_methods.js +++ b/tests/unit/progressbar/progressbar_methods.js @@ -1,3 +1,8 @@ +define([ + "jquery", + "ui/progressbar" +], function( $ ) { + module( "progressbar: methods" ); test( "destroy", function() { @@ -33,3 +38,5 @@ test( "widget", function() { equal( widgetElement.length, 1, "one element" ); strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" ); }); + +}); diff --git a/tests/unit/progressbar/progressbar_options.js b/tests/unit/progressbar/progressbar_options.js index bc0b5d00d62..f97865b1603 100644 --- a/tests/unit/progressbar/progressbar_options.js +++ b/tests/unit/progressbar/progressbar_options.js @@ -1,3 +1,8 @@ +define([ + "jquery", + "ui/progressbar" +], function( $ ) { + module( "progressbar: options" ); test( "{ value: 0 }, default", function() { @@ -70,3 +75,5 @@ test( "change max below value", function() { equal( $( "#progressbar" ).progressbar( "value" ), 5, "value constrained at max" ); }); + +}); diff --git a/tests/unit/resizable/resizable.html b/tests/unit/resizable/resizable.html index 5668c909a22..e571c53588f 100644 --- a/tests/unit/resizable/resizable.html +++ b/tests/unit/resizable/resizable.html @@ -4,31 +4,12 @@ jQuery UI Resizable Test Suite - - - - - + - - - - - - - - + #container { @@ -79,5 +60,25 @@ solid gray + + + + + + + + diff --git a/tests/unit/resizable/resizable_common.js b/tests/unit/resizable/resizable_common.js index c261ac5b9c8..b228b7d7cee 100644 --- a/tests/unit/resizable/resizable_common.js +++ b/tests/unit/resizable/resizable_common.js @@ -1,4 +1,8 @@ -TestHelpers.commonWidgetTests( "resizable", { +define([ + "helper/testsuite" +], function( testHelper ) { + +testHelper.commonWidgetTests( "resizable", { defaults: { alsoResize: false, animate: false, @@ -28,3 +32,5 @@ TestHelpers.commonWidgetTests( "resizable", { stop: null } }); + +}); diff --git a/tests/unit/resizable/resizable_core.js b/tests/unit/resizable/resizable_core.js index f43cde6237c..0737500e0e2 100644 --- a/tests/unit/resizable/resizable_core.js +++ b/tests/unit/resizable/resizable_core.js @@ -1,9 +1,12 @@ +define([ + "jquery", + "ui/resizable" +], function( $ ) { + /* * resizable_core.js */ -(function($) { - module("resizable: core"); /* @@ -241,4 +244,4 @@ test( "nested resizable", function() { outer.remove(); }); -})(jQuery); +}); diff --git a/tests/unit/resizable/resizable_events.js b/tests/unit/resizable/resizable_events.js index d3851f72ed6..4241c0b214c 100644 --- a/tests/unit/resizable/resizable_events.js +++ b/tests/unit/resizable/resizable_events.js @@ -1,7 +1,11 @@ +define([ + "jquery", + "ui/resizable" +], function( $ ) { + /* * resizable_events.js */ -(function($) { module("resizable: events"); @@ -238,4 +242,4 @@ test( "resize (containment) works with parent with negative offset", function() }); -})(jQuery); +}); diff --git a/tests/unit/resizable/resizable_methods.js b/tests/unit/resizable/resizable_methods.js index abb8951f930..a5a92d56081 100644 --- a/tests/unit/resizable/resizable_methods.js +++ b/tests/unit/resizable/resizable_methods.js @@ -1,7 +1,11 @@ +define([ + "jquery", + "ui/resizable" +], function( $ ) { + /* * resizable_methods.js */ -(function($) { module( "resizable: methods" ); @@ -18,4 +22,4 @@ test( "disable", function() { equal( chainable, element, "disable is chainable" ); }); -})(jQuery); +}); diff --git a/tests/unit/resizable/resizable_options.js b/tests/unit/resizable/resizable_options.js index c46801bc54d..ed746eefd7d 100644 --- a/tests/unit/resizable/resizable_options.js +++ b/tests/unit/resizable/resizable_options.js @@ -1,7 +1,11 @@ +define([ + "jquery", + "ui/resizable" +], function( $ ) { + /* * resizable_options.js */ -(function($) { module("resizable: options"); @@ -404,4 +408,4 @@ test( "alsoResize + containment", function() { equal( other.height(), 150, "alsoResize constrained height at containment edge" ); }); -})(jQuery); +}); diff --git a/tests/unit/resizable/resizable_test_helpers.js b/tests/unit/resizable/resizable_test_helpers.js index 7ab5aa1a545..ac3ed140569 100644 --- a/tests/unit/resizable/resizable_test_helpers.js +++ b/tests/unit/resizable/resizable_test_helpers.js @@ -1,4 +1,8 @@ -TestHelpers.resizable = { +define([ + "helper/testsuite" +], function( testHelper ) { + +testHelper.resizable = { drag: function( el, dx, dy ) { // this mouseover is to work around a limitation in resizable // TODO: fix resizable so handle doesn't require mouseover in order to be used @@ -8,4 +12,6 @@ TestHelpers.resizable = { dy: dy }); } -}; \ No newline at end of file +}; + +}); diff --git a/tests/unit/selectable/selectable.html b/tests/unit/selectable/selectable.html index cc4edf90969..7555e8c3f51 100644 --- a/tests/unit/selectable/selectable.html +++ b/tests/unit/selectable/selectable.html @@ -4,30 +4,12 @@ jQuery UI Selectable Test Suite - - - - - + - - - - - - - + @@ -43,5 +25,24 @@ + + + + + + + + diff --git a/tests/unit/selectable/selectable_common.js b/tests/unit/selectable/selectable_common.js index d00a47be593..f6fd12cc311 100644 --- a/tests/unit/selectable/selectable_common.js +++ b/tests/unit/selectable/selectable_common.js @@ -1,4 +1,8 @@ -TestHelpers.commonWidgetTests("selectable", { +define([ + "helper/testsuite" +], function( testHelper ) { + +testHelper.commonWidgetTests("selectable", { defaults: { appendTo: "body", autoRefresh: true, @@ -19,3 +23,5 @@ TestHelpers.commonWidgetTests("selectable", { unselecting: null } }); + +}); diff --git a/tests/unit/selectable/selectable_events.js b/tests/unit/selectable/selectable_events.js index 2cb99f49c12..a4b8340a3e1 100644 --- a/tests/unit/selectable/selectable_events.js +++ b/tests/unit/selectable/selectable_events.js @@ -1,7 +1,11 @@ +define([ + "jquery", + "ui/selectable" +], function( $ ) { + /* * selectable_events.js */ -(function( $ ) { module("selectable: events"); @@ -62,4 +66,4 @@ test( "mousedown: initial position of helper", function() { $( window ).scrollTop( 0 ).scrollLeft( 0 ); }); -})( jQuery ); +}); diff --git a/tests/unit/selectable/selectable_methods.js b/tests/unit/selectable/selectable_methods.js index 179d4ecd6b6..4f4da1809b7 100644 --- a/tests/unit/selectable/selectable_methods.js +++ b/tests/unit/selectable/selectable_methods.js @@ -1,7 +1,11 @@ +define([ + "jquery", + "ui/selectable" +], function( $ ) { + /* * selectable_methods.js */ -(function($) { module("selectable: methods"); @@ -107,4 +111,4 @@ test( "disable", function() { equal( chainable, element, "disable is chainable" ); }); -})(jQuery); +}); diff --git a/tests/unit/selectable/selectable_options.js b/tests/unit/selectable/selectable_options.js index 973247f5695..708d6b53684 100644 --- a/tests/unit/selectable/selectable_options.js +++ b/tests/unit/selectable/selectable_options.js @@ -1,7 +1,11 @@ +define([ + "jquery", + "ui/selectable" +], function( $ ) { + /* * selectable_options.js */ -(function($) { module("selectable: options"); @@ -62,4 +66,4 @@ test("filter", function() { el.selectable("destroy"); }); -})(jQuery); +}); diff --git a/tests/unit/selectmenu/selectmenu.html b/tests/unit/selectmenu/selectmenu.html index 618eea3d00a..99c9acd7d38 100644 --- a/tests/unit/selectmenu/selectmenu.html +++ b/tests/unit/selectmenu/selectmenu.html @@ -4,31 +4,12 @@ jQuery UI Selectmenu Test Suite - - - - - + - - - - - - - + @@ -83,5 +64,24 @@ + + + + + + + + diff --git a/tests/unit/selectmenu/selectmenu_common.js b/tests/unit/selectmenu/selectmenu_common.js index 10073fe97be..edf1236b24e 100644 --- a/tests/unit/selectmenu/selectmenu_common.js +++ b/tests/unit/selectmenu/selectmenu_common.js @@ -1,4 +1,8 @@ -TestHelpers.commonWidgetTests( "selectmenu", { +define([ + "helper/testsuite" +], function( testHelper ) { + +testHelper.commonWidgetTests( "selectmenu", { defaults: { appendTo: null, disabled: null, @@ -21,3 +25,5 @@ TestHelpers.commonWidgetTests( "selectmenu", { select: null } }); + +}); diff --git a/tests/unit/selectmenu/selectmenu_core.js b/tests/unit/selectmenu/selectmenu_core.js index e9312d12fc1..41c30b2dd52 100644 --- a/tests/unit/selectmenu/selectmenu_core.js +++ b/tests/unit/selectmenu/selectmenu_core.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/selectmenu" +], function( $ ) { module( "selectmenu: core" ); @@ -271,4 +274,4 @@ $.each([ }); }); -})( jQuery ); +}); diff --git a/tests/unit/selectmenu/selectmenu_events.js b/tests/unit/selectmenu/selectmenu_events.js index 3ab6e93bc68..0797fcac4ee 100644 --- a/tests/unit/selectmenu/selectmenu_events.js +++ b/tests/unit/selectmenu/selectmenu_events.js @@ -1,4 +1,7 @@ -(function ( $ ) { +define([ + "jquery", + "ui/selectmenu" +], function( $ ) { module( "selectmenu: events", { setup: function() { @@ -130,4 +133,4 @@ asyncTest( "select", function() { }); }); -})( jQuery ); +}); diff --git a/tests/unit/selectmenu/selectmenu_methods.js b/tests/unit/selectmenu/selectmenu_methods.js index ca1b8c6a34c..1742b0ec453 100644 --- a/tests/unit/selectmenu/selectmenu_methods.js +++ b/tests/unit/selectmenu/selectmenu_methods.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/selectmenu" +], function( $ ) { module( "selectmenu: methods" ); @@ -168,4 +171,4 @@ test( "widget and menuWidget", function() { ok( menu.is( "ul.ui-menu" ), "Menu Widget: element and class" ); }); -})( jQuery ); +}); diff --git a/tests/unit/selectmenu/selectmenu_options.js b/tests/unit/selectmenu/selectmenu_options.js index ce66e822b17..4b663cc3c25 100644 --- a/tests/unit/selectmenu/selectmenu_options.js +++ b/tests/unit/selectmenu/selectmenu_options.js @@ -1,4 +1,7 @@ -(function ( $ ) { +define([ + "jquery", + "ui/selectmenu" +], function( $ ) { module( "selectmenu: options" ); @@ -122,4 +125,4 @@ test( "width", function() { equal( button.outerWidth(), 300, "button width fills container" ); }); -})( jQuery ); +}); diff --git a/tests/unit/slider/slider.html b/tests/unit/slider/slider.html index 0142b5e6bdd..24335d15c04 100644 --- a/tests/unit/slider/slider.html +++ b/tests/unit/slider/slider.html @@ -4,30 +4,12 @@ jQuery UI Slider Test Suite - - - - - + - - - - - - - + @@ -40,5 +22,24 @@ + + + + + + + + diff --git a/tests/unit/slider/slider_common.js b/tests/unit/slider/slider_common.js index 6d7278de6a2..4b68b574ce1 100644 --- a/tests/unit/slider/slider_common.js +++ b/tests/unit/slider/slider_common.js @@ -1,4 +1,8 @@ -TestHelpers.commonWidgetTests( "slider", { +define([ + "helper/testsuite" +], function( testHelper ) { + +testHelper.commonWidgetTests( "slider", { defaults: { animate: false, cancel: "input,textarea,button,select,option", @@ -21,3 +25,5 @@ TestHelpers.commonWidgetTests( "slider", { stop: null } }); + +}); diff --git a/tests/unit/slider/slider_core.js b/tests/unit/slider/slider_core.js index 3649bded038..28adb31c388 100644 --- a/tests/unit/slider/slider_core.js +++ b/tests/unit/slider/slider_core.js @@ -1,4 +1,8 @@ -(function( $ ) { +define([ + "jquery", + "ui/slider" +], function( $ ) { + // // Slider Test Helper Functions // @@ -294,4 +298,4 @@ test( "keydown LEFT on handle decreases value by step, not less than min", funct element.slider( "destroy" ); }); -})( jQuery ); +}); diff --git a/tests/unit/slider/slider_events.js b/tests/unit/slider/slider_events.js index ec93a056536..a8b9eb74409 100644 --- a/tests/unit/slider/slider_events.js +++ b/tests/unit/slider/slider_events.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/slider" +], function( $ ) { module( "slider: events" ); @@ -149,4 +152,4 @@ test( "mouse based interaction part two: when handles overlap", function() { }); -})( jQuery ); +}); diff --git a/tests/unit/slider/slider_methods.js b/tests/unit/slider/slider_methods.js index c5c7e1254aa..5b95aca16b5 100644 --- a/tests/unit/slider/slider_methods.js +++ b/tests/unit/slider/slider_methods.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/slider" +], function( $ ) { module( "slider: methods" ); @@ -94,4 +97,4 @@ test( "value", function() { // ok(false, "missing test - untested code is broken code." ); //}); -})( jQuery ); +}); diff --git a/tests/unit/slider/slider_options.js b/tests/unit/slider/slider_options.js index 587f847cfa3..c6331b869fc 100644 --- a/tests/unit/slider/slider_options.js +++ b/tests/unit/slider/slider_options.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/slider" +], function( $ ) { var element, options; @@ -316,4 +319,4 @@ test( "range", function() { element.slider( "destroy" ); }); -})( jQuery ); +}); diff --git a/tests/unit/sortable/sortable.html b/tests/unit/sortable/sortable.html index 3edc999b76e..88017c9a2bf 100644 --- a/tests/unit/sortable/sortable.html +++ b/tests/unit/sortable/sortable.html @@ -4,32 +4,12 @@ jQuery UI Sortable Test Suite - - - - - + - - - - - - - - + #sortable, #sortable2 { position:relative; @@ -100,5 +80,25 @@ + + + + + + + + diff --git a/tests/unit/sortable/sortable_common.js b/tests/unit/sortable/sortable_common.js index 86850a658c3..dad1832fc0c 100644 --- a/tests/unit/sortable/sortable_common.js +++ b/tests/unit/sortable/sortable_common.js @@ -1,4 +1,8 @@ -TestHelpers.commonWidgetTests( "sortable", { +define([ + "helper/testsuite" +], function( testHelper ) { + +testHelper.commonWidgetTests( "sortable", { defaults: { appendTo: "parent", axis: false, @@ -43,3 +47,5 @@ TestHelpers.commonWidgetTests( "sortable", { update: null } }); + +}); diff --git a/tests/unit/sortable/sortable_core.js b/tests/unit/sortable/sortable_core.js index 54069a9bfbd..6a8b1362bd5 100644 --- a/tests/unit/sortable/sortable_core.js +++ b/tests/unit/sortable/sortable_core.js @@ -1,7 +1,11 @@ +define([ + "jquery", + "ui/sortable" +], function( $ ) { + /* * sortable_core.js */ - (function( $ ) { module( "sortable: core" ); @@ -37,4 +41,4 @@ test( "ui-sortable-handle applied to appropriate element", function() { equal( el.find( ".ui-sortable-handle" ).length, 0, "class name removed on destroy" ); }); -})( jQuery ); +}); diff --git a/tests/unit/sortable/sortable_events.js b/tests/unit/sortable/sortable_events.js index 1bf72cc6a8c..0a08b59199d 100644 --- a/tests/unit/sortable/sortable_events.js +++ b/tests/unit/sortable/sortable_events.js @@ -1,7 +1,11 @@ +define([ + "jquery", + "ui/sortable" +], function( $ ) { + /* * sortable_events.js */ -(function($) { module("sortable: events"); @@ -375,4 +379,4 @@ test("deactivate", function() { }); */ -})(jQuery); +}); diff --git a/tests/unit/sortable/sortable_methods.js b/tests/unit/sortable/sortable_methods.js index f3fe240e701..b42fbd528c3 100644 --- a/tests/unit/sortable/sortable_methods.js +++ b/tests/unit/sortable/sortable_methods.js @@ -1,7 +1,11 @@ +define([ + "jquery", + "ui/sortable" +], function( $ ) { + /* * sortable_methods.js */ -(function($) { module("sortable: methods"); @@ -90,4 +94,4 @@ test( "disable", function() { equal( chainable, element, "disable is chainable" ); }); -})(jQuery); +}); diff --git a/tests/unit/sortable/sortable_options.js b/tests/unit/sortable/sortable_options.js index f2beb4dbcd6..4ec068d8687 100644 --- a/tests/unit/sortable/sortable_options.js +++ b/tests/unit/sortable/sortable_options.js @@ -1,7 +1,11 @@ +define([ + "jquery", + "ui/sortable" +], function( $ ) { + /* * sortable_options.js */ -(function($) { module("sortable: options"); @@ -457,4 +461,4 @@ test("{ zIndex: false }", function() { ok(false, "missing test - untested code is broken code."); }); */ -})(jQuery); +}); diff --git a/tests/unit/sortable/sortable_test_helpers.js b/tests/unit/sortable/sortable_test_helpers.js index 12e4829ea2c..6cd9e0da7f2 100644 --- a/tests/unit/sortable/sortable_test_helpers.js +++ b/tests/unit/sortable/sortable_test_helpers.js @@ -1,4 +1,8 @@ -TestHelpers.sortable = { +define([ + "helper/testsuite" +], function( testHelper ) { + +testHelper.sortable = { sort: function( handle, dx, dy, index, msg ) { $( handle ).simulate( "drag", { dx: dx, @@ -6,4 +10,6 @@ TestHelpers.sortable = { }); equal( $( handle ).parent().children().index( handle ), index, msg ); } -}; \ No newline at end of file +}; + +}); diff --git a/tests/unit/spinner/spinner.html b/tests/unit/spinner/spinner.html index 58988d74235..dc73625095b 100644 --- a/tests/unit/spinner/spinner.html +++ b/tests/unit/spinner/spinner.html @@ -4,33 +4,12 @@ jQuery UI Spinner Test Suite - - - - - - - + - - - - - - - - + @@ -41,5 +20,27 @@ + + + + + + + + + + diff --git a/tests/unit/spinner/spinner_common.js b/tests/unit/spinner/spinner_common.js index b494e3ca34d..8c078247fa9 100644 --- a/tests/unit/spinner/spinner_common.js +++ b/tests/unit/spinner/spinner_common.js @@ -1,4 +1,8 @@ -TestHelpers.commonWidgetTests( "spinner", { +define([ + "helper/testsuite" +], function( testHelper ) { + +testHelper.commonWidgetTests( "spinner", { defaults: { culture: null, disabled: false, @@ -21,3 +25,5 @@ TestHelpers.commonWidgetTests( "spinner", { stop: null } }); + +}); diff --git a/tests/unit/spinner/spinner_core.js b/tests/unit/spinner/spinner_core.js index 03088fecdca..a0c4794990b 100644 --- a/tests/unit/spinner/spinner_core.js +++ b/tests/unit/spinner/spinner_core.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/spinner" +], function( $ ) { var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp; @@ -235,4 +238,4 @@ test( "precision", function() { equal( element.val(), "0.05", "precision from min" ); }); -})( jQuery ); +}); diff --git a/tests/unit/spinner/spinner_events.js b/tests/unit/spinner/spinner_events.js index 007d34cf770..84a666feea6 100644 --- a/tests/unit/spinner/spinner_events.js +++ b/tests/unit/spinner/spinner_events.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/spinner" +], function( $ ) { var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp; @@ -256,4 +259,4 @@ asyncTest( "change", function() { setTimeout( step1 ); }); -})( jQuery ); +}); diff --git a/tests/unit/spinner/spinner_methods.js b/tests/unit/spinner/spinner_methods.js index cc4bc5a16ca..d916dabd5c7 100644 --- a/tests/unit/spinner/spinner_methods.js +++ b/tests/unit/spinner/spinner_methods.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/spinner" +], function( $ ) { var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp; @@ -205,4 +208,4 @@ test( "widget", function() { strictEqual( widgetElement[ 0 ], element.parent()[ 0 ], "parent element" ); }); -})( jQuery ); +}); diff --git a/tests/unit/spinner/spinner_options.js b/tests/unit/spinner/spinner_options.js index 6f3650f923a..08a40e5f6c6 100644 --- a/tests/unit/spinner/spinner_options.js +++ b/tests/unit/spinner/spinner_options.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/spinner" +], function( $ ) { module( "spinner: options" ); @@ -259,4 +262,4 @@ test( "step, string", function() { equal( element.val(), "$0.70", "stepUp" ); }); -})( jQuery ); +}); diff --git a/tests/unit/spinner/spinner_test_helpers.js b/tests/unit/spinner/spinner_test_helpers.js index 2021e8f7ae9..dcaa5b1c5f1 100644 --- a/tests/unit/spinner/spinner_test_helpers.js +++ b/tests/unit/spinner/spinner_test_helpers.js @@ -1,4 +1,9 @@ -TestHelpers.spinner = { +define([ + "jquery", + "jquery.simulate" +], function( $ ) { + +return { simulateKeyDownUp: function( element, keyCode, shift ) { element .simulate( "keydown", { keyCode: keyCode, shiftKey: shift || false } ) @@ -6,3 +11,4 @@ TestHelpers.spinner = { } }; +}); diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html index 778639eb347..1397e10be0c 100644 --- a/tests/unit/tabs/tabs.html +++ b/tests/unit/tabs/tabs.html @@ -4,30 +4,12 @@ jQuery UI Tabs Test Suite - - - - - + - - - - - - - - + #tabs8, #tabs8 * { margin: 0; @@ -147,5 +129,25 @@ + + + + + + + + diff --git a/tests/unit/tabs/tabs_common.js b/tests/unit/tabs/tabs_common.js index a589515f806..3dcb5b515fe 100644 --- a/tests/unit/tabs/tabs_common.js +++ b/tests/unit/tabs/tabs_common.js @@ -1,4 +1,8 @@ -TestHelpers.commonWidgetTests( "tabs", { +define([ + "helper/testsuite" +], function( testHelper ) { + +testHelper.commonWidgetTests( "tabs", { defaults: { active: null, collapsible: false, @@ -16,3 +20,5 @@ TestHelpers.commonWidgetTests( "tabs", { load: null } }); + +}); diff --git a/tests/unit/tabs/tabs_core.js b/tests/unit/tabs/tabs_core.js index 2e094e11b0a..6382a5be0c8 100644 --- a/tests/unit/tabs/tabs_core.js +++ b/tests/unit/tabs/tabs_core.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/tabs" +], function( $ ) { var state = TestHelpers.tabs.state; @@ -612,4 +615,4 @@ test( "#4033 - IE expands hash to full url and misinterprets tab as ajax", funct state( element, 1 ); }); -}( jQuery ) ); +}(; diff --git a/tests/unit/tabs/tabs_events.js b/tests/unit/tabs/tabs_events.js index f9b1755f778..b7d7b715ec2 100644 --- a/tests/unit/tabs/tabs_events.js +++ b/tests/unit/tabs/tabs_events.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/tabs" +], function( $ ) { var state = TestHelpers.tabs.state; @@ -315,4 +318,4 @@ asyncTest( "load", function() { } }); -}( jQuery ) ); +}(; diff --git a/tests/unit/tabs/tabs_methods.js b/tests/unit/tabs/tabs_methods.js index a3d663f272d..5812b52233d 100644 --- a/tests/unit/tabs/tabs_methods.js +++ b/tests/unit/tabs/tabs_methods.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/tabs" +], function( $ ) { var disabled = TestHelpers.tabs.disabled, state = TestHelpers.tabs.state; @@ -267,4 +270,4 @@ test( "widget", function() { strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" ); }); -}( jQuery ) ); +}(; diff --git a/tests/unit/tabs/tabs_options.js b/tests/unit/tabs/tabs_options.js index a9632481e8f..fbe8d1fc953 100644 --- a/tests/unit/tabs/tabs_options.js +++ b/tests/unit/tabs/tabs_options.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/tabs" +], function( $ ) { var disabled = TestHelpers.tabs.disabled, equalHeight = TestHelpers.tabs.equalHeight, @@ -363,4 +366,4 @@ asyncTest( "hide and show - animation", function() { }); -}( jQuery ) ); +}(; diff --git a/tests/unit/tabs/tabs_test_helpers.js b/tests/unit/tabs/tabs_test_helpers.js index 0c930918615..9ccc12b5ec2 100644 --- a/tests/unit/tabs/tabs_test_helpers.js +++ b/tests/unit/tabs/tabs_test_helpers.js @@ -1,4 +1,6 @@ -TestHelpers.tabs = { +define(function() { + +return { disabled: function( tabs, state ) { var expected, actual, internalState = tabs.tabs( "option", "disabled" ); @@ -65,3 +67,4 @@ TestHelpers.tabs = { } }; +}); diff --git a/tests/unit/testsuite.js b/tests/unit/testsuite.js index e8d62428299..f273a803924 100644 --- a/tests/unit/testsuite.js +++ b/tests/unit/testsuite.js @@ -44,18 +44,6 @@ QUnit.config.urlConfig.push({ tooltip: "Which jQuery Core version to test against" }); -TestHelpers.onFocus = function( element, onFocus ) { - var fn = function( event ){ - if( !event.originalEvent ) { - return; - } - element.unbind( "focus", fn ); - onFocus(); - }; - - element.bind( "focus", fn )[ 0 ].focus(); -}; - TestHelpers.forceScrollableWindow = function( appendTo ) { // The main testable area is 10000x10000 so to enforce scrolling, diff --git a/tests/unit/tooltip/tooltip.html b/tests/unit/tooltip/tooltip.html index 18bd88c2c98..936453ac06f 100644 --- a/tests/unit/tooltip/tooltip.html +++ b/tests/unit/tooltip/tooltip.html @@ -4,30 +4,12 @@ jQuery UI Tooltip Test Suite - - - - - + - - - - - - - + @@ -47,5 +29,24 @@ + + + + + + + + diff --git a/tests/unit/tooltip/tooltip_common.js b/tests/unit/tooltip/tooltip_common.js index 2d6ea91eccd..39e8672b3d7 100644 --- a/tests/unit/tooltip/tooltip_common.js +++ b/tests/unit/tooltip/tooltip_common.js @@ -1,4 +1,8 @@ -TestHelpers.commonWidgetTests( "tooltip", { +define([ + "helper/testsuite" +], function( testHelper ) { + +testHelper.commonWidgetTests( "tooltip", { defaults: { content: function() {}, disabled: false, @@ -19,3 +23,5 @@ TestHelpers.commonWidgetTests( "tooltip", { open: null } }); + +}); diff --git a/tests/unit/tooltip/tooltip_core.js b/tests/unit/tooltip/tooltip_core.js index 760ffeed2eb..342f5ff42a8 100644 --- a/tests/unit/tooltip/tooltip_core.js +++ b/tests/unit/tooltip/tooltip_core.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/tooltip" +], function( $ ) { module( "tooltip: core" ); @@ -174,4 +177,4 @@ asyncTest( "destroy during hide animation; only one close event", function() { }); }); -}( jQuery ) ); +}(; diff --git a/tests/unit/tooltip/tooltip_events.js b/tests/unit/tooltip/tooltip_events.js index de16471aedf..0a45453d46a 100644 --- a/tests/unit/tooltip/tooltip_events.js +++ b/tests/unit/tooltip/tooltip_events.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/tooltip" +], function( $ ) { module( "tooltip: events" ); @@ -54,4 +57,4 @@ test( "focus events", function() { element.trigger( "focusout" ); }); -}( jQuery ) ); +}(; diff --git a/tests/unit/tooltip/tooltip_methods.js b/tests/unit/tooltip/tooltip_methods.js index 8d1b1bd5b7d..10184071385 100644 --- a/tests/unit/tooltip/tooltip_methods.js +++ b/tests/unit/tooltip/tooltip_methods.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/tooltip" +], function( $ ) { module( "tooltip: methods" ); @@ -137,4 +140,4 @@ test( "preserve changes to title attributes on close and destroy", function() { } ); }); -}( jQuery ) ); +}(; diff --git a/tests/unit/tooltip/tooltip_options.js b/tests/unit/tooltip/tooltip_options.js index 17f0a423775..fd33dd7ca12 100644 --- a/tests/unit/tooltip/tooltip_options.js +++ b/tests/unit/tooltip/tooltip_options.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/tooltip" +], function( $ ) { module( "tooltip: options" ); @@ -171,4 +174,4 @@ test( "track and programmatic focus", function() { equal( "inputtitle", $( ".ui-tooltip" ).text() ); }); -}( jQuery ) ); +}(; diff --git a/tests/unit/widget/widget.html b/tests/unit/widget/widget.html index 2b764abab9e..1b3572179ad 100644 --- a/tests/unit/widget/widget.html +++ b/tests/unit/widget/widget.html @@ -4,25 +4,12 @@ jQuery UI Widget Test Suite - - - - - + - - - - - + @@ -36,5 +23,22 @@ + + + + + + + + diff --git a/tests/unit/widget/widget_animation.js b/tests/unit/widget/widget_animation.js index 8ef55aa115c..d1f2be72cc4 100644 --- a/tests/unit/widget/widget_animation.js +++ b/tests/unit/widget/widget_animation.js @@ -1,3 +1,7 @@ +define([ + "jquery", + "ui/widget" +], function( $ ) { module( "widget animation", (function() { var show = $.fn.show, @@ -255,3 +259,5 @@ asyncTest( "show: object(effect)", function() { next(); }); }); + +}); diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js index feafca9428c..3d357714bf8 100644 --- a/tests/unit/widget/widget_core.js +++ b/tests/unit/widget/widget_core.js @@ -1,4 +1,7 @@ -(function( $ ) { +define([ + "jquery", + "ui/widget" +], function( $ ) { module( "widget factory", { teardown: function() { @@ -1504,4 +1507,4 @@ test( "$.widget.bridge() - widgetFullName", function() { equal( typeof instance, "object", "instance stored in .data(widgetFullName)" ); }); -}( jQuery ) ); +}(; diff --git a/tests/unit/widget/widget_extend.js b/tests/unit/widget/widget_extend.js index 14f9a46e0d2..36c465778ec 100644 --- a/tests/unit/widget/widget_extend.js +++ b/tests/unit/widget/widget_extend.js @@ -1,3 +1,8 @@ +define([ + "jquery", + "ui/widget" +], function( $ ) { + test( "$.widget.extend()", function() { expect( 27 ); @@ -103,3 +108,5 @@ test( "$.widget.extend()", function() { input.key[0] = 10; deepEqual( input, output, "don't clone arrays" ); }); + +}); From bc593d34b16fde890a7e708851a25ec1d0ad7ace Mon Sep 17 00:00:00 2001 From: Rafael Xavier de Souza Date: Wed, 19 Nov 2014 09:20:37 -0200 Subject: [PATCH 14/20] (fix) Tests: Replace resource loader with AMD - Port all others; --- tests/unit/datepicker/datepicker_core.js | 2 +- tests/unit/dialog/dialog.html | 1 - tests/unit/dialog/dialog_common.js | 8 +- tests/unit/dialog/dialog_core.js | 3 +- tests/unit/dialog/dialog_events.js | 15 +- tests/unit/dialog/dialog_methods.js | 9 +- tests/unit/dialog/dialog_options.js | 98 +++---- tests/unit/dialog/dialog_test_helpers.js | 33 +-- tests/unit/draggable/draggable_common.js | 3 +- tests/unit/draggable/draggable_core.js | 48 ++-- tests/unit/draggable/draggable_methods.js | 19 +- tests/unit/draggable/draggable_options.js | 258 +++++++++--------- .../unit/draggable/draggable_test_helpers.js | 102 +++---- tests/unit/helper/testsuite.js | 46 +++- tests/unit/testsuite.js | 63 ----- 15 files changed, 361 insertions(+), 347 deletions(-) delete mode 100644 tests/unit/testsuite.js diff --git a/tests/unit/datepicker/datepicker_core.js b/tests/unit/datepicker/datepicker_core.js index 5fb833266d8..d3f6a861586 100644 --- a/tests/unit/datepicker/datepicker_core.js +++ b/tests/unit/datepicker/datepicker_core.js @@ -33,7 +33,7 @@ test("initialization - Reinitialization after body had been emptied.", function( test( "widget method - empty collection", function() { expect( 1 ); $( "#nonExist" ).datepicker(); // should create nothing - ok( !$( "#ui-datepicker-div" ).length, "Non init on empty collection" ); + ok( !$( "#ui-datepicker-div" ).length, "Non init on empty collection " + $( "#ui-datepicker-div" ).length ); }); test("widget method", function() { diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html index e9df96f1cd0..0b73b4ee3a8 100644 --- a/tests/unit/dialog/dialog.html +++ b/tests/unit/dialog/dialog.html @@ -40,7 +40,6 @@ - - diff --git a/tests/unit/position/position_core.js b/tests/unit/position/position_core.js index 3fdf2e2508c..a7567fd3f9c 100644 --- a/tests/unit/position/position_core.js +++ b/tests/unit/position/position_core.js @@ -1,7 +1,8 @@ define([ "jquery", + "helper/testsuite", "ui/position" -], function( $ ) { +], function( $, testHelper ) { var win = $( window ), scrollTopSupport = function() { @@ -19,7 +20,7 @@ module( "position", { } }); -TestHelpers.testJshint( "position" ); +testHelper.testJshint( "position" ); test( "my, at, of", function() { expect( 4 ); @@ -729,4 +730,4 @@ test( "bug #5280: consistent results (avoid fractional values)", function() { deepEqual( offset1, offset2 ); }); -}(; +}); diff --git a/tests/unit/progressbar/progressbar_common.js b/tests/unit/progressbar/progressbar_common.js index a40ae3e3995..d624d1ce7e8 100644 --- a/tests/unit/progressbar/progressbar_common.js +++ b/tests/unit/progressbar/progressbar_common.js @@ -1,5 +1,6 @@ define([ - "helper/testsuite" + "helper/testsuite", + "ui/progressbar" ], function( testHelper ) { testHelper.commonWidgetTests( "progressbar", { diff --git a/tests/unit/progressbar/progressbar_methods.js b/tests/unit/progressbar/progressbar_methods.js index 1727ca58095..b7a80d4d472 100644 --- a/tests/unit/progressbar/progressbar_methods.js +++ b/tests/unit/progressbar/progressbar_methods.js @@ -1,13 +1,14 @@ define([ "jquery", + "helper/testsuite", "ui/progressbar" -], function( $ ) { +], function( $, testHelper ) { module( "progressbar: methods" ); test( "destroy", function() { expect( 1 ); - domEqual( "#progressbar", function() { + testHelper.domEqual( "#progressbar", function() { $( "#progressbar" ).progressbar().progressbar( "destroy" ); }); }); diff --git a/tests/unit/resizable/resizable_common.js b/tests/unit/resizable/resizable_common.js index b228b7d7cee..a85ae421d65 100644 --- a/tests/unit/resizable/resizable_common.js +++ b/tests/unit/resizable/resizable_common.js @@ -1,5 +1,6 @@ define([ - "helper/testsuite" + "helper/testsuite", + "ui/resizable" ], function( testHelper ) { testHelper.commonWidgetTests( "resizable", { diff --git a/tests/unit/resizable/resizable_core.js b/tests/unit/resizable/resizable_core.js index 0737500e0e2..a2c5a2980f6 100644 --- a/tests/unit/resizable/resizable_core.js +++ b/tests/unit/resizable/resizable_core.js @@ -1,7 +1,8 @@ define([ "jquery", + "./resizable_test_helpers", "ui/resizable" -], function( $ ) { +], function( $, resizableTestHelper ) { /* * resizable_core.js @@ -33,10 +34,10 @@ test("n", function() { var handle = ".ui-resizable-n", target = $("#resizable1").resizable({ handles: "all" }); - TestHelpers.resizable.drag(handle, 0, -50); + resizableTestHelper.drag(handle, 0, -50); equal( target.height(), 150, "compare height" ); - TestHelpers.resizable.drag(handle, 0, 50); + resizableTestHelper.drag(handle, 0, 50); equal( target.height(), 100, "compare height" ); equal( target[0].style.left, "", "left should not be modified" ); @@ -48,10 +49,10 @@ test("s", function() { var handle = ".ui-resizable-s", target = $("#resizable1").resizable({ handles: "all" }); - TestHelpers.resizable.drag(handle, 0, 50); + resizableTestHelper.drag(handle, 0, 50); equal( target.height(), 150, "compare height" ); - TestHelpers.resizable.drag(handle, 0, -50); + resizableTestHelper.drag(handle, 0, -50); equal( target.height(), 100, "compare height" ); equal( target[0].style.top, "", "top should not be modified" ); @@ -64,10 +65,10 @@ test("e", function() { var handle = ".ui-resizable-e", target = $("#resizable1").resizable({ handles: "all" }); - TestHelpers.resizable.drag(handle, 50); + resizableTestHelper.drag(handle, 50); equal( target.width(), 150, "compare width"); - TestHelpers.resizable.drag(handle, -50); + resizableTestHelper.drag(handle, -50); equal( target.width(), 100, "compare width" ); equal( target[0].style.height, "", "height should not be modified" ); @@ -80,10 +81,10 @@ test("w", function() { var handle = ".ui-resizable-w", target = $("#resizable1").resizable({ handles: "all" }); - TestHelpers.resizable.drag(handle, -50); + resizableTestHelper.drag(handle, -50); equal( target.width(), 150, "compare width" ); - TestHelpers.resizable.drag(handle, 50); + resizableTestHelper.drag(handle, 50); equal( target.width(), 100, "compare width" ); equal( target[0].style.height, "", "height should not be modified" ); @@ -95,11 +96,11 @@ test("ne", function() { var handle = ".ui-resizable-ne", target = $("#resizable1").css({ overflow: "hidden" }).resizable({ handles: "all" }); - TestHelpers.resizable.drag(handle, -50, -50); + resizableTestHelper.drag(handle, -50, -50); equal( target.width(), 50, "compare width" ); equal( target.height(), 150, "compare height" ); - TestHelpers.resizable.drag(handle, 50, 50); + resizableTestHelper.drag(handle, 50, 50); equal( target.width(), 100, "compare width" ); equal( target.height(), 100, "compare height" ); @@ -111,11 +112,11 @@ test("se", function() { var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ handles: "all" }); - TestHelpers.resizable.drag(handle, 50, 50); + resizableTestHelper.drag(handle, 50, 50); equal( target.width(), 150, "compare width" ); equal( target.height(), 150, "compare height" ); - TestHelpers.resizable.drag(handle, -50, -50); + resizableTestHelper.drag(handle, -50, -50); equal( target.width(), 100, "compare width" ); equal( target.height(), 100, "compare height" ); @@ -128,11 +129,11 @@ test("sw", function() { var handle = ".ui-resizable-sw", target = $("#resizable1").resizable({ handles: "all" }); - TestHelpers.resizable.drag(handle, -50, -50); + resizableTestHelper.drag(handle, -50, -50); equal( target.width(), 150, "compare width" ); equal( target.height(), 50, "compare height" ); - TestHelpers.resizable.drag(handle, 50, 50); + resizableTestHelper.drag(handle, 50, 50); equal( target.width(), 100, "compare width" ); equal( target.height(), 100, "compare height" ); @@ -144,11 +145,11 @@ test("nw", function() { var handle = ".ui-resizable-nw", target = $("#resizable1").resizable({ handles: "all" }); - TestHelpers.resizable.drag(handle, -50, -50); + resizableTestHelper.drag(handle, -50, -50); equal( target.width(), 150, "compare width" ); equal( target.height(), 150, "compare height" ); - TestHelpers.resizable.drag(handle, 50, 50); + resizableTestHelper.drag(handle, 50, 50); equal( target.width(), 100, "compare width" ); equal( target.height(), 100, "compare height" ); }); @@ -166,10 +167,10 @@ test("handle with complex markup (#8756)", function() { var handle = ".ui-resizable-w div", target = $("#resizable1").resizable({ handles: "all" }); - TestHelpers.resizable.drag(handle, -50); + resizableTestHelper.drag(handle, -50); equal( target.width(), 150, "compare width" ); - TestHelpers.resizable.drag(handle, 50); + resizableTestHelper.drag(handle, 50); equal( target.width(), 100, "compare width" ); }); @@ -189,7 +190,7 @@ test("resizable accounts for scroll position correctly (#3815)", function() { left = el.css("left"); top = el.css("top"); - TestHelpers.resizable.drag(handle, 50, 50); + resizableTestHelper.drag(handle, 50, 50); deepEqual( el.position(), position, "position stays the same when resized" ); equal( el.css("left"), left, "css('left') stays the same when resized" ); equal( el.css("top"), top, "css('top') stays the same when resized" ); @@ -206,7 +207,7 @@ test( "resizable stores correct size when using helper and grid (#9547)", functi grid: [ 10, 10 ] }); - TestHelpers.resizable.drag( handle, 1, 1 ); + resizableTestHelper.drag( handle, 1, 1 ); equal( target.width(), 100, "compare width" ); equal( target.height(), 100, "compare height" ); }); @@ -230,14 +231,14 @@ test( "nested resizable", function() { innerHandle = $( "#inner > .ui-resizable-e" ); outerHandle = $( "#outer > .ui-resizable-e" ); - TestHelpers.resizable.drag( innerHandle, 10 ); + resizableTestHelper.drag( innerHandle, 10 ); equal( inner.width(), 40, "compare width of inner element" ); - TestHelpers.resizable.drag( innerHandle, -10 ); + resizableTestHelper.drag( innerHandle, -10 ); equal( inner.width(), 30, "compare width of inner element" ); - TestHelpers.resizable.drag( outerHandle, 10 ); + resizableTestHelper.drag( outerHandle, 10 ); equal( outer.width(), 60, "compare width of outer element" ); - TestHelpers.resizable.drag( outerHandle, -10 ); + resizableTestHelper.drag( outerHandle, -10 ); equal( outer.width(), 50, "compare width of outer element" ); inner.remove(); diff --git a/tests/unit/resizable/resizable_events.js b/tests/unit/resizable/resizable_events.js index 4241c0b214c..81a7b87e412 100644 --- a/tests/unit/resizable/resizable_events.js +++ b/tests/unit/resizable/resizable_events.js @@ -1,7 +1,8 @@ define([ "jquery", + "./resizable_test_helpers", "ui/resizable" -], function( $ ) { +], function( $, resizableTestHelper ) { /* * resizable_events.js @@ -27,7 +28,7 @@ test("start", function() { } }); - TestHelpers.resizable.drag(handle, 50, 50); + resizableTestHelper.drag(handle, 50, 50); equal(count, 1, "start callback should happen exactly once"); @@ -58,7 +59,7 @@ test( "resize", function() { } }); - TestHelpers.resizable.drag( handle, 50, 50 ); + resizableTestHelper.drag( handle, 50, 50 ); equal( count, 2, "resize callback should happen exactly once per size adjustment" ); @@ -86,7 +87,7 @@ test( "resize (min/max dimensions)", function() { } }); - TestHelpers.resizable.drag( handle, -200, -200 ); + resizableTestHelper.drag( handle, -200, -200 ); equal( count, 1, "resize callback should happen exactly once per size adjustment" ); @@ -116,10 +117,10 @@ test( "resize (containment)", function() { }); // Prove you can't resize outside containment by dragging southeast corner southeast - TestHelpers.resizable.drag( handle, 100, 100 ); + resizableTestHelper.drag( handle, 100, 100 ); // Prove you can't resize outside containment by dragging southeast corner northwest - TestHelpers.resizable.drag( handle, -200, -200 ); + resizableTestHelper.drag( handle, -200, -200 ); equal( count, 1, "resize callback should happen exactly once per size adjustment" ); @@ -144,7 +145,7 @@ test("resize (grid)", function() { } }); - TestHelpers.resizable.drag(handle, 50, 50); + resizableTestHelper.drag(handle, 50, 50); equal(count, 1, "resize callback should happen exactly once per grid-unit size adjustment"); @@ -163,7 +164,7 @@ test( "resize, custom adjustment", function() { } }); - TestHelpers.resizable.drag( handle, 50, 50 ); + resizableTestHelper.drag( handle, 50, 50 ); equal( element.width(), 100, "resize event can control width" ); equal( element.height(), 200, "resize event can control height" ); @@ -189,7 +190,7 @@ test("stop", function() { } }); - TestHelpers.resizable.drag(handle, 50, 50); + resizableTestHelper.drag(handle, 50, 50); equal(count, 1, "stop callback should happen exactly once"); @@ -234,7 +235,7 @@ test( "resize (containment) works with parent with negative offset", function() widthBefore = target.width(); - TestHelpers.resizable.drag( handle, increaseWidthBy, 0 ); + resizableTestHelper.drag( handle, increaseWidthBy, 0 ); widthAfter = target.width(); diff --git a/tests/unit/resizable/resizable_options.js b/tests/unit/resizable/resizable_options.js index ed746eefd7d..422f3003f14 100644 --- a/tests/unit/resizable/resizable_options.js +++ b/tests/unit/resizable/resizable_options.js @@ -1,7 +1,8 @@ define([ "jquery", + "./resizable_test_helpers", "ui/resizable" -], function( $ ) { +], function( $, resizableTestHelper ) { /* * resizable_options.js @@ -23,7 +24,7 @@ test( "alsoResize", function() { }), handle = ".ui-resizable-e"; - TestHelpers.resizable.drag( handle, 80 ); + resizableTestHelper.drag( handle, 80 ); equal( element.width(), 180, "resizable width" ); equal( other.width(), 130, "alsoResize width" ); }); @@ -34,11 +35,11 @@ test("aspectRatio: 'preserve' (e)", function() { var handle = ".ui-resizable-e", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 }); - TestHelpers.resizable.drag(handle, 80); + resizableTestHelper.drag(handle, 80); equal( target.width(), 130, "compare maxWidth"); equal( target.height(), 130, "compare maxHeight"); - TestHelpers.resizable.drag(handle, -130); + resizableTestHelper.drag(handle, -130); equal( target.width(), 70, "compare minWidth"); equal( target.height(), 70, "compare minHeight"); }); @@ -48,11 +49,11 @@ test("aspectRatio: 'preserve' (w)", function() { var handle = ".ui-resizable-w", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 }); - TestHelpers.resizable.drag(handle, -80); + resizableTestHelper.drag(handle, -80); equal( target.width(), 130, "compare maxWidth"); equal( target.height(), 130, "compare maxHeight"); - TestHelpers.resizable.drag(handle, 130); + resizableTestHelper.drag(handle, 130); equal( target.width(), 70, "compare minWidth"); equal( target.height(), 70, "compare minHeight"); }); @@ -62,11 +63,11 @@ test("aspectRatio: 'preserve' (n)", function() { var handle = ".ui-resizable-n", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 }); - TestHelpers.resizable.drag(handle, 0, -80); + resizableTestHelper.drag(handle, 0, -80); equal( target.width(), 130, "compare maxWidth"); equal( target.height(), 130, "compare maxHeight"); - TestHelpers.resizable.drag(handle, 0, 80); + resizableTestHelper.drag(handle, 0, 80); equal( target.width(), 70, "compare minWidth"); equal( target.height(), 70, "compare minHeight"); }); @@ -76,11 +77,11 @@ test("aspectRatio: 'preserve' (s)", function() { var handle = ".ui-resizable-s", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 }); - TestHelpers.resizable.drag(handle, 0, 80); + resizableTestHelper.drag(handle, 0, 80); equal( target.width(), 130, "compare maxWidth"); equal( target.height(), 130, "compare maxHeight"); - TestHelpers.resizable.drag(handle, 0, -80); + resizableTestHelper.drag(handle, 0, -80); equal( target.width(), 70, "compare minWidth"); equal( target.height(), 70, "compare minHeight"); }); @@ -90,11 +91,11 @@ test("aspectRatio: 'preserve' (se)", function() { var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 }); - TestHelpers.resizable.drag(handle, 80, 80); + resizableTestHelper.drag(handle, 80, 80); equal( target.width(), 130, "compare maxWidth"); equal( target.height(), 130, "compare maxHeight"); - TestHelpers.resizable.drag(handle, -80, -80); + resizableTestHelper.drag(handle, -80, -80); equal( target.width(), 70, "compare minWidth"); equal( target.height(), 70, "compare minHeight"); }); @@ -104,11 +105,11 @@ test("aspectRatio: 'preserve' (sw)", function() { var handle = ".ui-resizable-sw", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 }); - TestHelpers.resizable.drag(handle, -80, 80); + resizableTestHelper.drag(handle, -80, 80); equal( target.width(), 130, "compare maxWidth"); equal( target.height(), 130, "compare maxHeight"); - TestHelpers.resizable.drag(handle, 80, -80); + resizableTestHelper.drag(handle, 80, -80); equal( target.width(), 70, "compare minWidth"); equal( target.height(), 70, "compare minHeight"); }); @@ -118,11 +119,11 @@ test("aspectRatio: 'preserve' (ne)", function() { var handle = ".ui-resizable-ne", target = $("#resizable1").resizable({ aspectRatio: "preserve", handles: "all", minWidth: 70, minHeight: 50, maxWidth: 150, maxHeight: 130 }); - TestHelpers.resizable.drag(handle, 80, -80); + resizableTestHelper.drag(handle, 80, -80); equal( target.width(), 130, "compare maxWidth"); equal( target.height(), 130, "compare maxHeight"); - TestHelpers.resizable.drag(handle, -80, 80); + resizableTestHelper.drag(handle, -80, 80); equal( target.width(), 70, "compare minWidth"); equal( target.height(), 70, "compare minHeight"); }); @@ -142,7 +143,7 @@ test( "aspectRatio: Resizing can move objects", function() { $( "#container" ).css({ width: 200, height: 300 }); $( "#resizable1" ).css({ width: 100, height: 100, left: 75, top: 200 }); - TestHelpers.resizable.drag( handleW, -20 ); + resizableTestHelper.drag( handleW, -20 ); equal( target.width(), 100, "compare width - no size change" ); equal( target.height(), 100, "compare height - no size change" ); equal( target.position().left, 75, "compare left - no movement" ); @@ -151,7 +152,7 @@ test( "aspectRatio: Resizing can move objects", function() { $( "#container" ).css({ width: 200, height: 300, position: "absolute", left: 100, top: 100 }); $( "#resizable1" ).css({ width: 100, height: 100, left: 0, top: 0 }); - TestHelpers.resizable.drag( handleNW, -20, -20 ); + resizableTestHelper.drag( handleNW, -20, -20 ); equal( target.width(), 100, "compare width - no size change" ); equal( target.height(), 100, "compare height - no size change" ); equal( target.position().left, 0, "compare left - no movement" ); @@ -165,11 +166,11 @@ test( "containment", function() { containment: "#container" }); - TestHelpers.resizable.drag( ".ui-resizable-se", 20, 30 ); + resizableTestHelper.drag( ".ui-resizable-se", 20, 30 ); equal( element.width(), 120, "unconstrained width within container" ); equal( element.height(), 130, "unconstrained height within container" ); - TestHelpers.resizable.drag( ".ui-resizable-se", 400, 400 ); + resizableTestHelper.drag( ".ui-resizable-se", 400, 400 ); equal( element.width(), 300, "constrained width at containment edge" ); equal( element.height(), 200, "constrained height at containment edge" ); }); @@ -184,10 +185,10 @@ test( "containment - not immediate parent", function() { handles: "all" }); - TestHelpers.resizable.drag( ".ui-resizable-e", 300, 0 ); + resizableTestHelper.drag( ".ui-resizable-e", 300, 0 ); equal( element.width(), 400, "Relative, contained within container width" ); - TestHelpers.resizable.drag( ".ui-resizable-s", 0, 300 ); + resizableTestHelper.drag( ".ui-resizable-s", 0, 300 ); equal( element.height(), 400, "Relative, contained within container height" ); $( "#child" ).css( { left: 50, top: 50 } ); @@ -199,10 +200,10 @@ test( "containment - not immediate parent", function() { handles: "all" }); - TestHelpers.resizable.drag( ".ui-resizable-e", 400, 0 ); + resizableTestHelper.drag( ".ui-resizable-e", 400, 0 ); equal( element.width(), 300, "Relative with Left, contained within container width" ); - TestHelpers.resizable.drag( ".ui-resizable-s", 0, 400 ); + resizableTestHelper.drag( ".ui-resizable-s", 0, 400 ); equal( element.height(), 300, "Relative with Top, contained within container height" ); }); @@ -216,10 +217,10 @@ test( "containment - immediate parent", function() { handles: "all" }); - TestHelpers.resizable.drag( ".ui-resizable-e", 400, 0 ); + resizableTestHelper.drag( ".ui-resizable-e", 400, 0 ); equal( element.width(), 300, "Relative, contained within container width" ); - TestHelpers.resizable.drag( ".ui-resizable-s", 0, 400 ); + resizableTestHelper.drag( ".ui-resizable-s", 0, 400 ); equal( element.height(), 300, "Relative, contained within container height" ); $( "#child" ).css( { left: 50, top: 50 } ); @@ -231,10 +232,10 @@ test( "containment - immediate parent", function() { handles: "all" }); - TestHelpers.resizable.drag( ".ui-resizable-e", 400, 0 ); + resizableTestHelper.drag( ".ui-resizable-e", 400, 0 ); equal( element.width(), 250, "Relative with Left, contained within container width" ); - TestHelpers.resizable.drag( ".ui-resizable-s", 0, 400 ); + resizableTestHelper.drag( ".ui-resizable-s", 0, 400 ); equal( element.height(), 250, "Relative with Top, contained within container height" ); }); @@ -243,11 +244,11 @@ test("grid", function() { var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ handles: "all", grid: [0, 20] }); - TestHelpers.resizable.drag(handle, 3, 9); + resizableTestHelper.drag(handle, 3, 9); equal( target.width(), 103, "compare width"); equal( target.height(), 100, "compare height"); - TestHelpers.resizable.drag(handle, 15, 11); + resizableTestHelper.drag(handle, 15, 11); equal( target.width(), 118, "compare width"); equal( target.height(), 120, "compare height"); }); @@ -257,11 +258,11 @@ test("grid (min/max dimensions)", function() { var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ handles: "all", grid: 20, minWidth: 65, minHeight: 65, maxWidth: 135, maxHeight: 135 }); - TestHelpers.resizable.drag(handle, 50, 50); + resizableTestHelper.drag(handle, 50, 50); equal( target.width(), 120, "grid should respect maxWidth"); equal( target.height(), 120, "grid should respect maxHeight"); - TestHelpers.resizable.drag(handle, -100, -100); + resizableTestHelper.drag(handle, -100, -100); equal( target.width(), 80, "grid should respect minWidth"); equal( target.height(), 80, "grid should respect minHeight"); }); @@ -271,11 +272,11 @@ test("grid (wrapped)", function() { var handle = ".ui-resizable-se", target = $("#resizable2").resizable({ handles: "all", grid: [0, 20] }); - TestHelpers.resizable.drag(handle, 3, 9); + resizableTestHelper.drag(handle, 3, 9); equal( target.width(), 103, "compare width"); equal( target.height(), 100, "compare height"); - TestHelpers.resizable.drag(handle, 15, 11); + resizableTestHelper.drag(handle, 15, 11); equal( target.width(), 118, "compare width"); equal( target.height(), 120, "compare height"); }); @@ -290,13 +291,13 @@ test( "grid - Resizable: can be moved when grid option is set (#9611)", function grid: 50 }); - TestHelpers.resizable.drag( handle, 50, 50 ); + resizableTestHelper.drag( handle, 50, 50 ); equal( target.width(), 50, "compare width" ); equal( target.height(), 50, "compare height" ); oldPosition = target.position(); - TestHelpers.resizable.drag( handle, 50, 50 ); + resizableTestHelper.drag( handle, 50, 50 ); equal( target.width(), 50, "compare width" ); equal( target.height(), 50, "compare height" ); equal( target.position().top, oldPosition.top, "compare top" ); @@ -318,7 +319,7 @@ test( "grid - maintains grid with padding and border when approaching no dimensi grid: 50 }); - TestHelpers.resizable.drag( handle, 50, 50 ); + resizableTestHelper.drag( handle, 50, 50 ); equal( target.outerWidth(), 50, "compare width" ); equal( target.outerHeight(), 50, "compare height" ); }); @@ -328,11 +329,11 @@ test("ui-resizable-se { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 1 var handle = ".ui-resizable-se", target = $("#resizable1").resizable({ handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }); - TestHelpers.resizable.drag(handle, -50, -50); + resizableTestHelper.drag(handle, -50, -50); equal( target.width(), 60, "compare minWidth" ); equal( target.height(), 60, "compare minHeight" ); - TestHelpers.resizable.drag(handle, 70, 70); + resizableTestHelper.drag(handle, 70, 70); equal( target.width(), 100, "compare maxWidth" ); equal( target.height(), 100, "compare maxHeight" ); }); @@ -342,11 +343,11 @@ test("ui-resizable-sw { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 1 var handle = ".ui-resizable-sw", target = $("#resizable1").resizable({ handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }); - TestHelpers.resizable.drag(handle, 50, -50); + resizableTestHelper.drag(handle, 50, -50); equal( target.width(), 60, "compare minWidth" ); equal( target.height(), 60, "compare minHeight" ); - TestHelpers.resizable.drag(handle, -70, 70); + resizableTestHelper.drag(handle, -70, 70); equal( target.width(), 100, "compare maxWidth" ); equal( target.height(), 100, "compare maxHeight" ); }); @@ -356,11 +357,11 @@ test("ui-resizable-ne { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 1 var handle = ".ui-resizable-ne", target = $("#resizable1").resizable({ handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }); - TestHelpers.resizable.drag(handle, -50, 50); + resizableTestHelper.drag(handle, -50, 50); equal( target.width(), 60, "compare minWidth" ); equal( target.height(), 60, "compare minHeight" ); - TestHelpers.resizable.drag(handle, 70, -70); + resizableTestHelper.drag(handle, 70, -70); equal( target.width(), 100, "compare maxWidth" ); equal( target.height(), 100, "compare maxHeight" ); }); @@ -370,11 +371,11 @@ test("ui-resizable-nw { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 1 var handle = ".ui-resizable-nw", target = $("#resizable1").resizable({ handles: "all", minWidth: 60, minHeight: 60, maxWidth: 100, maxHeight: 100 }); - TestHelpers.resizable.drag(handle, 70, 70); + resizableTestHelper.drag(handle, 70, 70); equal( target.width(), 60, "compare minWidth" ); equal( target.height(), 60, "compare minHeight" ); - TestHelpers.resizable.drag(handle, -70, -70); + resizableTestHelper.drag(handle, -70, -70); equal( target.width(), 100, "compare maxWidth" ); equal( target.height(), 100, "compare maxHeight" ); }); @@ -401,7 +402,7 @@ test( "alsoResize + containment", function() { containment: "#container" }); - TestHelpers.resizable.drag( ".ui-resizable-se", 400, 400 ); + resizableTestHelper.drag( ".ui-resizable-se", 400, 400 ); equal( element.width(), 300, "resizable constrained width at containment edge" ); equal( element.height(), 200, "resizable constrained height at containment edge" ); equal( other.width(), 250, "alsoResize constrained width at containment edge" ); diff --git a/tests/unit/resizable/resizable_test_helpers.js b/tests/unit/resizable/resizable_test_helpers.js index ac3ed140569..706893a61ee 100644 --- a/tests/unit/resizable/resizable_test_helpers.js +++ b/tests/unit/resizable/resizable_test_helpers.js @@ -1,8 +1,9 @@ define([ - "helper/testsuite" -], function( testHelper ) { + "jquery", + "jquery.simulate" +], function( $ ) { -testHelper.resizable = { +return { drag: function( el, dx, dy ) { // this mouseover is to work around a limitation in resizable // TODO: fix resizable so handle doesn't require mouseover in order to be used diff --git a/tests/unit/selectable/selectable_common.js b/tests/unit/selectable/selectable_common.js index f6fd12cc311..648c83a5b2c 100644 --- a/tests/unit/selectable/selectable_common.js +++ b/tests/unit/selectable/selectable_common.js @@ -1,5 +1,6 @@ define([ - "helper/testsuite" + "helper/testsuite", + "ui/selectable" ], function( testHelper ) { testHelper.commonWidgetTests("selectable", { diff --git a/tests/unit/selectable/selectable_events.js b/tests/unit/selectable/selectable_events.js index a4b8340a3e1..ec7033782d8 100644 --- a/tests/unit/selectable/selectable_events.js +++ b/tests/unit/selectable/selectable_events.js @@ -1,7 +1,9 @@ define([ "jquery", - "ui/selectable" -], function( $ ) { + "helper/testsuite", + "ui/selectable", + "jquery.simulate" +], function( $, testHelper ) { /* * selectable_events.js @@ -44,7 +46,7 @@ test( "mousedown: initial position of helper", function() { var helperOffset, element = $( "#selectable1" ).selectable(), - contentToForceScroll = TestHelpers.forceScrollableWindow( "body" ); + contentToForceScroll = testHelper.forceScrollableWindow( "body" ); $( window ).scrollTop( 100 ).scrollLeft( 100 ); diff --git a/tests/unit/selectable/selectable_options.js b/tests/unit/selectable/selectable_options.js index 708d6b53684..3a5035c808d 100644 --- a/tests/unit/selectable/selectable_options.js +++ b/tests/unit/selectable/selectable_options.js @@ -1,6 +1,7 @@ define([ "jquery", - "ui/selectable" + "ui/selectable", + "jquery.simulate" ], function( $ ) { /* diff --git a/tests/unit/selectmenu/selectmenu_common.js b/tests/unit/selectmenu/selectmenu_common.js index edf1236b24e..044e0407527 100644 --- a/tests/unit/selectmenu/selectmenu_common.js +++ b/tests/unit/selectmenu/selectmenu_common.js @@ -1,5 +1,6 @@ define([ - "helper/testsuite" + "helper/testsuite", + "ui/selectmenu" ], function( testHelper ) { testHelper.commonWidgetTests( "selectmenu", { diff --git a/tests/unit/selectmenu/selectmenu_core.js b/tests/unit/selectmenu/selectmenu_core.js index 41c30b2dd52..ab9eea45cf9 100644 --- a/tests/unit/selectmenu/selectmenu_core.js +++ b/tests/unit/selectmenu/selectmenu_core.js @@ -1,6 +1,7 @@ define([ "jquery", - "ui/selectmenu" + "ui/selectmenu", + "jquery.simulate" ], function( $ ) { module( "selectmenu: core" ); diff --git a/tests/unit/selectmenu/selectmenu_events.js b/tests/unit/selectmenu/selectmenu_events.js index 0797fcac4ee..ebd864125d0 100644 --- a/tests/unit/selectmenu/selectmenu_events.js +++ b/tests/unit/selectmenu/selectmenu_events.js @@ -1,6 +1,7 @@ define([ "jquery", - "ui/selectmenu" + "ui/selectmenu", + "jquery.simulate" ], function( $ ) { module( "selectmenu: events", { diff --git a/tests/unit/selectmenu/selectmenu_methods.js b/tests/unit/selectmenu/selectmenu_methods.js index 1742b0ec453..3b226cf931e 100644 --- a/tests/unit/selectmenu/selectmenu_methods.js +++ b/tests/unit/selectmenu/selectmenu_methods.js @@ -1,13 +1,15 @@ define([ "jquery", - "ui/selectmenu" -], function( $ ) { + "helper/testsuite", + "ui/selectmenu", + "jquery.simulate" +], function( $, testHelper ) { module( "selectmenu: methods" ); test( "destroy", function() { expect( 1 ); - domEqual( "#speed", function() { + testHelper.domEqual( "#speed", function() { $( "#speed" ).selectmenu().selectmenu( "destroy" ); }); }); diff --git a/tests/unit/slider/slider_common.js b/tests/unit/slider/slider_common.js index 4b68b574ce1..6af5f8767a2 100644 --- a/tests/unit/slider/slider_common.js +++ b/tests/unit/slider/slider_common.js @@ -1,5 +1,6 @@ define([ - "helper/testsuite" + "helper/testsuite", + "ui/slider" ], function( testHelper ) { testHelper.commonWidgetTests( "slider", { diff --git a/tests/unit/slider/slider_core.js b/tests/unit/slider/slider_core.js index 28adb31c388..40b77a1e825 100644 --- a/tests/unit/slider/slider_core.js +++ b/tests/unit/slider/slider_core.js @@ -1,5 +1,6 @@ define([ "jquery", + "jquery.simulate", "ui/slider" ], function( $ ) { diff --git a/tests/unit/slider/slider_events.js b/tests/unit/slider/slider_events.js index a8b9eb74409..4ab220db1ca 100644 --- a/tests/unit/slider/slider_events.js +++ b/tests/unit/slider/slider_events.js @@ -1,5 +1,6 @@ define([ "jquery", + "jquery.simulate", "ui/slider" ], function( $ ) { diff --git a/tests/unit/slider/slider_methods.js b/tests/unit/slider/slider_methods.js index 5b95aca16b5..8844261efc2 100644 --- a/tests/unit/slider/slider_methods.js +++ b/tests/unit/slider/slider_methods.js @@ -1,7 +1,8 @@ define([ "jquery", + "helper/testsuite", "ui/slider" -], function( $ ) { +], function( $, testHelper ) { module( "slider: methods" ); @@ -28,7 +29,7 @@ test( "init", function() { test( "destroy", function() { expect( 1 ); - domEqual( "#slider1", function() { + testHelper.domEqual( "#slider1", function() { $( "#slider1" ).slider().slider( "destroy" ); }); }); diff --git a/tests/unit/slider/slider_options.js b/tests/unit/slider/slider_options.js index c6331b869fc..3f7ddae70cd 100644 --- a/tests/unit/slider/slider_options.js +++ b/tests/unit/slider/slider_options.js @@ -1,5 +1,6 @@ define([ "jquery", + "jquery.simulate", "ui/slider" ], function( $ ) { diff --git a/tests/unit/sortable/sortable_common.js b/tests/unit/sortable/sortable_common.js index dad1832fc0c..bad6f76755e 100644 --- a/tests/unit/sortable/sortable_common.js +++ b/tests/unit/sortable/sortable_common.js @@ -1,5 +1,6 @@ define([ - "helper/testsuite" + "helper/testsuite", + "ui/sortable" ], function( testHelper ) { testHelper.commonWidgetTests( "sortable", { diff --git a/tests/unit/sortable/sortable_core.js b/tests/unit/sortable/sortable_core.js index 6a8b1362bd5..14c5044ccf3 100644 --- a/tests/unit/sortable/sortable_core.js +++ b/tests/unit/sortable/sortable_core.js @@ -1,12 +1,12 @@ define([ "jquery", + "./sortable_test_helpers", "ui/sortable" -], function( $ ) { +], function( $, sortableTestHelper ) { /* * sortable_core.js */ -(function( $ ) { module( "sortable: core" ); @@ -17,7 +17,7 @@ test( "#9314: Sortable: Items cannot be dragged directly into bottom position", connectWith: ".connectWith" }); - TestHelpers.sortable.sort( $( "li", el[ 1 ] )[ 0 ], 0, -12, 5, "Dragging the sortable into connected sortable" ); + sortableTestHelper.sort( $( "li", el[ 1 ] )[ 0 ], 0, -12, 5, "Dragging the sortable into connected sortable" ); }); test( "ui-sortable-handle applied to appropriate element", function() { diff --git a/tests/unit/sortable/sortable_events.js b/tests/unit/sortable/sortable_events.js index 0a08b59199d..0b430bca423 100644 --- a/tests/unit/sortable/sortable_events.js +++ b/tests/unit/sortable/sortable_events.js @@ -1,7 +1,10 @@ define([ "jquery", + "./sortable_test_helpers", + "jquery.simulate", + "ui/draggable", "ui/sortable" -], function( $ ) { +], function( $, sortableTestHelper ) { /* * sortable_events.js @@ -176,7 +179,7 @@ test("#3019: Stop fires too early", function() { } }); - TestHelpers.sortable.sort($("li", el)[0], 0, 44, 2, "Dragging the sortable"); + sortableTestHelper.sort($("li", el)[0], 0, 44, 2, "Dragging the sortable"); equal(helper, null, "helper should be false"); }); diff --git a/tests/unit/sortable/sortable_methods.js b/tests/unit/sortable/sortable_methods.js index b42fbd528c3..0cb825ebcfc 100644 --- a/tests/unit/sortable/sortable_methods.js +++ b/tests/unit/sortable/sortable_methods.js @@ -1,7 +1,8 @@ define([ "jquery", + "./sortable_test_helpers", "ui/sortable" -], function( $ ) { +], function( $, sortableTestHelper ) { /* * sortable_methods.js @@ -51,7 +52,7 @@ test("enable", function() { el = $("#sortable").sortable({ disabled: true }); - TestHelpers.sortable.sort($("li", el)[0], 0, 44, 0, ".sortable({ disabled: true })"); + sortableTestHelper.sort($("li", el)[0], 0, 44, 0, ".sortable({ disabled: true })"); el.sortable("enable"); equal(el.sortable("option", "disabled"), false, "disabled option getter"); @@ -61,7 +62,7 @@ test("enable", function() { el.sortable("option", "disabled", false); equal(el.sortable("option", "disabled"), false, "disabled option setter"); - TestHelpers.sortable.sort($("li", el)[0], 0, 44, 2, ".sortable('option', 'disabled', false)"); + sortableTestHelper.sort($("li", el)[0], 0, 44, 2, ".sortable('option', 'disabled', false)"); expected = $("
").sortable(), actual = expected.sortable("enable"); @@ -74,15 +75,15 @@ test( "disable", function() { var chainable, element = $( "#sortable" ).sortable({ disabled: false }); - TestHelpers.sortable.sort( $( "li", element )[ 0 ], 0, 44, 2, ".sortable({ disabled: false })" ); + sortableTestHelper.sort( $( "li", element )[ 0 ], 0, 44, 2, ".sortable({ disabled: false })" ); chainable = element.sortable( "disable" ); - TestHelpers.sortable.sort( $( "li", element )[ 0 ], 0, 44, 0, "disabled.sortable getter" ); + sortableTestHelper.sort( $( "li", element )[ 0 ], 0, 44, 0, "disabled.sortable getter" ); element.sortable( "destroy" ); element.sortable({ disabled: false }); - TestHelpers.sortable.sort( $( "li", element )[ 0 ], 0, 44, 2, ".sortable({ disabled: false })" ); + sortableTestHelper.sort( $( "li", element )[ 0 ], 0, 44, 2, ".sortable({ disabled: false })" ); element.sortable( "option", "disabled", true); equal( element.sortable( "option", "disabled" ), true, "disabled option setter" ); @@ -90,7 +91,7 @@ test( "disable", function() { ok( !element.sortable( "widget" ).attr( "aria-disabled" ), "element does not get aria-disabled" ); ok( element.sortable( "widget" ).hasClass( "ui-sortable-disabled" ), "element gets ui-sortable-disabled" ); - TestHelpers.sortable.sort($( "li", element )[ 0 ], 0, 44, 0, ".sortable('option', 'disabled', true)" ); + sortableTestHelper.sort($( "li", element )[ 0 ], 0, 44, 0, ".sortable('option', 'disabled', true)" ); equal( chainable, element, "disable is chainable" ); }); diff --git a/tests/unit/sortable/sortable_options.js b/tests/unit/sortable/sortable_options.js index 4ec068d8687..af66435597c 100644 --- a/tests/unit/sortable/sortable_options.js +++ b/tests/unit/sortable/sortable_options.js @@ -1,5 +1,6 @@ define([ "jquery", + "jquery.simulate", "ui/sortable" ], function( $ ) { diff --git a/tests/unit/sortable/sortable_test_helpers.js b/tests/unit/sortable/sortable_test_helpers.js index 6cd9e0da7f2..0d1ef8b6a63 100644 --- a/tests/unit/sortable/sortable_test_helpers.js +++ b/tests/unit/sortable/sortable_test_helpers.js @@ -1,8 +1,9 @@ define([ - "helper/testsuite" -], function( testHelper ) { + "jquery", + "jquery.simulate" +], function( $ ) { -testHelper.sortable = { +return { sort: function( handle, dx, dy, index, msg ) { $( handle ).simulate( "drag", { dx: dx, diff --git a/tests/unit/spinner/spinner_common.js b/tests/unit/spinner/spinner_common.js index 8c078247fa9..8396bb3e679 100644 --- a/tests/unit/spinner/spinner_common.js +++ b/tests/unit/spinner/spinner_common.js @@ -1,5 +1,6 @@ define([ - "helper/testsuite" + "helper/testsuite", + "ui/spinner" ], function( testHelper ) { testHelper.commonWidgetTests( "spinner", { diff --git a/tests/unit/spinner/spinner_core.js b/tests/unit/spinner/spinner_core.js index a0c4794990b..c39e1d4eb86 100644 --- a/tests/unit/spinner/spinner_core.js +++ b/tests/unit/spinner/spinner_core.js @@ -1,9 +1,10 @@ define([ "jquery", + "./spinner_test_helpers", "ui/spinner" -], function( $ ) { +], function( $, spinnerTestHelper ) { -var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp; +var simulateKeyDownUp = spinnerTestHelper.simulateKeyDownUp; module( "spinner: core" ); diff --git a/tests/unit/spinner/spinner_events.js b/tests/unit/spinner/spinner_events.js index 84a666feea6..0568cd6e5ad 100644 --- a/tests/unit/spinner/spinner_events.js +++ b/tests/unit/spinner/spinner_events.js @@ -1,9 +1,10 @@ define([ "jquery", + "./spinner_test_helpers", "ui/spinner" -], function( $ ) { +], function( $, spinnerTestHelper ) { -var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp; +var simulateKeyDownUp = spinnerTestHelper.simulateKeyDownUp; module( "spinner: events" ); diff --git a/tests/unit/spinner/spinner_methods.js b/tests/unit/spinner/spinner_methods.js index d916dabd5c7..c918f14e3f0 100644 --- a/tests/unit/spinner/spinner_methods.js +++ b/tests/unit/spinner/spinner_methods.js @@ -1,15 +1,17 @@ define([ "jquery", + "helper/testsuite", + "./spinner_test_helpers", "ui/spinner" -], function( $ ) { +], function( $, testHelper, spinnerTestHelper ) { -var simulateKeyDownUp = TestHelpers.spinner.simulateKeyDownUp; +var simulateKeyDownUp = spinnerTestHelper.simulateKeyDownUp; module( "spinner: methods" ); test( "destroy", function() { expect( 1 ); - domEqual( "#spin", function() { + testHelper.domEqual( "#spin", function() { $( "#spin" ).spinner().spinner( "destroy" ); }); }); diff --git a/tests/unit/tabs/tabs_common.js b/tests/unit/tabs/tabs_common.js index 3dcb5b515fe..8624742904d 100644 --- a/tests/unit/tabs/tabs_common.js +++ b/tests/unit/tabs/tabs_common.js @@ -1,5 +1,6 @@ define([ - "helper/testsuite" + "helper/testsuite", + "ui/tabs" ], function( testHelper ) { testHelper.commonWidgetTests( "tabs", { diff --git a/tests/unit/tabs/tabs_core.js b/tests/unit/tabs/tabs_core.js index 6382a5be0c8..22ddd9172af 100644 --- a/tests/unit/tabs/tabs_core.js +++ b/tests/unit/tabs/tabs_core.js @@ -1,9 +1,10 @@ define([ "jquery", + "./tabs_test_helpers", "ui/tabs" -], function( $ ) { +], function( $, tabsTestHelper ) { -var state = TestHelpers.tabs.state; +var state = tabsTestHelper.state; module( "tabs: core" ); @@ -615,4 +616,4 @@ test( "#4033 - IE expands hash to full url and misinterprets tab as ajax", funct state( element, 1 ); }); -}(; +}); diff --git a/tests/unit/tabs/tabs_events.js b/tests/unit/tabs/tabs_events.js index b7d7b715ec2..d1c565e5224 100644 --- a/tests/unit/tabs/tabs_events.js +++ b/tests/unit/tabs/tabs_events.js @@ -1,9 +1,10 @@ define([ "jquery", + "./tabs_test_helpers", "ui/tabs" -], function( $ ) { +], function( $, tabsTestHelper ) { -var state = TestHelpers.tabs.state; +var state = tabsTestHelper.state; module( "tabs: events" ); @@ -318,4 +319,4 @@ asyncTest( "load", function() { } }); -}(; +}); diff --git a/tests/unit/tabs/tabs_methods.js b/tests/unit/tabs/tabs_methods.js index 5812b52233d..f97552890d7 100644 --- a/tests/unit/tabs/tabs_methods.js +++ b/tests/unit/tabs/tabs_methods.js @@ -1,10 +1,11 @@ define([ "jquery", + "./tabs_test_helpers", "ui/tabs" -], function( $ ) { +], function( $, tabsTestHelper ) { -var disabled = TestHelpers.tabs.disabled, - state = TestHelpers.tabs.state; +var disabled = tabsTestHelper.disabled, + state = tabsTestHelper.state; module( "tabs: methods" ); @@ -270,4 +271,4 @@ test( "widget", function() { strictEqual( widgetElement[ 0 ], element[ 0 ], "same element" ); }); -}(; +}); diff --git a/tests/unit/tabs/tabs_options.js b/tests/unit/tabs/tabs_options.js index fbe8d1fc953..71c36aaaaa8 100644 --- a/tests/unit/tabs/tabs_options.js +++ b/tests/unit/tabs/tabs_options.js @@ -1,11 +1,12 @@ define([ "jquery", + "./tabs_test_helpers", "ui/tabs" -], function( $ ) { +], function( $, tabsTestHelper ) { -var disabled = TestHelpers.tabs.disabled, - equalHeight = TestHelpers.tabs.equalHeight, - state = TestHelpers.tabs.state; +var disabled = tabsTestHelper.disabled, + equalHeight = tabsTestHelper.equalHeight, + state = tabsTestHelper.state; module( "tabs: options" ); @@ -366,4 +367,4 @@ asyncTest( "hide and show - animation", function() { }); -}(; +}); diff --git a/tests/unit/tooltip/tooltip_common.js b/tests/unit/tooltip/tooltip_common.js index 39e8672b3d7..9460bf207f1 100644 --- a/tests/unit/tooltip/tooltip_common.js +++ b/tests/unit/tooltip/tooltip_common.js @@ -1,5 +1,6 @@ define([ - "helper/testsuite" + "helper/testsuite", + "ui/tooltip" ], function( testHelper ) { testHelper.commonWidgetTests( "tooltip", { diff --git a/tests/unit/tooltip/tooltip_core.js b/tests/unit/tooltip/tooltip_core.js index 342f5ff42a8..8608cdcbed4 100644 --- a/tests/unit/tooltip/tooltip_core.js +++ b/tests/unit/tooltip/tooltip_core.js @@ -177,4 +177,4 @@ asyncTest( "destroy during hide animation; only one close event", function() { }); }); -}(; +}); diff --git a/tests/unit/tooltip/tooltip_events.js b/tests/unit/tooltip/tooltip_events.js index 0a45453d46a..0dbddd934f9 100644 --- a/tests/unit/tooltip/tooltip_events.js +++ b/tests/unit/tooltip/tooltip_events.js @@ -57,4 +57,4 @@ test( "focus events", function() { element.trigger( "focusout" ); }); -}(; +}); diff --git a/tests/unit/tooltip/tooltip_methods.js b/tests/unit/tooltip/tooltip_methods.js index 10184071385..86f5b377e21 100644 --- a/tests/unit/tooltip/tooltip_methods.js +++ b/tests/unit/tooltip/tooltip_methods.js @@ -1,7 +1,8 @@ define([ "jquery", + "helper/testsuite", "ui/tooltip" -], function( $ ) { +], function( $, testHelper ) { module( "tooltip: methods" ); @@ -9,12 +10,12 @@ test( "destroy", function() { expect( 3 ); var element = $( "#tooltipped1" ); - domEqual( "#tooltipped1", function() { + testHelper.domEqual( "#tooltipped1", function() { element.tooltip().tooltip( "destroy" ); }); // make sure that open tooltips are removed on destroy - domEqual( "#tooltipped1", function() { + testHelper.domEqual( "#tooltipped1", function() { element .tooltip() .tooltip( "open", $.Event( "mouseover", { target: element[0] }) ) @@ -140,4 +141,4 @@ test( "preserve changes to title attributes on close and destroy", function() { } ); }); -}(; +}); diff --git a/tests/unit/tooltip/tooltip_options.js b/tests/unit/tooltip/tooltip_options.js index fd33dd7ca12..7633f969d2c 100644 --- a/tests/unit/tooltip/tooltip_options.js +++ b/tests/unit/tooltip/tooltip_options.js @@ -174,4 +174,4 @@ test( "track and programmatic focus", function() { equal( "inputtitle", $( ".ui-tooltip" ).text() ); }); -}(; +}); diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js index 3d357714bf8..31d06032f1f 100644 --- a/tests/unit/widget/widget_core.js +++ b/tests/unit/widget/widget_core.js @@ -1,7 +1,8 @@ define([ "jquery", + "helper/testsuite", "ui/widget" -], function( $ ) { +], function( $, testHelper ) { module( "widget factory", { teardown: function() { @@ -12,7 +13,7 @@ module( "widget factory", { } }); -TestHelpers.testJshint( "widget" ); +testHelper.testJshint( "widget" ); test( "widget creation", function() { expect( 5 ); @@ -1507,4 +1508,4 @@ test( "$.widget.bridge() - widgetFullName", function() { equal( typeof instance, "object", "instance stored in .data(widgetFullName)" ); }); -}(; +}); From b810fc3b5378a44916a49b34d518252b90a4aba0 Mon Sep 17 00:00:00 2001 From: Rafael Xavier de Souza Date: Wed, 19 Nov 2014 09:20:37 -0200 Subject: [PATCH 17/20] (fix) Tests: Replace resource loader with AMD - Port all others; --- tests/unit/datepicker/datepicker_core.js | 1 + tests/unit/datepicker/datepicker_events.js | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/unit/datepicker/datepicker_core.js b/tests/unit/datepicker/datepicker_core.js index d3f6a861586..0c18ff33f73 100644 --- a/tests/unit/datepicker/datepicker_core.js +++ b/tests/unit/datepicker/datepicker_core.js @@ -2,6 +2,7 @@ define([ "jquery", "./datepicker_test_helpers", "helper/testsuite", + "jquery.simulate", "ui/datepicker", "ui/i18n/datepicker-fr", "ui/i18n/datepicker-he", diff --git a/tests/unit/datepicker/datepicker_events.js b/tests/unit/datepicker/datepicker_events.js index 79293abca09..4ae7f596a44 100644 --- a/tests/unit/datepicker/datepicker_events.js +++ b/tests/unit/datepicker/datepicker_events.js @@ -1,6 +1,7 @@ define([ "jquery", "./datepicker_test_helpers", + "jquery.simulate", "ui/datepicker" ], function( $, datepickerTestHelper ) { From 757164d61e0fd5a0c88531a0a0faaaaee6b5d30e Mon Sep 17 00:00:00 2001 From: Rafael Xavier de Souza Date: Wed, 19 Nov 2014 09:20:37 -0200 Subject: [PATCH 18/20] (fix) Tests: Replace resource loader with AMD - Port all others; --- tests/unit/datepicker/datepicker.html | 3 +-- tests/unit/dialog/dialog.html | 3 +-- tests/unit/draggable/draggable.html | 3 +-- tests/unit/droppable/droppable.html | 3 +-- tests/unit/resizable/resizable.html | 3 +-- tests/unit/sortable/sortable.html | 3 +-- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/tests/unit/datepicker/datepicker.html b/tests/unit/datepicker/datepicker.html index 5cde92a1e5e..e62ad70685e 100644 --- a/tests/unit/datepicker/datepicker.html +++ b/tests/unit/datepicker/datepicker.html @@ -33,8 +33,7 @@ "./datepicker_core", "./datepicker_events", "./datepicker_methods", - "./datepicker_options", - "./datepicker_test_helpers" + "./datepicker_options" ], function() { QUnit.start(); }); diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html index 0b73b4ee3a8..61900497466 100644 --- a/tests/unit/dialog/dialog.html +++ b/tests/unit/dialog/dialog.html @@ -46,8 +46,7 @@ "./dialog_core", "./dialog_events", "./dialog_methods", - "./dialog_options", - "./dialog_test_helpers" + "./dialog_options" ], function() { QUnit.start(); }); diff --git a/tests/unit/draggable/draggable.html b/tests/unit/draggable/draggable.html index 1a61025299a..40105a05f85 100644 --- a/tests/unit/draggable/draggable.html +++ b/tests/unit/draggable/draggable.html @@ -112,8 +112,7 @@ "./draggable_core", "./draggable_events", "./draggable_methods", - "./draggable_options", - "./draggable_test_helpers" + "./draggable_options" ], function() { QUnit.start(); }); diff --git a/tests/unit/droppable/droppable.html b/tests/unit/droppable/droppable.html index e48cb89015f..3e6584fe5a7 100644 --- a/tests/unit/droppable/droppable.html +++ b/tests/unit/droppable/droppable.html @@ -35,8 +35,7 @@ "./droppable_core", "./droppable_events", "./droppable_methods", - "./droppable_options", - "./droppable_test_helpers" + "./droppable_options" ], function() { QUnit.start(); }); diff --git a/tests/unit/resizable/resizable.html b/tests/unit/resizable/resizable.html index e571c53588f..6d3b1332d40 100644 --- a/tests/unit/resizable/resizable.html +++ b/tests/unit/resizable/resizable.html @@ -73,8 +73,7 @@ "./resizable_core", "./resizable_events", "./resizable_methods", - "./resizable_options", - "./resizable_test_helpers" + "./resizable_options" ], function() { QUnit.start(); }); diff --git a/tests/unit/sortable/sortable.html b/tests/unit/sortable/sortable.html index 88017c9a2bf..02e01beb210 100644 --- a/tests/unit/sortable/sortable.html +++ b/tests/unit/sortable/sortable.html @@ -93,8 +93,7 @@ "./sortable_core", "./sortable_events", "./sortable_methods", - "./sortable_options", - "./sortable_test_helpers" + "./sortable_options" ], function() { QUnit.start(); }); From 8281580749f0385e136df0db21b3185677b5c024 Mon Sep 17 00:00:00 2001 From: Rafael Xavier de Souza Date: Wed, 19 Nov 2014 09:20:37 -0200 Subject: [PATCH 19/20] (fix) Tests: Replace resource loader with AMD - Port all others; --- tests/unit/tabs/tabs_core.js | 1 + tests/unit/tabs/tabs_methods.js | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/unit/tabs/tabs_core.js b/tests/unit/tabs/tabs_core.js index 22ddd9172af..1407237213a 100644 --- a/tests/unit/tabs/tabs_core.js +++ b/tests/unit/tabs/tabs_core.js @@ -1,6 +1,7 @@ define([ "jquery", "./tabs_test_helpers", + "jquery.simulate", "ui/tabs" ], function( $, tabsTestHelper ) { diff --git a/tests/unit/tabs/tabs_methods.js b/tests/unit/tabs/tabs_methods.js index f97552890d7..60083b3bea6 100644 --- a/tests/unit/tabs/tabs_methods.js +++ b/tests/unit/tabs/tabs_methods.js @@ -1,8 +1,9 @@ define([ "jquery", + "helper/testsuite", "./tabs_test_helpers", "ui/tabs" -], function( $, tabsTestHelper ) { +], function( $, testHelper, tabsTestHelper ) { var disabled = tabsTestHelper.disabled, state = tabsTestHelper.state; @@ -11,10 +12,10 @@ module( "tabs: methods" ); test( "destroy", function() { expect( 2 ); - domEqual( "#tabs1", function() { + testHelper.domEqual( "#tabs1", function() { $( "#tabs1" ).tabs().tabs( "destroy" ); }); - domEqual( "#tabs2", function() { + testHelper.domEqual( "#tabs2", function() { $( "#tabs2" ).tabs().tabs( "destroy" ); }); }); From f44cb7cda0a4a32fbc9f7fa283c8d5e40cd105f9 Mon Sep 17 00:00:00 2001 From: Rafael Xavier de Souza Date: Wed, 10 Dec 2014 19:27:38 -0200 Subject: [PATCH 20/20] (fix) Tests: Replace resource loader with AMD Just swap this with the line below. --- tests/unit/helper/testsuite.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/helper/testsuite.js b/tests/unit/helper/testsuite.js index ac4927b7636..aa5877ffeca 100644 --- a/tests/unit/helper/testsuite.js +++ b/tests/unit/helper/testsuite.js @@ -263,8 +263,8 @@ exports.testJshint = function( module ) { return; } - require([ "jshint" ], function() { - asyncTest( "JSHint", function() { + asyncTest( "JSHint", function() { + require([ "jshint" ], function() { expect( 1 ); $.when(