mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1176774 - Upgrade Loop's test libraries to latest versions. r=dmose 

--HG--
rename : browser/components/loop/test/shared/vendor/chai-2.1.0.js => browser/components/loop/test/shared/vendor/chai-3.0.0.js
rename : browser/components/loop/test/shared/vendor/chai-as-promised-4.3.0.js => browser/components/loop/test/shared/vendor/chai-as-promised-5.1.0.js
rename : browser/components/loop/test/shared/vendor/mocha-2.2.1.css => browser/components/loop/test/shared/vendor/mocha-2.2.5.css
rename : browser/components/loop/test/shared/vendor/mocha-2.2.1.js => browser/components/loop/test/shared/vendor/mocha-2.2.5.js
rename : browser/components/loop/test/shared/vendor/sinon-1.13.0.js => browser/components/loop/test/shared/vendor/sinon-1.15.0.js
This commit is contained in:
Mark Banner 2015-06-30 15:35:57 +01:00
Родитель 60a21fdda0
Коммит c08cb8180c
8 изменённых файлов: 1338 добавлений и 1123 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
browser/components/loop/test/desktop-local/index.html
Просмотреть файл

@ -6,7 +6,7 @@
<head>
<meta charset="utf-8">
<title>Loop desktop-local mocha tests</title>
<link rel="stylesheet" media="all" href="../shared/vendor/mocha-2.2.1.css">
<link rel="stylesheet" media="all" href="../shared/vendor/mocha-2.2.5.css">
</head>
<body>
<div id="mocha">
@ -29,9 +29,9 @@
<script src="../../content/shared/libs/backbone-1.1.2.js"></script>
<!-- test dependencies -->
<script src="../shared/vendor/mocha-2.2.1.js"></script>
<script src="../shared/vendor/chai-2.1.0.js"></script>
<script src="../shared/vendor/sinon-1.13.0.js"></script>
<script src="../shared/vendor/mocha-2.2.5.js"></script>
<script src="../shared/vendor/chai-3.0.0.js"></script>
<script src="../shared/vendor/sinon-1.15.0.js"></script>
<script>
/*global chai,mocha */
chai.config.includeStack = true;

10
browser/components/loop/test/shared/index.html
Просмотреть файл

@ -6,7 +6,7 @@
<head>
<meta charset="utf-8">
<title>Loop shared mocha tests</title>
<link rel="stylesheet" media="all" href="vendor/mocha-2.2.1.css">
<link rel="stylesheet" media="all" href="vendor/mocha-2.2.5.css">
</head>
<body>
<div id="mocha">
@ -29,10 +29,10 @@
<script src="../../standalone/content/libs/l10n-gaia-02ca67948fe8.js"></script>
<!-- test dependencies -->
<script src="vendor/mocha-2.2.1.js"></script>
<script src="vendor/chai-2.1.0.js"></script>
<script src="vendor/chai-as-promised-4.3.0.js"></script>
<script src="vendor/sinon-1.13.0.js"></script>
<script src="vendor/mocha-2.2.5.js"></script>
<script src="vendor/chai-3.0.0.js"></script>
<script src="vendor/chai-as-promised-5.1.0.js"></script>
<script src="vendor/sinon-1.15.0.js"></script>
<script>
/*global chai, mocha */
chai.config.includeStack = true;

2028
browser/components/loop/test/shared/vendor/chai-2.1.0.js → browser/components/loop/test/shared/vendor/chai-3.0.0.js поставляемый
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

26
browser/components/loop/test/shared/vendor/chai-as-promised-4.3.0.js → browser/components/loop/test/shared/vendor/chai-as-promised-5.1.0.js поставляемый
Просмотреть файл

