From b2a1b13d59a4d584d3f4cade594548bc417838dd Mon Sep 17 00:00:00 2001
From: Julian Descottes <julian.descottes@gmail.com>
Date: Wed, 18 Jan 2017 17:42:04 +0100
Subject: [PATCH] migrate reps tests to use load-reps

---
 src/reps/rep.js                                    | 1 +
 src/test/mochitest/test_reps_array.html            | 5 ++---
 src/test/mochitest/test_reps_attribute.html        | 4 ++--
 src/test/mochitest/test_reps_comment-node.html     | 5 ++---
 src/test/mochitest/test_reps_date-time.html        | 4 ++--
 src/test/mochitest/test_reps_document.html         | 4 ++--
 src/test/mochitest/test_reps_element-node.html     | 5 ++---
 src/test/mochitest/test_reps_error.html            | 5 ++---
 src/test/mochitest/test_reps_event.html            | 5 ++---
 src/test/mochitest/test_reps_failure.html          | 5 ++---
 src/test/mochitest/test_reps_function.html         | 4 ++--
 src/test/mochitest/test_reps_grip-array.html       | 5 ++---
 src/test/mochitest/test_reps_grip-map.html         | 5 ++---
 src/test/mochitest/test_reps_grip.html             | 5 ++---
 src/test/mochitest/test_reps_infinity.html         | 4 ++--
 src/test/mochitest/test_reps_long-string.html      | 4 ++--
 src/test/mochitest/test_reps_nan.html              | 4 ++--
 src/test/mochitest/test_reps_null.html             | 4 ++--
 src/test/mochitest/test_reps_number.html           | 4 ++--
 src/test/mochitest/test_reps_object-with-text.html | 4 ++--
 src/test/mochitest/test_reps_object-with-url.html  | 5 +++--
 src/test/mochitest/test_reps_object.html           | 5 ++---
 src/test/mochitest/test_reps_promise.html          | 5 ++---
 src/test/mochitest/test_reps_regexp.html           | 4 ++--
 src/test/mochitest/test_reps_string.html           | 4 ++--
 src/test/mochitest/test_reps_stylesheet.html       | 4 ++--
 src/test/mochitest/test_reps_symbol.html           | 4 ++--
 src/test/mochitest/test_reps_text-node.html        | 5 ++---
 src/test/mochitest/test_reps_undefined.html        | 4 ++--
 src/test/mochitest/test_reps_window.html           | 5 +++--
 30 files changed, 61 insertions(+), 70 deletions(-)

