Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1240907 - Clean up code style in test-actor-registry.js. r=ochameau

Browse Source 
MozReview-Commit-ID: GKAKgnVDimD
This commit is contained in:
J. Ryan Stinnett 2016-07-06 17:23:01 -05:00
parent 8d82d10366
commit efa881ac27
2 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintignore
View File

@ -99,6 +99,7 @@ devtools/client/shared/developer-toolbar.js
devtools/client/shared/components/test/**
devtools/client/shared/redux/middleware/test/**
devtools/client/shared/test/**
!devtools/client/shared/test/test-actor-registry.js
devtools/client/shared/widgets/*.jsm
devtools/client/sourceeditor/**
devtools/client/webaudioeditor/**

68
devtools/client/shared/test/test-actor-registry.js
View File

@ -4,32 +4,27 @@
"use strict";
(function (exports) {
const Cu = Components.utils;
const CC = Components.Constructor;
var Cu = Components.utils;
var Ci = Components.interfaces;
var Cc = Components.classes;
var CC = Components.Constructor;
const { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
const { fetch } = require("devtools/shared/DevToolsUtils");
const defer = require("devtools/shared/defer");
const { Task } = require("devtools/shared/task");
var { require } = Cu.import("resource://devtools/shared/Loader.jsm", {});
var { NetUtil } = Cu.import("resource://gre/modules/NetUtil.jsm", {});
var { fetch } = require("devtools/shared/DevToolsUtils");
var promise = require("promise");
var defer = require("devtools/shared/defer");
const TEST_URL_ROOT = "http://example.com/browser/devtools/client/shared/test/";
const ACTOR_URL = TEST_URL_ROOT + "test-actor.js";
var TEST_URL_ROOT = "http://example.com/browser/devtools/client/shared/test/";
var ACTOR_URL = TEST_URL_ROOT + "test-actor.js";
// Register a test actor that can operate on the remote document
// Register a test actor that can operate on the remote document
exports.registerTestActor = Task.async(function* (client) {
// First, instanciate ActorRegistryFront to be able to dynamically
// register an actor
// First, instanciate ActorRegistryFront to be able to dynamically register an actor
let deferred = defer();
client.listTabs(deferred.resolve);
let response = yield deferred.promise;
let { ActorRegistryFront } = require("devtools/shared/fronts/actor-registry");
let registryFront = ActorRegistryFront(client, response);
// Then ask to register our test-actor to retrieve its front
// Then ask to register our test-actor to retrieve its front
let options = {
type: { tab: true },
constructor: "TestActor",
@ -39,40 +34,38 @@
return testActorFront;
});
// Load the test actor in a custom sandbox
// as we can't use SDK module loader with URIs
var loadFront = Task.async(function* () {
// Load the test actor in a custom sandbox as we can't use SDK module loader with URIs
let loadFront = Task.async(function* () {
let sourceText = yield request(ACTOR_URL);
const principal = CC("@mozilla.org/systemprincipal;1", "nsIPrincipal")();
const sandbox = Cu.Sandbox(principal);
const exports = sandbox.exports = {};
sandbox.exports = {};
sandbox.require = require;
Cu.evalInSandbox(sourceText, sandbox, "1.8", ACTOR_URL, 1);
return sandbox.exports;
});
// Ensure fetching a live TabActor form for the targeted app
// (helps fetching the test actor registered dynamically)
var getUpdatedForm = function (client, tab) {
// Ensure fetching a live TabActor form for the targeted app
// (helps fetching the test actor registered dynamically)
let getUpdatedForm = function (client, tab) {
return client.getTab({tab: tab})
.then(response => response.tab);
.then(response => response.tab);
};
// Spawn an instance of the test actor for the given toolbox
// Spawn an instance of the test actor for the given toolbox
exports.getTestActor = Task.async(function* (toolbox) {
let client = toolbox.target.client;
return getTestActor(client, toolbox.target.tab, toolbox);
});
// Sometimes, we need the test actor before opening or without a toolbox
// then just create a front for the given `tab`
// Sometimes, we need the test actor before opening or without a toolbox then just
// create a front for the given `tab`
exports.getTestActorWithoutToolbox = Task.async(function* (tab) {
let { DebuggerServer } = require("devtools/server/main");
let { DebuggerClient } = require("devtools/shared/client/main");
// We need to spawn a client instance,
// but for that we have to first ensure a server is running
// We need to spawn a client instance,
// but for that we have to first ensure a server is running
if (!DebuggerServer.initialized) {
DebuggerServer.init();
DebuggerServer.addBrowserActors();
@ -81,25 +74,24 @@
yield client.connect();
// We also need to make sure the test actor is registered on the server.
yield registerTestActor(client);
// We also need to make sure the test actor is registered on the server.
yield exports.registerTestActor(client);
return getTestActor(client, tab);
});
// Fetch the content of a URI
var request = function (uri) {
// Fetch the content of a URI
let request = function (uri) {
return fetch(uri).then(({ content }) => content);
};
var getTestActor = Task.async(function* (client, tab, toolbox) {
// We may have to update the form in order to get the dynamically registered
// test actor.
let getTestActor = Task.async(function* (client, tab, toolbox) {
// We may have to update the form in order to get the dynamically registered
// test actor.
let form = yield getUpdatedForm(client, tab);
let { TestActorFront } = yield loadFront();
return new TestActorFront(client, form, toolbox);
});
})(this);