Tests: Enable tests for ES6/ES2018/ESM features in BrowserStack

Author: Krinkle

build/browserstack-debug.json

@@ -1,6 +1,6 @@
 {
   "test_framework": "qunit",
-  "test_path": ["test/index-es5.html"],
+  "test_path": ["test/index.html"],
   "test_server_port": "8899",
   "exit_with_fail": true,
   "timeout": 600,

build/browserstack-full.json

@@ -1,19 +1,20 @@
 {
   "test_framework": "qunit",
-  "test_path": ["test/index-es5.html"],
+  "test_path": ["test/index.html"],
   "test_server_port": "8899",
   "exit_with_fail": true,
   "timeout": 600,
   "browsers": [
     "firefox_45",
+    "firefox_60",
     "firefox_78",
     "firefox_previous",
     "firefox_current",
     "ie_9",
     "ie_10",
     "ie_11",
     "edge_15",
-    "edge_18",
+    "edge_16",
     "edge_previous",
     "edge_current",
     "safari_9.1",
@@ -30,9 +31,11 @@
       "os": "OS X",
       "os_version": "Sierra"
     },
+    "opera_48",
     "opera_previous",
     "opera_current",
     "chrome_58",
+    "chrome_61",
     "chrome_previous",
     "chrome_current",
     {

build/browserstack-quick.json

@@ -1,6 +1,6 @@
 {
   "test_framework": "qunit",
-  "test_path": ["test/index-es5.html"],
+  "test_path": ["test/index.html"],
   "test_server_port": "8899",
   "exit_with_fail": true,
   "timeout": 600,

test/cli/structure.js

@@ -27,13 +27,6 @@ QUnit.module('structure', () => {
       });
     });
 
-    QUnit.test('test/index-es5.html', assert => {
-      const contents = fs.readFileSync(path.join(__dirname, '..', 'index-es5.html'), 'utf8');
-      files.forEach(file => {
-        assert.true(contents.includes(file), file);
-      });
-    });
-
     QUnit.test('test/index-xhtml.xhtml', assert => {
       const contents = fs.readFileSync(path.join(__dirname, '..', 'index-xhtml.xhtml'), 'utf8');
       files.forEach(file => {

test/index-es5.html

@@ -11,7 +11,8 @@
   </script>
 
   <script src="main/assert.js"></script>
-  <script src="main/assert-es6.js"></script>
+  <!-- Set type=module to skip ES6+ tests in ES5 browsers -->
+  <script src="main/assert-es6.js" type="module"></script>
   <script src="main/assert-step.js"></script>
   <script src="main/assert-timeout.js"></script>
   <script src="main/async.js"></script>
@@ -24,7 +25,7 @@
   <script src="main/events.js"></script>
   <script src="main/HtmlReporter.js"></script>
   <script src="main/legacy.js"></script>
-  <script src="main/modules-es2018.js"></script>
+  <script src="main/modules-es2018.js" type="module"></script>
   <script src="main/modules-esm.mjs" type="module"></script>
   <script src="main/modules.js"></script>
   <script src="main/onUncaughtException.js"></script>