Bug 1295010 - Removed testActor from highlighterHelper in inspector t…

…ests; r=me MozReview-Commit-ID: GMksl81iGcp
Brli · Sep 7, 2016 · f2f98d1 · f2f98d1
1 parent 2d94c54
commit f2f98d1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/devtools/client/inspector/test/browser_inspector_highlighter-eyedropper-events.js b/devtools/client/inspector/test/browser_inspector_highlighter-eyedropper-events.js
@@ -77,21 +77,22 @@ const MOVE_EVENTS_DATA = [
 ];
 
 add_task(function* () {
-  let helper = yield openInspectorForURL("data:text/html;charset=utf-8,"
-    + encodeURIComponent(TEST_URI)
-  ).then(getHighlighterHelperFor(HIGHLIGHTER_TYPE));
+  let {inspector, testActor} = yield openInspectorForURL(
+    "data:text/html;charset=utf-8," + encodeURIComponent(TEST_URI));
+  let helper = yield getHighlighterHelperFor(HIGHLIGHTER_TYPE)({inspector, testActor});
+
   helper.prefix = ID;
 
   yield helper.show("html");
-  yield respondsToMoveEvents(helper);
+  yield respondsToMoveEvents(helper, testActor);
   yield respondsToReturnAndEscape(helper);
 
   helper.finalize();
 });
 
-function* respondsToMoveEvents(helper) {
+function* respondsToMoveEvents(helper, testActor) {
   info("Checking that the eyedropper responds to events from the mouse and keyboard");
-  let {mouse, testActor} = helper;
+  let {mouse} = helper;
   let {width, height} = yield testActor.getBoundingClientRect("html");
 
   for (let {type, x, y, key, shift, expected, desc} of MOVE_EVENTS_DATA) {

diff --git a/devtools/client/inspector/test/head.js b/devtools/client/inspector/test/head.js
@@ -531,9 +531,7 @@ const getHighlighterHelperFor = (type) => Task.async(
       finalize: function* () {
         highlightedNode = null;
         yield highlighter.finalize();
-      },
-
-      testActor: testActor
+      }
     };
   }
 );