From 4ccabf8caeeb62eb296148d89b1096a5870b7546 Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Tue, 22 Aug 2017 10:43:27 +0100
Subject: [PATCH] Bug 1388728 - Improve module loader mochitests and re-enable
 failing WPT tests r=bkelly

---
 dom/base/test/jsmodules/test_syntaxError.html | 15 +++++---
 .../test/jsmodules/test_syntaxErrorAsync.html | 15 +++++---
 .../jsmodules/test_syntaxErrorInline.html     | 15 +++++---
 .../test_syntaxErrorInlineAsync.html          | 15 +++++---
 testing/web-platform/meta/MANIFEST.json       |  2 +-
 .../module/compilation-error-1.html.ini       |  5 ---
 .../module/compilation-error-2.html.ini       |  5 ---
 .../module/crossorigin.html.ini               | 10 ------
 .../module/errorhandling.html.ini             |  5 ---
 .../module/evaluation-error-1.html.ini        |  5 ---
 .../module/evaluation-error-2.html.ini        |  5 ---
 .../module/evaluation-error-3.html.ini        |  5 ---
 .../module/evaluation-error-4.html.ini        |  5 ---
 .../module/instantiation-error-2.html.ini     |  4 ---
 .../module/instantiation-error-3.html.ini     |  5 ---
 .../module/instantiation-error-4.html.ini     |  5 ---
 .../module/instantiation-error-6.html.ini     |  5 ---
 .../module/instantiation-error-7.html.ini     |  5 ---
 .../module/slow-cycle.html.ini                |  3 --
 .../module/specifier-error.html.ini           |  5 ---
 .../web-platform/mozilla/meta/MANIFEST.json   |  2 +-
 .../reload-failed-module-script.html          | 36 +++++++++++++------
 .../module/errorhandling.html                 |  1 -
 23 files changed, 72 insertions(+), 106 deletions(-)
 delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/compilation-error-1.html.ini
 delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/compilation-error-2.html.ini
 delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/errorhandling.html.ini
 delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-error-1.html.ini
 delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-error-2.html.ini
 delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-error-3.html.ini
 delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-error-4.html.ini
 delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-2.html.ini
 delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html.ini
 delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-4.html.ini
 delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-6.html.ini
 delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-7.html.ini
 delete mode 100644 testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/specifier-error.html.ini

diff --git a/dom/base/test/jsmodules/test_syntaxError.html b/dom/base/test/jsmodules/test_syntaxError.html
index 53f95c96cc84..5bd688fe3f41 100644
--- a/dom/base/test/jsmodules/test_syntaxError.html
+++ b/dom/base/test/jsmodules/test_syntaxError.html
@@ -4,20 +4,27 @@
 <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 <script>
   var wasRun = false;
-  var hadSyntaxError = false;
+  var errorCount = 0;
+  var syntaxErrorCount = 0;
+  var eventCount = 0;
 
   SimpleTest.waitForExplicitFinish();
   window.onerror = handleError;
 
   function handleError(message, url, line, column, error) {
-    hadSyntaxError = error instanceof SyntaxError;
+    errorCount++;
+    if (error instanceof SyntaxError) {
+      syntaxErrorCount++;
+    }
   }
 
   function testError() {
     ok(!wasRun, 'Check script was not run');
-    ok(hadSyntaxError, 'Check that a SyntaxError was thrown');
+    ok(errorCount == 1, 'Check that an error was reported');
+    ok(syntaxErrorCount == 1, 'Check that a syntax error was reported');
+    ok(eventCount == 0, 'Check that no error event was fired');
     SimpleTest.finish();
   }
 </script>
-<script type="module" src="module_badSyntax.js"></script>
+<script type="module" src="module_badSyntax.js" onerror="eventCount++"></script>
 <body onload='testError()'></body>
diff --git a/dom/base/test/jsmodules/test_syntaxErrorAsync.html b/dom/base/test/jsmodules/test_syntaxErrorAsync.html
index 35d92375538f..3593d9dd7388 100644
--- a/dom/base/test/jsmodules/test_syntaxErrorAsync.html
+++ b/dom/base/test/jsmodules/test_syntaxErrorAsync.html
@@ -4,20 +4,27 @@
 <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 <script>
   var wasRun = false;
