nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1371065: Part 0 - Fix unit tests that use the SDK loader :/ r=Mossop

Browse source 
MozReview-Commit-ID: 4ewrbY0FS09

--HG--
extra : rebase_source : 390256a9eb0d303d8582c24d69fff189b0e0ab4d
This commit is contained in:
Kris Maglione 2017-09-08 18:16:50 -07:00
parent 90d4e89eb3
commit f829523282
6 changed files with 11 additions and 79 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

16
browser/components/syncedtabs/test/xpcshell/head.js
View file

@ -13,18 +13,6 @@ do_get_profile(); // fxa needs a profile directory for storage.
// Load mocking/stubbing library, sinon
// docs: http://sinonjs.org/releases/v2.3.2/
Cu.import("resource://gre/modules/Timer.jsm");
const {Loader} = Cu.import("resource://gre/modules/commonjs/toolkit/loader.js", {});
const loader = new Loader.Loader({
paths: {
"": "resource://testing-common/",
},
globals: {
setTimeout,
setInterval,
clearTimeout,
clearInterval,
},
});
const require = Loader.Require(loader, {id: ""});
const sinon = require("sinon-2.3.2");
Services.scriptloader.loadSubScript("resource://testing-common/sinon-2.3.2.js", this);
/* globals sinon */
// ================================================

16
browser/extensions/formautofill/test/unit/head.js
View file

@ -29,20 +29,8 @@ do_get_profile();
// Load mocking/stubbing library, sinon
// docs: http://sinonjs.org/releases/v2.3.2/
Cu.import("resource://gre/modules/Timer.jsm");
var {Loader} = Cu.import("resource://gre/modules/commonjs/toolkit/loader.js", {});
var loader = new Loader.Loader({
paths: {
"": "resource://testing-common/",
},
globals: {
setTimeout,
setInterval,
clearTimeout,
clearInterval,
},
});
var require = Loader.Require(loader, {id: ""});
var sinon = require("sinon-2.3.2");
Services.scriptloader.loadSubScript("resource://testing-common/sinon-2.3.2.js", this);
/* globals sinon */
// ================================================
// Load our bootstrap extension manifest so we can access our chrome/resource URIs.

16
browser/extensions/shield-recipe-client/test/unit/head_xpc.js
View file

@ -25,18 +25,6 @@ Components.manager.addBootstrappedManifestLocation(extensionDir);
// docs: http://sinonjs.org/releases/v2.3.2/
/* exported sinon */
Cu.import("resource://gre/modules/Timer.jsm");
const {Loader} = Cu.import("resource://gre/modules/commonjs/toolkit/loader.js", {});
const loader = new Loader.Loader({
paths: {
"": "resource://testing-common/",
},
globals: {
setTimeout,
setInterval,
clearTimeout,
clearInterval,
},
});
const require = Loader.Require(loader, {id: ""});
this.sinon = require("sinon-2.3.2");
Services.scriptloader.loadSubScript("resource://testing-common/sinon-2.3.2.js", this);
/* globals sinon */
// ================================================

16
services/fxaccounts/tests/xpcshell/head.js
View file

@ -24,18 +24,6 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
// Load mocking/stubbing library, sinon
// docs: http://sinonjs.org/releases/v2.3.2/
Cu.import("resource://gre/modules/Timer.jsm");
var {Loader} = Cu.import("resource://gre/modules/commonjs/toolkit/loader.js", {});
var loader = new Loader.Loader({
paths: {
"": "resource://testing-common/",
},
globals: {
setTimeout,
setInterval,
clearTimeout,
clearInterval,
},
});
var require = Loader.Require(loader, {id: ""});
var sinon = require("sinon-2.3.2");
Services.scriptloader.loadSubScript("resource://testing-common/sinon-2.3.2.js", this);
/* globals sinon */
// ================================================

16
services/sync/tests/unit/head_helpers.js
View file

@ -30,20 +30,8 @@ add_task(async function head_setup() {
// Load mocking/stubbing library, sinon
// docs: http://sinonjs.org/releases/v2.3.2/
Cu.import("resource://gre/modules/Timer.jsm");
var {Loader} = Cu.import("resource://gre/modules/commonjs/toolkit/loader.js", {});
var loader = new Loader.Loader({
paths: {
"": "resource://testing-common/",
},
globals: {
setTimeout,
setInterval,
clearTimeout,
clearInterval,
},
});
var require = Loader.Require(loader, {id: ""});
var sinon = require("sinon-2.3.2");
Services.scriptloader.loadSubScript("resource://testing-common/sinon-2.3.2.js", this);
/* globals sinon */
// ================================================
XPCOMUtils.defineLazyGetter(this, "SyncPingSchema", function() {

10
testing/mochitest/bootstrap.js vendored
View file

@ -50,15 +50,7 @@ function loadMochitest(e) {
WindowListener.setupWindow(win);
Services.wm.addListener(WindowListener);
let overlay;
if (flavor == "jetpack-addon") {
overlay = "chrome://mochikit/content/jetpack-addon-overlay.xul";
} else if (flavor == "jetpack-package") {
overlay = "chrome://mochikit/content/jetpack-package-overlay.xul";
} else {
overlay = "chrome://mochikit/content/browser-test-overlay.xul";
}
let overlay = "chrome://mochikit/content/browser-test-overlay.xul";
win.document.loadOverlay(overlay, null);
}