author | Julian Descottes <jdescottes@mozilla.com> |
Wed, 01 Feb 2017 01:57:34 +0100 | |
changeset 342229 | 0ad03e9002528f650199d9d3d9d8f09e5da86999 |
parent 342228 | ef9db85bfdd7268cdb82fa35b61710928e73ff3d |
child 342230 | 925f3f0167c35a015dad7403219676e932411949 |
push id | 31346 |
push user | kwierso@gmail.com |
push date | Fri, 10 Feb 2017 22:33:24 +0000 |
treeherder | mozilla-central@7b9d9e4a82a6 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | nchevobbe |
bugs | 1330779 |
milestone | 54.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/devtools/client/shared/components/reps/rep.js +++ b/devtools/client/shared/components/reps/rep.js @@ -160,16 +160,17 @@ define(function (require, exports, modul Grip, GripArray, GripMap, InfinityRep, LongStringRep, NaNRep, Null, Number, + Obj, ObjectWithText, ObjectWithURL, PromiseRep, RegExp, Rep, StringRep, StyleSheet, SymbolRep,
--- a/devtools/client/shared/components/reps/test/mochitest/chrome.ini +++ b/devtools/client/shared/components/reps/test/mochitest/chrome.ini @@ -25,9 +25,9 @@ support-files = [test_reps_object-with-url.html] [test_reps_promise.html] [test_reps_regexp.html] [test_reps_string.html] [test_reps_stylesheet.html] [test_reps_symbol.html] [test_reps_text-node.html] [test_reps_undefined.html] -[test_reps_window.html] \ No newline at end of file +[test_reps_window.html]
--- a/devtools/client/shared/components/reps/test/mochitest/head.js +++ b/devtools/client/shared/components/reps/test/mochitest/head.js @@ -8,16 +8,17 @@ var { classes: Cc, interfaces: Ci, utils: Cu, results: Cr } = Components; var { require } = Cu.import("resource://devtools/shared/Loader.jsm", {}); var { Assert } = require("resource://testing-common/Assert.jsm"); var { gDevTools } = require("devtools/client/framework/devtools"); var { BrowserLoader } = Cu.import("resource://devtools/client/shared/browser-loader.js", {}); var flags = require("devtools/shared/flags"); var { Task } = require("devtools/shared/task"); +var DevToolsUtils = require("devtools/shared/DevToolsUtils"); flags.testing = true; var { require: browserRequire } = BrowserLoader({ baseURI: "resource://devtools/client/shared/", window }); let ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom");
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_array.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_array.html @@ -15,19 +15,18 @@ Test ArrayRep rep <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> "use strict"; /* import-globals-from head.js */ window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { ArrayRep } = browserRequire("devtools/client/shared/components/reps/array"); - const { MODE } = browserRequire("devtools/client/shared/components/reps/constants"); + const { REPS, MODE } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, ArrayRep } = REPS; let componentUnderTest = ArrayRep; const maxLength = { short: 3, long: 10 }; try {
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_attribute.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_attribute.html @@ -13,18 +13,18 @@ Test Attribute rep <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { try { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { Attribute } = browserRequire("devtools/client/shared/components/reps/attribute"); + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, Attribute } = REPS; let gripStub = { "type": "object", "class": "Attr", "actor": "server1.conn19.obj65", "extensible": true, "frozen": false, "sealed": false,
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_comment-node.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_comment-node.html @@ -15,19 +15,18 @@ Test comment-node rep <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> "use strict"; window.onload = Task.async(function* () { try { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { CommentNode } = browserRequire("devtools/client/shared/components/reps/comment-node"); - const { MODE } = browserRequire("devtools/client/shared/components/reps/constants"); + const { REPS, MODE } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, CommentNode } = REPS; let gripStub = { "type": "object", "actor": "server1.conn1.child1/obj47", "class": "Comment", "extensible": true, "frozen": false, "sealed": false,
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_date-time.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_date-time.html @@ -12,18 +12,18 @@ Test DateTime rep <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { DateTime } = browserRequire("devtools/client/shared/components/reps/date-time"); + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, DateTime } = REPS; try { testValid(); testInvalid(); } catch(e) { ok(false, "Got an error: " + DevToolsUtils.safeErrorString(e)); } finally { SimpleTest.finish();
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_document.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_document.html @@ -12,18 +12,18 @@ Test Document rep <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { Document } = browserRequire("devtools/client/shared/components/reps/document"); + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, Document } = REPS; try { let gripStub = { "type": "object", "class": "HTMLDocument", "actor": "server1.conn17.obj115", "extensible": true, "frozen": false,
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_element-node.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_element-node.html @@ -14,19 +14,18 @@ Test Element node rep </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> "use strict"; window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { ElementNode } = browserRequire("devtools/client/shared/components/reps/element-node"); - const { MODE } = browserRequire("devtools/client/shared/components/reps/constants"); + const { REPS, MODE } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, ElementNode } = REPS; try { yield testBodyNode(); yield testDocumentElement(); yield testNode(); yield testNodeWithLeadingAndTrailingSpacesClassName(); yield testNodeWithoutAttributes(); yield testLotsOfAttributes();
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_error.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_error.html @@ -14,19 +14,18 @@ Test Error rep </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> "use strict"; window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { ErrorRep } = browserRequire("devtools/client/shared/components/reps/error"); - const { MODE } = browserRequire("devtools/client/shared/components/reps/constants"); + const { REPS, MODE } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, ErrorRep } = REPS; try { // Test errors with different properties yield testSimpleError(); yield testMultilineStackError(); yield testErrorWithoutStacktrace(); // Test different kind of errors
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_event.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_event.html @@ -12,19 +12,18 @@ Test Event rep <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { Event } = browserRequire("devtools/client/shared/components/reps/event"); - const { MODE } = browserRequire("devtools/client/shared/components/reps/constants"); + const { REPS, MODE } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, Event } = REPS; try { // Test that correct rep is chosen const renderedRep = shallowRenderComponent(Rep, { object: getGripStub("testEvent") }); is(renderedRep.type, Event.rep, `Rep correctly selects ${Event.rep.displayName}`); yield testEvent(); yield testMouseEvent();
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_failure.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_failure.html @@ -13,19 +13,18 @@ Test fallback for rep rendering when a r <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { try { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { ArrayRep } = browserRequire("devtools/client/shared/components/reps/array"); - let { RegExp } = browserRequire("devtools/client/shared/components/reps/regexp"); + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, ArrayRep, RegExp } = REPS; // Force the RegExp rep to crash by creating RegExp grip that throws when accessing // the displayString property let gripStub = { "type": "object", "class": "RegExp", "actor": "server1.conn22.obj39", "extensible": true,
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_function.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_function.html @@ -12,18 +12,18 @@ Test Func rep <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { Func } = browserRequire("devtools/client/shared/components/reps/function"); + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, Func } = REPS; const componentUnderTest = Func; try { // Test that correct rep is chosen const gripStub = getGripStub("testNamed"); const renderedRep = shallowRenderComponent(Rep, { object: gripStub }); is(renderedRep.type, Func.rep, `Rep correctly selects ${Func.rep.displayName}`);
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_grip-array.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_grip-array.html @@ -12,19 +12,18 @@ Test GripArray rep <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { GripArray } = browserRequire("devtools/client/shared/components/reps/grip-array"); - const { MODE } = browserRequire("devtools/client/shared/components/reps/constants"); + const { REPS, MODE } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, GripArray } = REPS; let componentUnderTest = GripArray; const maxLength = { short: 3, long: 10 }; try {
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_grip-map.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_grip-map.html @@ -14,19 +14,18 @@ Test GripMap rep </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> "use strict"; window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { GripMap } = browserRequire("devtools/client/shared/components/reps/grip-map"); - const { MODE } = browserRequire("devtools/client/shared/components/reps/constants"); + const { REPS, MODE } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, GripMap } = REPS; const componentUnderTest = GripMap; try { yield testEmptyMap(); yield testSymbolKeyedMap(); yield testWeakMap();
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_grip.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_grip.html @@ -12,19 +12,18 @@ Test grip rep <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { Grip } = browserRequire("devtools/client/shared/components/reps/grip"); - const { MODE } = browserRequire("devtools/client/shared/components/reps/constants"); + const { REPS, MODE } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, Grip } = REPS; const componentUnderTest = Grip; try { yield testBasic(); yield testBooleanObject(); yield testNumberObject(); yield testStringObject();
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_infinity.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_infinity.html @@ -14,18 +14,18 @@ Test Infinity rep </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> "use strict"; window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { InfinityRep } = browserRequire("devtools/client/shared/components/reps/infinity"); + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, InfinityRep } = REPS; try { yield testInfinity(); yield testNegativeInfinity(); } catch (e) { ok(false, "Got an error: " + DevToolsUtils.safeErrorString(e)); } finally { SimpleTest.finish();
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_long-string.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_long-string.html @@ -12,18 +12,18 @@ Test LongString rep <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { LongStringRep } = browserRequire("devtools/client/shared/components/reps/long-string"); + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, LongStringRep } = REPS; try { // Test that correct rep is chosen const renderedRep = shallowRenderComponent(Rep, { object: getGripStub("testMultiline") }); is(renderedRep.type, LongStringRep.rep, `Rep correctly selects ${LongStringRep.rep.displayName}`); // Test rendering
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_nan.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_nan.html @@ -14,18 +14,18 @@ Test NaN rep </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> "use strict"; window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { NaNRep } = browserRequire("devtools/client/shared/components/reps/nan"); + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, NaNRep } = REPS; try { yield testNaN(); } catch (e) { ok(false, "Got an error: " + DevToolsUtils.safeErrorString(e)); } finally { SimpleTest.finish(); }
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_null.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_null.html @@ -13,18 +13,18 @@ Test Null rep <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { try { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { Null } = browserRequire("devtools/client/shared/components/reps/null"); + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, Null } = REPS; let gripStub = { "type": "null" }; // Test that correct rep is chosen const renderedRep = shallowRenderComponent(Rep, { object: gripStub }); is(renderedRep.type, Null.rep, `Rep correctly selects ${Null.rep.displayName}`);
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_number.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_number.html @@ -12,18 +12,18 @@ Test Number rep <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { Number } = browserRequire("devtools/client/shared/components/reps/number"); + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, Number } = REPS; try { yield testInt(); yield testBoolean(); yield testNegativeZero(); yield testUnsafeInt(); } catch(e) { ok(false, "Got an error: " + DevToolsUtils.safeErrorString(e));
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_object-with-text.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_object-with-text.html @@ -13,18 +13,18 @@ Test ObjectWithText rep <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { try { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { ObjectWithText } = browserRequire("devtools/client/shared/components/reps/object-with-text"); + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, ObjectWithText } = REPS; let gripStub = { "type": "object", "class": "CSSStyleRule", "actor": "server1.conn3.obj273", "extensible": true, "frozen": false, "sealed": false,
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_object-with-url.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_object-with-url.html @@ -15,18 +15,19 @@ Test ObjectWithURL rep <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { try { let ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom"); let React = browserRequire("devtools/client/shared/vendor/react"); - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { ObjectWithURL } = browserRequire("devtools/client/shared/components/reps/object-with-url"); + + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, ObjectWithURL } = REPS; let gripStub = { "type": "object", "class": "Location", "actor": "server1.conn2.obj272", "extensible": true, "frozen": false, "sealed": false,
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_object.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_object.html @@ -12,19 +12,18 @@ Test Obj rep <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { Obj } = browserRequire("devtools/client/shared/components/reps/object"); - const { MODE } = browserRequire("devtools/client/shared/components/reps/constants"); + const { REPS, MODE } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, Obj } = REPS; const componentUnderTest = Obj; try { yield testBasic(); // Test property iterator yield testMaxProps();
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_promise.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_promise.html @@ -14,19 +14,18 @@ Test Promise rep </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> "use strict"; window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { PromiseRep } = browserRequire("devtools/client/shared/components/reps/promise"); - const { MODE } = browserRequire("devtools/client/shared/components/reps/constants"); + const { REPS, MODE } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, PromiseRep } = REPS; const componentUnderTest = PromiseRep; try { yield testPending(); yield testFulfilledWithNumber(); yield testFulfilledWithString(); yield testFulfilledWithObject();
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_regexp.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_regexp.html @@ -13,18 +13,18 @@ Test RegExp rep <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { try { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { RegExp } = browserRequire("devtools/client/shared/components/reps/regexp"); + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, RegExp } = REPS; let gripStub = { "type": "object", "class": "RegExp", "actor": "server1.conn22.obj39", "extensible": true, "frozen": false, "sealed": false,
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_string.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_string.html @@ -12,18 +12,18 @@ Test String rep <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script> <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { StringRep } = browserRequire("devtools/client/shared/components/reps/string"); + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, StringRep } = REPS; try { // Test that correct rep is chosen const renderedRep = shallowRenderComponent(Rep, { object: getGripStub("testMultiline") }); is(renderedRep.type, StringRep.rep, `Rep correctly selects ${StringRep.rep.displayName}`); // Test rendering yield testMultiline();
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_stylesheet.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_stylesheet.html @@ -13,18 +13,18 @@ Test Stylesheet rep <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"> </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { try { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { StyleSheet } = browserRequire("devtools/client/shared/components/reps/stylesheet"); + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, StyleSheet } = REPS; let gripStub = { "type": "object", "class": "CSSStyleSheet", "actor": "server1.conn2.obj1067", "extensible": true, "frozen": false, "sealed": false,
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_symbol.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_symbol.html @@ -15,18 +15,18 @@ Test Symbol rep <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> "use strict"; /* import-globals-from head.js */ window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { SymbolRep } = browserRequire("devtools/client/shared/components/reps/symbol"); + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, SymbolRep } = REPS; let gripStubs = new Map(); gripStubs.set("testSymbolFoo", { type: "symbol", name: "foo" }); gripStubs.set("testSymbolWithoutIdentifier", { type: "symbol"
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_text-node.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_text-node.html @@ -14,19 +14,18 @@ Test text-node rep </head> <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> "use strict"; window.onload = Task.async(function* () { - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { TextNode } = browserRequire("devtools/client/shared/components/reps/text-node"); - const { MODE } = browserRequire("devtools/client/shared/components/reps/constants"); + const { REPS, MODE } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, TextNode } = REPS; let gripStubs = new Map(); gripStubs.set("testRendering", { "class": "Text", "actor": "server1.conn1.child1/obj50", "preview": { "textContent": "hello world" }
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_undefined.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_undefined.html @@ -15,18 +15,18 @@ Test undefined rep <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { try { let ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom"); let React = browserRequire("devtools/client/shared/vendor/react"); - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { Undefined } = browserRequire("devtools/client/shared/components/reps/undefined"); + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, Undefined } = REPS; let gripStub = { "type": "undefined" }; // Test that correct rep is chosen const renderedRep = shallowRenderComponent(Rep, { object: gripStub }); is(renderedRep.type, Undefined.rep, `Rep correctly selects ${Undefined.rep.displayName}`);
--- a/devtools/client/shared/components/reps/test/mochitest/test_reps_window.html +++ b/devtools/client/shared/components/reps/test/mochitest/test_reps_window.html @@ -15,18 +15,19 @@ Test window rep <body> <pre id="test"> <script src="head.js" type="application/javascript;version=1.8"></script> <script type="application/javascript;version=1.8"> window.onload = Task.async(function* () { try { let ReactDOM = browserRequire("devtools/client/shared/vendor/react-dom"); let React = browserRequire("devtools/client/shared/vendor/react"); - let { Rep } = browserRequire("devtools/client/shared/components/reps/rep"); - let { Window } = browserRequire("devtools/client/shared/components/reps/window"); + + const { REPS } = browserRequire("devtools/client/shared/components/reps/load-reps"); + let { Rep, Window } = REPS; let gripStub = { "type": "object", "class": "Window", "actor": "server1.conn3.obj198", "extensible": true, "frozen": false, "sealed": false,