-  var hadSyntaxError = false;
+  var errorCount = 0;
+  var syntaxErrorCount = 0;
+  var eventCount = 0;
 
   SimpleTest.waitForExplicitFinish();
   window.onerror = handleError;
 
   function handleError(message, url, line, column, error) {
-    hadSyntaxError = error instanceof SyntaxError;
+    errorCount++;
+    if (error instanceof SyntaxError) {
+      syntaxErrorCount++;
+    }
   }
 
   function testError() {
     ok(!wasRun, 'Check script was not run');
-    ok(hadSyntaxError, 'Check that a SyntaxError was thrown');
+    ok(errorCount == 1, 'Check that an error was reported');
+    ok(syntaxErrorCount == 1, 'Check that a syntax error was reported');
+    ok(eventCount == 0, 'Check that no error event was fired');
     SimpleTest.finish();
   }
 </script>
-<script type="module" src="module_badSyntax.js" async></script>
+<script type="module" src="module_badSyntax.js" async onerror="eventCount++"></script>
 <body onload='testError()'></body>
diff --git a/dom/base/test/jsmodules/test_syntaxErrorInline.html b/dom/base/test/jsmodules/test_syntaxErrorInline.html
index 705bc5902e4b..b85b954ecea8 100644
--- a/dom/base/test/jsmodules/test_syntaxErrorInline.html
+++ b/dom/base/test/jsmodules/test_syntaxErrorInline.html
@@ -4,22 +4,29 @@
 <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 <script>
   var wasRun = false;
-  var hadSyntaxError = false;
+  var errorCount = 0;
+  var syntaxErrorCount = 0;
+  var eventCount = 0;
 
   SimpleTest.waitForExplicitFinish();
   window.onerror = handleError;
 
   function handleError(message, url, line, column, error) {
-    hadSyntaxError = error instanceof SyntaxError;
+    errorCount++;
+    if (error instanceof SyntaxError) {
+      syntaxErrorCount++;
+    }
   }
 
   function testError() {
     ok(!wasRun, 'Check script was not run');
-    ok(hadSyntaxError, 'Check that a SyntaxError was thrown');
+    ok(errorCount == 1, 'Check that an error was reported');
+    ok(syntaxErrorCount == 1, 'Check that a syntax error was reported');
+    ok(eventCount == 0, 'Check that no error event was fired');
     SimpleTest.finish();
   }
 </script>
-<script type="module">
+<script type="module" onerror="eventCount++">
 // Module with a syntax error.
 some invalid js syntax;
 wasRun = true;
diff --git a/dom/base/test/jsmodules/test_syntaxErrorInlineAsync.html b/dom/base/test/jsmodules/test_syntaxErrorInlineAsync.html
index 5e7992823422..cc4bf12575e4 100644
--- a/dom/base/test/jsmodules/test_syntaxErrorInlineAsync.html
+++ b/dom/base/test/jsmodules/test_syntaxErrorInlineAsync.html
@@ -4,22 +4,29 @@
 <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
 <script>
   var wasRun = false;
-  var hadSyntaxError = false;
+  var errorCount = 0;
+  var syntaxErrorCount = 0;
+  var eventCount = 0;
 
   SimpleTest.waitForExplicitFinish();
   window.onerror = handleError;
 
   function handleError(message, url, line, column, error) {
-    hadSyntaxError = error instanceof SyntaxError;
+    errorCount++;
+    if (error instanceof SyntaxError) {
+      syntaxErrorCount++;
+    }
   }
 
   function testError() {
     ok(!wasRun, 'Check script was not run');
-    ok(hadSyntaxError, 'Check that a SyntaxError was thrown');
+    ok(errorCount == 1, 'Check that an error was reported');
+    ok(syntaxErrorCount == 1, 'Check that a syntax error was reported');
+    ok(eventCount == 0, 'Check that no error event was fired');
     SimpleTest.finish();
   }
 </script>
-<script type="module" async>
+<script type="module" async onerror="eventCount++">
 // Module with a syntax error.
 some invalid js syntax;
 wasRun = true;