@ -258,28 +258,22 @@
});
getterNames.forEach(function (getterName) {
var propertyDesc = propertyDescs[getterName];
// Chainable methods are things like `an`, which can work both for `.should.be.an.instanceOf` and as
// `should.be.an("object")`. We need to handle those specially.
var isChainableMethod = false;
try {
isChainableMethod = typeof propertyDesc.get.call({}) === "function";
} catch (e) { }
var isChainableMethod = Assertion.prototype.__methods.hasOwnProperty(getterName);
if (isChainableMethod) {
Assertion.addChainableMethod(
Assertion.overwriteChainableMethod(
getterName,
function () {
var assertion = this;
function originalMethod() {
return propertyDesc.get.call(assertion).apply(assertion, arguments);
}
doAsserterAsyncAndAddThen(originalMethod, this, arguments);
function (originalMethod) {
return function() {
doAsserterAsyncAndAddThen(originalMethod, this, arguments);
};
},
function () {
var originalGetter = propertyDesc.get;
doAsserterAsyncAndAddThen(originalGetter, this);
function (originalGetter) {
return function() {
doAsserterAsyncAndAddThen(originalGetter, this);
};
}
);
} else {

0
browser/components/loop/test/shared/vendor/mocha-2.2.1.css → browser/components/loop/test/shared/vendor/mocha-2.2.5.css поставляемый
Просмотреть файл

158
browser/components/loop/test/shared/vendor/mocha-2.2.1.js → browser/components/loop/test/shared/vendor/mocha-2.2.5.js поставляемый
Просмотреть файл

@ -1470,6 +1470,7 @@ function image(name) {
* - `bail` bail on the first test failure
* - `slow` milliseconds to wait before considering a test slow
* - `ignoreLeaks` ignore global leaks
* - `fullTrace` display the full stack-trace on failing
* - `grep` string or regexp to filter tests with
*
* @param {Object} options
@ -1487,7 +1488,7 @@ function Mocha(options) {
this.bail(options.bail);
this.reporter(options.reporter, options.reporterOptions);
if (null != options.timeout) this.timeout(options.timeout);
this.useColors(options.useColors)
this.useColors(options.useColors);
if (options.enableTimeouts !== null) this.enableTimeouts(options.enableTimeouts);
if (options.slow) this.slow(options.slow);
@ -1546,8 +1547,12 @@ Mocha.prototype.reporter = function(reporter, reporterOptions){
} else {
reporter = reporter || 'spec';
var _reporter;
try { _reporter = require('./reporters/' + reporter); } catch (err) {};
if (!_reporter) try { _reporter = require(reporter); } catch (err) {};
try { _reporter = require('./reporters/' + reporter); } catch (err) {}
if (!_reporter) try { _reporter = require(reporter); } catch (err) {
err.message.indexOf('Cannot find module') !== -1
? console.warn('"' + reporter + '" reporter not found')
: console.warn('"' + reporter + '" reporter blew up with error:\n' + err.stack);
}
if (!_reporter && reporter === 'teamcity')
console.warn('The Teamcity reporter was moved to a package named ' +
'mocha-teamcity-reporter ' +
@ -1569,7 +1574,7 @@ Mocha.prototype.reporter = function(reporter, reporterOptions){
Mocha.prototype.ui = function(name){
name = name || 'bdd';
this._ui = exports.interfaces[name];
if (!this._ui) try { this._ui = require(name); } catch (err) {};
if (!this._ui) try { this._ui = require(name); } catch (err) {}
if (!this._ui) throw new Error('invalid interface "' + name + '"');
this._ui = this._ui(this.suite);
return this;
@ -1670,6 +1675,18 @@ Mocha.prototype.checkLeaks = function(){
return this;
};
/**
* Display long stack-trace on failing
*
* @return {Mocha}
* @api public
*/
Mocha.prototype.fullTrace = function() {
this.options.fullStackTrace = true;
return this;
};
/**
* Enable growl support.
*
@ -1813,6 +1830,7 @@ Mocha.prototype.run = function(fn){
var runner = new exports.Runner(suite, options.delay);
var reporter = new this._reporter(runner, options);
runner.ignoreLeaks = false !== options.ignoreLeaks;
runner.fullStackTrace = options.fullStackTrace;
runner.asyncOnly = options.asyncOnly;
if (options.grep) runner.grep(options.grep, options.invert);
if (options.globals) runner.globals(options.globals);
@ -2137,18 +2155,26 @@ exports.list = function(failures){
var err = test.err
, message = err.message || ''
, stack = err.stack || message
, index = stack.indexOf(message) + message.length
, msg = stack.slice(0, index)
, index = stack.indexOf(message)
, actual = err.actual
, expected = err.expected
, escape = true;
if (index === -1) {
msg = message;
} else {
index += message.length;
msg = stack.slice(0, index);
// remove msg from stack
stack = stack.slice(index + 1);
}
// uncaught
if (err.uncaught) {
msg = 'Uncaught ' + msg;
}
// explicitly show diff
if (err.showDiff && sameType(actual, expected)) {
if (err.showDiff !== false && sameType(actual, expected)
&& expected !== undefined) {
if ('string' !== typeof actual) {
escape = false;
@ -2167,9 +2193,8 @@ exports.list = function(failures){
}
}
// indent stack trace without msg
stack = stack.slice(index ? index + 1 : index)
.replace(/^/gm, ' ');
// indent stack trace
stack = stack.replace(/^/gm, ' ');
console.log(fmt, (i + 1), test.fullTitle(), msg, stack);
});
@ -2525,7 +2550,7 @@ function Dot(runner) {
, n = -1;
runner.on('start', function(){
process.stdout.write('\n ');
process.stdout.write('\n');
});
runner.on('pending', function(test){
@ -3998,14 +4023,14 @@ function Spec(runner) {
if ('fast' == test.speed) {
var fmt = indent()
+ color('checkmark', ' ' + Base.symbols.ok)
+ color('pass', ' %s ');
+ color('pass', ' %s');
cursor.CR();
console.log(fmt, test.title);
} else {
var fmt = indent()
+ color('checkmark', ' ' + Base.symbols.ok)
+ color('pass', ' %s ')
+ color(test.speed, '(%dms)');
+ color('pass', ' %s')
+ color(test.speed, ' (%dms)');
cursor.CR();
console.log(fmt, test.title, test.duration);
}
@ -4565,7 +4590,8 @@ var EventEmitter = require('browser/events').EventEmitter
, filter = utils.filter
, keys = utils.keys
, type = utils.type
, stringify = utils.stringify;
, stringify = utils.stringify
, stackFilter = utils.stackTraceFilter();
/**
* Non-enumerable globals.
@ -4756,16 +4782,18 @@ Runner.prototype.checkGlobals = function(test){
* @api private
*/
Runner.prototype.fail = function(test, err){
Runner.prototype.fail = function(test, err) {
++this.failures;
test.state = 'failed';
if ('string' == typeof err) {
err = new Error('the string "' + err + '" was thrown, throw an Error :)');
} else if (!(err instanceof Error)) {
if (!(err instanceof Error)) {
err = new Error('the ' + type(err) + ' ' + stringify(err) + ' was thrown, throw an Error :)');
}
err.stack = (this.fullStackTrace || !err.stack)
? err.stack
: stackFilter(err.stack);
this.emit('fail', test, err);
};
@ -5253,24 +5281,24 @@ function filterLeaks(ok, globals) {
* @api private
*/
function extraGlobals() {
if (typeof(process) === 'object' &&
typeof(process.version) === 'string') {
function extraGlobals() {
if (typeof(process) === 'object' &&
typeof(process.version) === 'string') {
var nodeVersion = process.version.split('.').reduce(function(a, v) {
return a << 8 | v;
});
var nodeVersion = process.version.split('.').reduce(function(a, v) {
return a << 8 | v;
});
// 'errno' was renamed to process._errno in v0.9.11.
// 'errno' was renamed to process._errno in v0.9.11.
if (nodeVersion < 0x00090B) {
return ['errno'];
}
}
return [];
if (nodeVersion < 0x00090B) {
return ['errno'];
}
}
return [];
}
}); // module: runner.js
require.register("suite.js", function(module, exports, require){
@ -5915,7 +5943,7 @@ exports.slug = function(str){
exports.clean = function(str) {
str = str
.replace(/\r\n?|[\n\u2028\u2029]/g, "\n").replace(/^\uFEFF/, '')
.replace(/^function *\(.*\) *{|\(.*\) *=> *{?/, '')
.replace(/^function *\(.*\)\s*{|\(.*\) *=> *{?/, '')
.replace(/\s+\}$/, '');
var spaces = str.match(/^\n?( *)/)[1].length
@ -6308,6 +6336,70 @@ exports.getError = function(err) {
};
/**
* @summary
* This Filter based on `mocha-clean` module.(see: `github.com/rstacruz/mocha-clean`)
* @description
* When invoking this function you get a filter function that get the Error.stack as an input,
* and return a prettify output.
* (i.e: strip Mocha, node_modules, bower and componentJS from stack trace).
* @returns {Function}
*/
exports.stackTraceFilter = function() {
var slash = '/'
, is = typeof document === 'undefined'
? { node: true }
: { browser: true }
, cwd = is.node
? process.cwd() + slash
: location.href.replace(/\/[^\/]*$/, '/');
function isNodeModule (line) {
return (~line.indexOf('node_modules'));
}
function isMochaInternal (line) {
return (~line.indexOf('node_modules' + slash + 'mocha')) ||
(~line.indexOf('components' + slash + 'mochajs')) ||
(~line.indexOf('components' + slash + 'mocha'));
}
// node_modules, bower, componentJS
function isBrowserModule(line) {
return (~line.indexOf('node_modules')) ||
(~line.indexOf('components'));
}
function isNodeInternal (line) {
return (~line.indexOf('(timers.js:')) ||
(~line.indexOf('(events.js:')) ||
(~line.indexOf('(node.js:')) ||
(~line.indexOf('(module.js:')) ||
(~line.indexOf('GeneratorFunctionPrototype.next (native)')) ||
false
}
return function(stack) {
stack = stack.split('\n');
stack = exports.reduce(stack, function(list, line) {
if (is.node && (isNodeModule(line) ||
isMochaInternal(line) ||
isNodeInternal(line)))
return list;
if (is.browser && (isBrowserModule(line)))
return list;
// Clean up cwd(absolute)
list.push(line.replace(cwd, ''));
return list;
}, []);
return stack.join('\n');
}
};
}); // module: utils.js
// The global object is "self" in Web Workers.
var global = (function() { return this; })();

223
browser/components/loop/test/shared/vendor/sinon-1.13.0.js → browser/components/loop/test/shared/vendor/sinon-1.15.0.js поставляемый
Просмотреть файл

@ -1,5 +1,5 @@
/**
* Sinon.JS 1.13.0, 2015/03/05
* Sinon.JS 1.15.0, 2015/05/30
*
* @author Christian Johansen (christian@cjohansen.no)
* @author Contributors: https://github.com/cjohansen/Sinon.JS/blob/master/AUTHORS
@ -34,6 +34,7 @@
*/
(function (root, factory) {
'use strict';
if (typeof define === 'function' && define.amd) {
define('sinon', [], function () {
return (root.sinon = factory());
@ -44,7 +45,8 @@
root.sinon = factory();
}
}(this, function () {
var samsam, formatio;
'use strict';
var samsam, formatio, lolex;
(function () {
function define(mod, deps, fn) {
if (mod == "samsam") {
@ -1203,41 +1205,82 @@ var sinon = (function () {
return typeof obj === "function" && typeof obj.restore === "function" && obj.restore.sinon;
}
// Cheap way to detect if we have ES5 support.
var hasES5Support = "keys" in Object;
function makeApi(sinon) {
sinon.wrapMethod = function wrapMethod(object, property, method) {
if (!object) {
throw new TypeError("Should wrap property of object");
}
if (typeof method != "function") {
throw new TypeError("Method wrapper should be function");
if (typeof method != "function" && typeof method != "object") {
throw new TypeError("Method wrapper should be a function or a property descriptor");
}
var wrappedMethod = object[property],
error;
if (!isFunction(wrappedMethod)) {
error = new TypeError("Attempted to wrap " + (typeof wrappedMethod) + " property " +
property + " as function");
} else if (wrappedMethod.restore && wrappedMethod.restore.sinon) {
error = new TypeError("Attempted to wrap " + property + " which is already wrapped");
} else if (wrappedMethod.calledBefore) {
var verb = !!wrappedMethod.returns ? "stubbed" : "spied on";
error = new TypeError("Attempted to wrap " + property + " which is already " + verb);
}
if (error) {
if (wrappedMethod && wrappedMethod.stackTrace) {
error.stack += "\n--------------\n" + wrappedMethod.stackTrace;
function checkWrappedMethod(wrappedMethod) {
if (!isFunction(wrappedMethod)) {
error = new TypeError("Attempted to wrap " + (typeof wrappedMethod) + " property " +
property + " as function");
} else if (wrappedMethod.restore && wrappedMethod.restore.sinon) {
error = new TypeError("Attempted to wrap " + property + " which is already wrapped");
} else if (wrappedMethod.calledBefore) {
var verb = !!wrappedMethod.returns ? "stubbed" : "spied on";
error = new TypeError("Attempted to wrap " + property + " which is already " + verb);
}
if (error) {
if (wrappedMethod && wrappedMethod.stackTrace) {
error.stack += "\n--------------\n" + wrappedMethod.stackTrace;
}
throw error;
}
throw error;
}
var error, wrappedMethod;
// IE 8 does not support hasOwnProperty on the window object and Firefox has a problem
// when using hasOwn.call on objects from other frames.
var owned = object.hasOwnProperty ? object.hasOwnProperty(property) : hasOwn.call(object, property);
object[property] = method;
if (hasES5Support) {
var methodDesc = (typeof method == "function") ? {value: method} : method,
wrappedMethodDesc = sinon.getPropertyDescriptor(object, property),
i;
if (!wrappedMethodDesc) {
error = new TypeError("Attempted to wrap " + (typeof wrappedMethod) + " property " +
property + " as function");
} else if (wrappedMethodDesc.restore && wrappedMethodDesc.restore.sinon) {
error = new TypeError("Attempted to wrap " + property + " which is already wrapped");
}
if (error) {
if (wrappedMethodDesc && wrappedMethodDesc.stackTrace) {
error.stack += "\n--------------\n" + wrappedMethodDesc.stackTrace;
}
throw error;
}
var types = sinon.objectKeys(methodDesc);
for (i = 0; i < types.length; i++) {
wrappedMethod = wrappedMethodDesc[types[i]];
checkWrappedMethod(wrappedMethod);
}
mirrorProperties(methodDesc, wrappedMethodDesc);
for (i = 0; i < types.length; i++) {
mirrorProperties(methodDesc[types[i]], wrappedMethodDesc[types[i]]);
}
Object.defineProperty(object, property, methodDesc);
} else {
wrappedMethod = object[property];
checkWrappedMethod(wrappedMethod);
object[property] = method;
method.displayName = property;
}
method.displayName = property;
// Set up a stack trace which can be used later to find what line of
// code the original method was created on.
method.stackTrace = (new Error("Stack Trace for original")).stack;
@ -1247,15 +1290,28 @@ var sinon = (function () {
// If this fails (ex: localStorage on mobile safari) then force a reset
// via direct assignment.
if (!owned) {
delete object[property];
// In some cases `delete` may throw an error
try {
delete object[property];
} catch (e) {}
// For native code functions `delete` fails without throwing an error
// on Chrome < 43, PhantomJS, etc.
} else if (hasES5Support) {
Object.defineProperty(object, property, wrappedMethodDesc);
}
// Use strict equality comparison to check failures then force a reset
// via direct assignment.
if (object[property] === method) {
object[property] = wrappedMethod;
}
};
method.restore.sinon = true;
mirrorProperties(method, wrappedMethod);
if (!hasES5Support) {
mirrorProperties(method, wrappedMethod);
}
return method;
};
@ -1363,6 +1419,30 @@ var sinon = (function () {
return this.displayName || "sinon fake";
};
sinon.objectKeys = function objectKeys(obj) {
if (obj !== Object(obj)) {
throw new TypeError("sinon.objectKeys called on a non-object");
}
var keys = [];
var key;
for (key in obj) {
if (hasOwn.call(obj, key)) {
keys.push(key);
}
}
return keys;
};
sinon.getPropertyDescriptor = function getPropertyDescriptor(object, property) {
var proto = object, descriptor;
while (proto && !(descriptor = Object.getOwnPropertyDescriptor(proto, property))) {
proto = Object.getPrototypeOf(proto);
}
return descriptor;
}
sinon.getConfig = function (custom) {
var config = {};
custom = custom || {};
@ -2228,12 +2308,13 @@ var sinon = (function () {
*/
(function (sinon) {
function makeApi(sinon) {
var push = Array.prototype.push;
var slice = Array.prototype.slice;
var callId = 0;
function spy(object, property) {
function spy(object, property, types) {
if (!property && typeof object == "function") {
return spy.create(object);
}
@ -2242,8 +2323,16 @@ var sinon = (function () {
return spy.create(function () { });
}
var method = object[property];
return sinon.wrapMethod(object, property, spy.create(method));
if (types) {
var methodDesc = sinon.getPropertyDescriptor(object, property);
for (var i = 0; i < types.length; i++) {
methodDesc[types[i]] = spy.create(methodDesc[types[i]]);
}
return sinon.wrapMethod(object, property, methodDesc);
} else {
var method = object[property];
return sinon.wrapMethod(object, property, spy.create(method));
}
}
function matchingFake(fakes, args, strict) {
@ -2286,6 +2375,7 @@ var sinon = (function () {
return p.invoke(func, this, slice.call(arguments));
};
}
p.isSinonProxy = true;
return p;
}
@ -2546,10 +2636,12 @@ var sinon = (function () {
delegateToCalls("alwaysCalledWithMatch", false, "calledWithMatch");
delegateToCalls("calledWithExactly", true);
delegateToCalls("alwaysCalledWithExactly", false, "calledWithExactly");
delegateToCalls("neverCalledWith", false, "notCalledWith",
function () { return true; });
delegateToCalls("neverCalledWithMatch", false, "notCalledWithMatch",
function () { return true; });
delegateToCalls("neverCalledWith", false, "notCalledWith", function () {
return true;
});
delegateToCalls("neverCalledWithMatch", false, "notCalledWithMatch", function () {
return true;
});
delegateToCalls("threw", true);
delegateToCalls("alwaysThrew", false, "threw");
delegateToCalls("returned", true);
@ -3033,14 +3125,24 @@ var sinon = (function () {
(function (sinon) {
function makeApi(sinon) {
function stub(object, property, func) {
if (!!func && typeof func != "function") {
throw new TypeError("Custom stub should be function");
if (!!func && typeof func != "function" && typeof func != "object") {
throw new TypeError("Custom stub should be a function or a property descriptor");
}
var wrapper;
if (func) {
wrapper = sinon.spy && sinon.spy.create ? sinon.spy.create(func) : func;
if (typeof func == "function") {
wrapper = sinon.spy && sinon.spy.create ? sinon.spy.create(func) : func;
} else {
wrapper = func;
if (sinon.spy && sinon.spy.create) {
var types = sinon.objectKeys(wrapper);
for (var i = 0; i < types.length; i++) {
wrapper[types[i]] = sinon.spy.create(wrapper[types[i]]);
}
}
}
} else {
var stubLength = 0;
if (typeof object == "object" && typeof object[property] == "function") {
@ -3055,7 +3157,7 @@ var sinon = (function () {
if (typeof property === "undefined" && typeof object == "object") {
for (var prop in object) {
if (typeof object[prop] === "function") {
if (typeof sinon.getPropertyDescriptor(object, prop).value === "function") {
stub(object, prop);
}
}
@ -3210,6 +3312,10 @@ var sinon = (function () {
var match = sinon.match;
function mock(object) {
if (typeof console !== undefined && console.warn) {
console.warn("mock will be removed from Sinon.JS v2.0");
}
if (!object) {
return sinon.expectation.create("Anonymous mock");
}
@ -4285,7 +4391,7 @@ if (typeof sinon == "undefined") {
} else {
makeApi(sinon);
}
})(this);
})(typeof global !== "undefined" ? global : self);
/**
* @depend core.js
@ -4306,13 +4412,16 @@ if (typeof sinon == "undefined") {
var supportsProgress = typeof ProgressEvent !== "undefined";
var supportsCustomEvent = typeof CustomEvent !== "undefined";
var supportsFormData = typeof FormData !== "undefined";
var sinonXhr = { XMLHttpRequest: global.XMLHttpRequest };
sinonXhr.GlobalXMLHttpRequest = global.XMLHttpRequest;
sinonXhr.GlobalActiveXObject = global.ActiveXObject;
sinonXhr.supportsActiveX = typeof sinonXhr.GlobalActiveXObject != "undefined";
sinonXhr.supportsXHR = typeof sinonXhr.GlobalXMLHttpRequest != "undefined";
sinonXhr.workingXHR = sinonXhr.supportsXHR ? sinonXhr.GlobalXMLHttpRequest : sinonXhr.supportsActiveX
? function () { return new sinonXhr.GlobalActiveXObject("MSXML2.XMLHTTP.3.0") } : false;
? function () {
return new sinonXhr.GlobalActiveXObject("MSXML2.XMLHTTP.3.0")
} : false;
sinonXhr.supportsCORS = sinonXhr.supportsXHR && "withCredentials" in (new sinonXhr.GlobalXMLHttpRequest());
/*jsl:ignore*/
@ -4653,19 +4762,19 @@ if (typeof sinon == "undefined") {
}
}
this.dispatchEvent(new sinon.Event("readystatechange"));
switch (this.readyState) {
case FakeXMLHttpRequest.DONE:
this.dispatchEvent(new sinon.Event("load", false, false, this));
this.dispatchEvent(new sinon.Event("loadend", false, false, this));
this.upload.dispatchEvent(new sinon.Event("load", false, false, this));
if (supportsProgress) {
this.upload.dispatchEvent(new sinon.ProgressEvent("progress", {loaded: 100, total: 100}));
this.dispatchEvent(new sinon.ProgressEvent("progress", {loaded: 100, total: 100}));
}
this.upload.dispatchEvent(new sinon.Event("load", false, false, this));
this.dispatchEvent(new sinon.Event("load", false, false, this));
this.dispatchEvent(new sinon.Event("loadend", false, false, this));
break;
}
this.dispatchEvent(new sinon.Event("readystatechange"));
},
setRequestHeader: function setRequestHeader(header, value) {
@ -4709,7 +4818,7 @@ if (typeof sinon == "undefined") {
if (this.requestHeaders[contentType]) {
var value = this.requestHeaders[contentType].split(";");
this.requestHeaders[contentType] = value[0] + ";charset=utf-8";
} else if (!(data instanceof FormData)) {
} else if (supportsFormData && !(data instanceof FormData)) {
this.requestHeaders["Content-Type"] = "text/plain;charset=utf-8";
}
@ -4732,6 +4841,7 @@ if (typeof sinon == "undefined") {
this.responseText = null;
this.errorFlag = true;
this.requestHeaders = {};
this.responseHeaders = {};
if (this.readyState > FakeXMLHttpRequest.UNSENT && this.sendFlag) {
this.readyStateChange(FakeXMLHttpRequest.DONE);
@ -4905,7 +5015,7 @@ if (typeof sinon == "undefined") {
makeApi(sinon);
}
})(typeof global !== "undefined" ? global : this);
})(typeof global !== "undefined" ? global : self);
/**
* @depend fake_xdomain_request.js
@ -5010,7 +5120,9 @@ if (typeof sinon == "undefined") {
xhrObj.onSend = function () {
server.handleRequest(this);
if (server.autoRespond && !server.responding) {
if (server.respondImmediately) {
server.respond();
} else if (server.autoRespond && !server.responding) {
setTimeout(function () {
server.responding = false;
server.respond();
@ -5057,7 +5169,9 @@ if (typeof sinon == "undefined") {
return;
}
if (!this.responses) { this.responses = []; }
if (!this.responses) {
this.responses = [];
}
if (arguments.length == 1) {
body = method;
@ -5471,7 +5585,7 @@ if (typeof sinon == "undefined") {
}
if (callback.length) {
return function sinonAsyncSandboxedTest() {
return function sinonAsyncSandboxedTest(callback) {
return sinonSandboxedTest.apply(this, arguments);
};
}
@ -5551,11 +5665,9 @@ if (typeof sinon == "undefined") {
function makeApi(sinon) {
function testCase(tests, prefix) {
/*jsl:ignore*/
if (!tests || typeof tests != "object") {
throw new TypeError("sinon.testCase needs an object with test functions");
}
/*jsl:end*/
prefix = prefix || "test";
var rPrefix = new RegExp("^" + prefix);
@ -5564,13 +5676,9 @@ if (typeof sinon == "undefined") {
var tearDown = tests.tearDown;
for (testName in tests) {
if (tests.hasOwnProperty(testName)) {
if (tests.hasOwnProperty(testName) && !/^(setUp|tearDown)$/.test(testName)) {
property = tests[testName];
if (/^(setUp|tearDown)$/.test(testName)) {
continue;
}
if (typeof property == "function" && rPrefix.test(testName)) {
method = property;
@ -5643,7 +5751,7 @@ if (typeof sinon == "undefined") {
assert.fail("fake is not a spy");
}
if (method.proxy) {
if (method.proxy && method.proxy.isSinonProxy) {
verifyIsStub(method.proxy);
} else {
if (typeof method != "function") {
@ -5780,8 +5888,9 @@ if (typeof sinon == "undefined") {
};
mirrorPropAsAssertion("called", "expected %n to have been called at least once but was never called");
mirrorPropAsAssertion("notCalled", function (spy) { return !spy.called; },
"expected %n to not have been called but was called %c%C");
mirrorPropAsAssertion("notCalled", function (spy) {
return !spy.called;
}, "expected %n to not have been called but was called %c%C");
mirrorPropAsAssertion("calledOnce", "expected %n to be called once but was called %c%C");
mirrorPropAsAssertion("calledTwice", "expected %n to be called twice but was called %c%C");
mirrorPropAsAssertion("calledThrice", "expected %n to be called thrice but was called %c%C");

8
browser/components/loop/test/standalone/index.html
Просмотреть файл

@ -6,7 +6,7 @@
<head>
<meta charset="utf-8">
<title>Loop mocha tests</title>
<link rel="stylesheet" media="all" href="../shared/vendor/mocha-2.2.1.css">
<link rel="stylesheet" media="all" href="../shared/vendor/mocha-2.2.5.css">
</head>
<body>
<div id="mocha">
@ -29,9 +29,9 @@
<script src="../../content/shared/libs/backbone-1.1.2.js"></script>
<script src="../../standalone/content/libs/l10n-gaia-02ca67948fe8.js"></script>
<!-- test dependencies -->
<script src="../shared/vendor/mocha-2.2.1.js"></script>
<script src="../shared/vendor/chai-2.1.0.js"></script>
<script src="../shared/vendor/sinon-1.13.0.js"></script>
<script src="../shared/vendor/mocha-2.2.5.js"></script>
<script src="../shared/vendor/chai-3.0.0.js"></script>
<script src="../shared/vendor/sinon-1.15.0.js"></script>
<script src="../shared/sdk_mock.js"></script>
<script>
chai.config.includeStack = true;