Bug 1436431 Part 4: Disable and update an existing mochitest of find-in-page. r=bz

The changes made to this test make the test failure messages more useful. The
test is disabled because the test fails on some platforms. The failures seem
to indicate that, after a Find for text with multiple matches, the match that
is selected is not the first match after the currently highlighted text. Other
expected success indicators like total number of matches are correct.
Bug 1458393 has been opened to investigate this differing behavior and
re-enable the test.

MozReview-Commit-ID: 8Jwr9mKNzGr

--HG--
extra : rebase_source : a8a79a85e08dc5fdc7efe6b14f74a9bd18cb8864

dom/browser-element/mochitest/browserElement_Find.js

@@ -23,7 +23,11 @@ function runTest() {
   }
 
   // Test if all key=>value pairs in o1 are present in o2.
-  const c = (o1, o2) => Object.keys(o1).every(k => o1[k] == o2[k]);
+  const c = (o1, o2, i) => {
+    for (let k of Object.keys(o1)) {
+      is(o1[k], o2[k], `Test ${i} should match for key ${k}`);
+    }
+  }
 
   let testCount = 0;
 
@@ -31,109 +35,109 @@ function runTest() {
     iframe.findAll('foo', 'case-insensitive');
     return once('mozbrowserfindchange');
   }).then(({detail}) => {
-    ok(c(detail, {
+    c(detail, {
       msg_name: "findchange",
       active: true,
       searchString: 'foo',
       searchLimit: 1000,
       activeMatchOrdinal: 1,
       numberOfMatches: 5,
-    }), `test ${testCount++}`);
+    }, testCount++);
     iframe.findNext('forward');
     return once('mozbrowserfindchange');
   }).then(({detail}) => {
-    ok(c(detail, {
+    c(detail, {
       msg_name: "findchange",
       active: true,
       searchString: 'foo',
       searchLimit: 1000,
       activeMatchOrdinal: 2,
       numberOfMatches: 5,
-    }), `test ${testCount++}`);
+    }, testCount++);
     iframe.findNext('backward');
     return once('mozbrowserfindchange');
   }).then(({detail}) => {
-    ok(c(detail, {
+    c(detail, {
       msg_name: "findchange",
       active: true,
       searchString: 'foo',
       searchLimit: 1000,
       activeMatchOrdinal: 1,
       numberOfMatches: 5,
-    }), `test ${testCount++}`);
+    }, testCount++);
     iframe.findAll('xxx', 'case-sensitive');
     return once('mozbrowserfindchange');
   }).then(({detail}) => {
-    ok(c(detail, {
+    c(detail, {
       msg_name: "findchange",
       active: true,
       searchString: 'xxx',
       searchLimit: 1000,
       activeMatchOrdinal: 0,
       numberOfMatches: 0,
-    }), `test ${testCount++}`);
+    }, testCount++);
     iframe.findAll('bar', 'case-insensitive');
     return once('mozbrowserfindchange');
   }).then(({detail}) => {
-    ok(c(detail, {
+    c(detail, {
       msg_name: "findchange",
       active: true,
       searchString: 'bar',
       searchLimit: 1000,
       activeMatchOrdinal: 1,
       numberOfMatches: 4,
-    }), `test ${testCount++}`);
+    }, testCount++);
     iframe.findNext('forward');
     return once('mozbrowserfindchange');
   }).then(({detail}) => {
-    ok(c(detail, {
+    c(detail, {
       msg_name: "findchange",
       active: true,
       searchString: 'bar',
       searchLimit: 1000,
       activeMatchOrdinal: 2,
       numberOfMatches: 4,
-    }), `test ${testCount++}`);
+    }, testCount++);
     iframe.findNext('forward');
     return once('mozbrowserfindchange');
   }).then(({detail}) => {
-    ok(c(detail, {
+    c(detail, {
       msg_name: "findchange",
       active: true,
       searchString: 'bar',
       searchLimit: 1000,
       activeMatchOrdinal: 3,
       numberOfMatches: 4,
-    }), `test ${testCount++}`);
+    }, testCount++);
     iframe.findNext('forward');
     return once('mozbrowserfindchange');
   }).then(({detail}) => {
-    ok(c(detail, {
+    c(detail, {
       msg_name: "findchange",
       active: true,
       searchString: 'bar',
       searchLimit: 1000,
       activeMatchOrdinal: 4,
       numberOfMatches: 4,
-    }), `test ${testCount++}`);
+    }, testCount++);
     iframe.findNext('forward');
     return once('mozbrowserfindchange');
   }).then(({detail}) => {
-    ok(c(detail, {
+    c(detail, {
       msg_name: "findchange",
       active: true,
       searchString: 'bar',
       searchLimit: 1000,
       activeMatchOrdinal: 1,
       numberOfMatches: 4,
-    }), `test ${testCount++}`);
+    }, testCount++);
     iframe.clearMatch();
     return once('mozbrowserfindchange');
   }).then(({detail}) => {
-    ok(c(detail, {
+    c(detail, {
       msg_name: "findchange",
       active: false
-    }), `test ${testCount++}`);
+    }, testCount++);
     SimpleTest.finish();
   });
 

dom/browser-element/mochitest/chrome.ini

@@ -36,6 +36,7 @@ support-files =
 [test_browserElement_inproc_DOMRequestError.html]
 [test_browserElement_inproc_ExecuteScript.html]
 [test_browserElement_inproc_Find.html]
+disabled = Bug 1458393
 [test_browserElement_inproc_GetContentDimensions.html]
 [test_browserElement_inproc_GetScreenshot.html]
 [test_browserElement_inproc_GetScreenshotDppx.html]