diff --git a/testing/web-platform/meta/MANIFEST.json b/testing/web-platform/meta/MANIFEST.json
index 81cd1d192f5f..fbf4d5ae8d3e 100644
--- a/testing/web-platform/meta/MANIFEST.json
+++ b/testing/web-platform/meta/MANIFEST.json
@@ -594465,7 +594465,7 @@
    "support"
   ],
   "html/semantics/scripting-1/the-script-element/module/errorhandling.html": [
-   "ffd411f153c55abf313fba5ab349b6a0cc50ba0f",
+   "10ccf68924459d54784ebc9cfdcdad21cb20811e",
    "testharness"
   ],
   "html/semantics/scripting-1/the-script-element/module/evaluation-error-1.html": [
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/compilation-error-1.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/compilation-error-1.html.ini
deleted file mode 100644
index 689887b78e17..000000000000
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/compilation-error-1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[compilation-error-1.html]
-  type: testharness
-  [Test that syntax errors lead to SyntaxError events on window, and that exceptions are remembered.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/compilation-error-2.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/compilation-error-2.html.ini
deleted file mode 100644
index 5d518d97d25d..000000000000
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/compilation-error-2.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[compilation-error-2.html]
-  type: testharness
-  [Test that syntax errors lead to SyntaxError events on window, and that exceptions are remembered.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/crossorigin.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/crossorigin.html.ini
index b9440682ab65..ad749cc271cc 100644
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/crossorigin.html.ini
+++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/crossorigin.html.ini
@@ -1,14 +1,4 @@
 [crossorigin.html]
   type: testharness
-  [Root module, Error in CORS-different-origin script]
-    expected: FAIL
-
-  [Root module, Error in CORS-same-origin script]
-    expected: FAIL
-
-  [Imported module, Error in CORS-different-origin script]
-    expected: FAIL
-
   [Imported module, Error in CORS-same-origin script]
     expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/errorhandling.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/errorhandling.html.ini
deleted file mode 100644
index 397e40e27400..000000000000
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/errorhandling.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[errorhandling.html]
-  type: testharness
-  [IFrame test: 'iframe_parseError_Dependent']
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-error-1.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-error-1.html.ini
deleted file mode 100644
index 35ee19e1418a..000000000000
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-error-1.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[evaluation-error-1.html]
-  type: testharness
-  [Test that exceptions during evaluation lead to error events on window, and that exceptions are remembered.\n]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-error-2.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-error-2.html.ini
deleted file mode 100644
index f71474208e5c..000000000000
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-error-2.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[evaluation-error-2.html]
-  type: testharness
-  [Test that ill-founded cyclic dependencies cause ReferenceError during evaluation, which leads to error events on window, and that exceptions are remembered.\n]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-error-3.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-error-3.html.ini
deleted file mode 100644
index c2cb5cd04424..000000000000
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-error-3.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[evaluation-error-3.html]
-  type: testharness
-  [Test that exceptions during evaluation lead to error events on window, and that exceptions are remembered.\n]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-error-4.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-error-4.html.ini
deleted file mode 100644
index 16e2ac184630..000000000000
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/evaluation-error-4.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[evaluation-error-4.html]
-  type: testharness
-  [Test that exceptions during evaluation lead to error events on window, and that exceptions are remembered.\n]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-2.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-2.html.ini
deleted file mode 100644
index 06995c00aaf6..000000000000
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-2.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[instantiation-error-2.html]
-  type: testharness
-  [Test that missing exports lead to SyntaxError events on window and load events on script, and that exceptions are remembered]
-    expected: FAIL
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html.ini
deleted file mode 100644
index 38c8188c8b27..000000000000
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-3.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[instantiation-error-3.html]
-  type: testharness
-  [Test that unresolvable cycles lead to SyntaxError events on window and load events on script, and that exceptions are remembered]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-4.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-4.html.ini
deleted file mode 100644
index 3e63cc081c97..000000000000
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-4.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[instantiation-error-4.html]
-  type: testharness
-  [Test that loading a graph in which a module is already errored results in that module's error.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-6.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-6.html.ini
deleted file mode 100644
index c1729535a19c..000000000000
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-6.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[instantiation-error-6.html]
-  type: testharness
-  [Test that ambiguous star exports lead to an instantiation error and that the correct module is blamed.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-7.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-7.html.ini
deleted file mode 100644
index 152942c50922..000000000000
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/instantiation-error-7.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[instantiation-error-7.html]
-  type: testharness
-  [Test that ambiguous star exports lead to an instantiation error, even when discovered through a star export, and that the correct module is blamed.]
-    expected: FAIL
-
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/slow-cycle.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/slow-cycle.html.ini
index 7c1c087e2ebf..936f45f8dae0 100644
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/slow-cycle.html.ini
+++ b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/slow-cycle.html.ini
@@ -1,8 +1,5 @@
 [slow-cycle.html]
   type: testharness
-  expected:
-    if debug and not e10s: CRASH
-    if debug and e10s: CRASH
   [Cyclic graph with slow imports]
     expected: FAIL
 
diff --git a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/specifier-error.html.ini b/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/specifier-error.html.ini
deleted file mode 100644
index 44e8c1ebac68..000000000000
--- a/testing/web-platform/meta/html/semantics/scripting-1/the-script-element/module/specifier-error.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[specifier-error.html]
-  type: testharness
-  [Test that invalid module specifier leads to TypeError on window.]
-    expected: FAIL
-
diff --git a/testing/web-platform/mozilla/meta/MANIFEST.json b/testing/web-platform/mozilla/meta/MANIFEST.json
index db9f3d3377fc..50d25e2d57c8 100644
--- a/testing/web-platform/mozilla/meta/MANIFEST.json
+++ b/testing/web-platform/mozilla/meta/MANIFEST.json
@@ -928,7 +928,7 @@
    "testharness"
   ],
   "html/semantics/scripting-1/the-script-element/reload-failed-module-script.html": [
-   "5b8cf6809bd8d0797f4172bf9a01f9085c0abbaf",
+   "7bfcf25ed4e793d00b0b33269bc3401545527420",
    "testharness"
   ],
   "html/semantics/scripting-1/the-script-element/support/missing_import.js": [
diff --git a/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/reload-failed-module-script.html b/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/reload-failed-module-script.html
index c3b93eafa40d..b95d3fe330ee 100644
--- a/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/reload-failed-module-script.html
+++ b/testing/web-platform/mozilla/tests/html/semantics/scripting-1/the-script-element/reload-failed-module-script.html
@@ -5,21 +5,37 @@
 <script src=/resources/testharnessreport.js></script>
 <script>
   setup({allow_uncaught_exception: true});
-  var test = async_test("Reload failed module script")
+
+  var test = async_test("Reload failed module script");
+
+  var errorCount = 0;
+  window.addEventListener("error", handleError);
+
+  function handleError() {
+    errorCount++;
+
+    if (errorCount == 1) {
+      reloadModule();
+      return;
+    }
+
+    test.step(() => assert_equals(errorCount, 2));
+    test.done();
+  }
+
   function reloadModule() {
     var script = document.createElement("script");
-    script.onerror = function() {
-      // An error is expected
-      test.done();
-    };
-    script.onload = function() {
-      test.step(() => assert_unreached("Should not load"));
-      test.done();
-    };
+    script.onerror = testNoError;
     script.type = "module";
     script.src = "support/missing_import.js";
     script.async = false;
     document.documentElement.appendChild(script);
   }
+
+  function testNoError() {
+    test.step(() => assert_unreached("No event expect here"));
+    test.done();
+  }
+
 </script>
-<script type="module" src="support/missing_import.js" onerror="reloadModule()"></script>
+<script type="module" src="support/missing_import.js" onerror="testNoError()"></script>
diff --git a/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/errorhandling.html b/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/errorhandling.html
index 6f36d2ce8965..5315df0f5b26 100644
--- a/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/errorhandling.html
+++ b/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/errorhandling.html
@@ -55,7 +55,6 @@
             assert_unreached("This script should not have loaded!");
         }));
         document.body.appendChild(script_wrongMimetype_import);
-
     </script>
 </body>
 </html>