diff --git a/src/reps/rep.js b/src/reps/rep.js
index c7566ad..ab84da9 100644
--- a/src/reps/rep.js
+++ b/src/reps/rep.js
@@ -152,6 +152,7 @@ module.exports = {
     NaNRep,
     Null,
     Number,
+    Obj,
     ObjectWithText,
     ObjectWithURL,
     PromiseRep,
diff --git a/src/test/mochitest/test_reps_array.html b/src/test/mochitest/test_reps_array.html
index 07a3e4e..24fb11e 100644
--- a/src/test/mochitest/test_reps_array.html
+++ b/src/test/mochitest/test_reps_array.html
@@ -20,9 +20,8 @@
 /* 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 = {
diff --git a/src/test/mochitest/test_reps_attribute.html b/src/test/mochitest/test_reps_attribute.html
index aa8a5df..a19a868 100644
--- a/src/test/mochitest/test_reps_attribute.html
+++ b/src/test/mochitest/test_reps_attribute.html
@@ -18,8 +18,8 @@
 <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",
diff --git a/src/test/mochitest/test_reps_comment-node.html b/src/test/mochitest/test_reps_comment-node.html
index 78f5a57..a746327 100644
--- a/src/test/mochitest/test_reps_comment-node.html
+++ b/src/test/mochitest/test_reps_comment-node.html
@@ -20,9 +20,8 @@
 
 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",
diff --git a/src/test/mochitest/test_reps_date-time.html b/src/test/mochitest/test_reps_date-time.html
index a82783b..6c5d52f 100644
--- a/src/test/mochitest/test_reps_date-time.html
+++ b/src/test/mochitest/test_reps_date-time.html
@@ -17,8 +17,8 @@
 <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();
diff --git a/src/test/mochitest/test_reps_document.html b/src/test/mochitest/test_reps_document.html
index 2afabca..2f395ec 100644
--- a/src/test/mochitest/test_reps_document.html
+++ b/src/test/mochitest/test_reps_document.html
@@ -17,8 +17,8 @@
 <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 = {
diff --git a/src/test/mochitest/test_reps_element-node.html b/src/test/mochitest/test_reps_element-node.html
index 8713eaf..2244b50 100644
--- a/src/test/mochitest/test_reps_element-node.html
+++ b/src/test/mochitest/test_reps_element-node.html
@@ -19,9 +19,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();
diff --git a/src/test/mochitest/test_reps_error.html b/src/test/mochitest/test_reps_error.html
index 3dea9af..167101a 100644
--- a/src/test/mochitest/test_reps_error.html
+++ b/src/test/mochitest/test_reps_error.html
@@ -19,9 +19,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
diff --git a/src/test/mochitest/test_reps_event.html b/src/test/mochitest/test_reps_event.html
index 810a2a5..4c2fa88 100644
--- a/src/test/mochitest/test_reps_event.html
+++ b/src/test/mochitest/test_reps_event.html
@@ -17,9 +17,8 @@
 <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
diff --git a/src/test/mochitest/test_reps_failure.html b/src/test/mochitest/test_reps_failure.html
index 4a61f47..00ba796 100644
--- a/src/test/mochitest/test_reps_failure.html
+++ b/src/test/mochitest/test_reps_failure.html
@@ -18,9 +18,8 @@
 <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
diff --git a/src/test/mochitest/test_reps_function.html b/src/test/mochitest/test_reps_function.html
index ede6943..606391a 100644
--- a/src/test/mochitest/test_reps_function.html
+++ b/src/test/mochitest/test_reps_function.html
@@ -17,8 +17,8 @@
 <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;
 
diff --git a/src/test/mochitest/test_reps_grip-array.html b/src/test/mochitest/test_reps_grip-array.html
index 174756c..35f0596 100644
--- a/src/test/mochitest/test_reps_grip-array.html
+++ b/src/test/mochitest/test_reps_grip-array.html
@@ -17,9 +17,8 @@
 <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 = {
diff --git a/src/test/mochitest/test_reps_grip-map.html b/src/test/mochitest/test_reps_grip-map.html
index 52c5950..f2fccc1 100644
--- a/src/test/mochitest/test_reps_grip-map.html
+++ b/src/test/mochitest/test_reps_grip-map.html
@@ -19,9 +19,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;
 
diff --git a/src/test/mochitest/test_reps_grip.html b/src/test/mochitest/test_reps_grip.html
index ff9f2f5..6c5dfab 100644
--- a/src/test/mochitest/test_reps_grip.html
+++ b/src/test/mochitest/test_reps_grip.html
@@ -17,9 +17,8 @@
 <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;
 
diff --git a/src/test/mochitest/test_reps_infinity.html b/src/test/mochitest/test_reps_infinity.html
index e3a7e87..fde189a 100644
--- a/src/test/mochitest/test_reps_infinity.html
+++ b/src/test/mochitest/test_reps_infinity.html
@@ -19,8 +19,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();
diff --git a/src/test/mochitest/test_reps_long-string.html b/src/test/mochitest/test_reps_long-string.html
index 3caaac9..564e037 100644
--- a/src/test/mochitest/test_reps_long-string.html
+++ b/src/test/mochitest/test_reps_long-string.html
@@ -17,8 +17,8 @@
 <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
diff --git a/src/test/mochitest/test_reps_nan.html b/src/test/mochitest/test_reps_nan.html
index 35dc5a0..eff152b 100644
--- a/src/test/mochitest/test_reps_nan.html
+++ b/src/test/mochitest/test_reps_nan.html
@@ -19,8 +19,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();
diff --git a/src/test/mochitest/test_reps_null.html b/src/test/mochitest/test_reps_null.html
index 99a06fe..ebd7c88 100644
--- a/src/test/mochitest/test_reps_null.html
+++ b/src/test/mochitest/test_reps_null.html
@@ -18,8 +18,8 @@
 <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"
diff --git a/src/test/mochitest/test_reps_number.html b/src/test/mochitest/test_reps_number.html
index 50f91d8..3a5285b 100644
--- a/src/test/mochitest/test_reps_number.html
+++ b/src/test/mochitest/test_reps_number.html
@@ -17,8 +17,8 @@
 <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();
diff --git a/src/test/mochitest/test_reps_object-with-text.html b/src/test/mochitest/test_reps_object-with-text.html
index eeb4aa3..651f76c 100644
--- a/src/test/mochitest/test_reps_object-with-text.html
+++ b/src/test/mochitest/test_reps_object-with-text.html
@@ -18,8 +18,8 @@
 <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",
diff --git a/src/test/mochitest/test_reps_object-with-url.html b/src/test/mochitest/test_reps_object-with-url.html
index 488c28d..74396b9 100644
--- a/src/test/mochitest/test_reps_object-with-url.html
+++ b/src/test/mochitest/test_reps_object-with-url.html
@@ -20,8 +20,9 @@
   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",
diff --git a/src/test/mochitest/test_reps_object.html b/src/test/mochitest/test_reps_object.html
index 7a7c877..90fb35a 100644
--- a/src/test/mochitest/test_reps_object.html
+++ b/src/test/mochitest/test_reps_object.html
@@ -17,9 +17,8 @@
 <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;
 
diff --git a/src/test/mochitest/test_reps_promise.html b/src/test/mochitest/test_reps_promise.html
index 111b974..a57863f 100644
--- a/src/test/mochitest/test_reps_promise.html
+++ b/src/test/mochitest/test_reps_promise.html
@@ -19,9 +19,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;
 
diff --git a/src/test/mochitest/test_reps_regexp.html b/src/test/mochitest/test_reps_regexp.html
index 0749484..b2c7e95 100644
--- a/src/test/mochitest/test_reps_regexp.html
+++ b/src/test/mochitest/test_reps_regexp.html
@@ -18,8 +18,8 @@
 <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",
diff --git a/src/test/mochitest/test_reps_string.html b/src/test/mochitest/test_reps_string.html
index f9fc9e5..f3ae2bb 100644
--- a/src/test/mochitest/test_reps_string.html
+++ b/src/test/mochitest/test_reps_string.html
@@ -17,8 +17,8 @@
 <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
diff --git a/src/test/mochitest/test_reps_stylesheet.html b/src/test/mochitest/test_reps_stylesheet.html
index 6f54dee..becb75f 100644
--- a/src/test/mochitest/test_reps_stylesheet.html
+++ b/src/test/mochitest/test_reps_stylesheet.html
@@ -18,8 +18,8 @@
 <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",
diff --git a/src/test/mochitest/test_reps_symbol.html b/src/test/mochitest/test_reps_symbol.html
index 0112eac..92a7e74 100644
--- a/src/test/mochitest/test_reps_symbol.html
+++ b/src/test/mochitest/test_reps_symbol.html
@@ -20,8 +20,8 @@
 /* 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", {
diff --git a/src/test/mochitest/test_reps_text-node.html b/src/test/mochitest/test_reps_text-node.html
index 201adcd..a0aba49 100644
--- a/src/test/mochitest/test_reps_text-node.html
+++ b/src/test/mochitest/test_reps_text-node.html
@@ -19,9 +19,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", {
diff --git a/src/test/mochitest/test_reps_undefined.html b/src/test/mochitest/test_reps_undefined.html
index 26b3345..110c236 100644
--- a/src/test/mochitest/test_reps_undefined.html
+++ b/src/test/mochitest/test_reps_undefined.html
@@ -20,8 +20,8 @@
   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"
diff --git a/src/test/mochitest/test_reps_window.html b/src/test/mochitest/test_reps_window.html
index 55d60e9..be0842d 100644
--- a/src/test/mochitest/test_reps_window.html
+++ b/src/test/mochitest/test_reps_window.html
@@ -20,8 +20,9 @@
   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",