Improve IE and Windows support

- Disable the brokenWindowSwitch test in IE (it hangs) - Build browser tests as ES5 - Make loader scripts and RemoteSuite configuration script IE-friendly - Add descriptive comments to tsconfig files - Make webpack paths more Windows-friendly - Make execute scripts IE-compatible - Add a mouse click listener to one of the functional test pages to visualize click locations - Add a pathRe function to create platform-compatible path-based regular expressions references #1043 references #1037
theintern · Jan 20, 2020 · a681b7f · a681b7f
1 parent d4847bd
commit a681b7f
Show file tree

Hide file tree

Showing 21 changed files with 171 additions and 125 deletions.
diff --git a/docs/api.json b/docs/api.json
@@ -33008,7 +33008,7 @@
 							"sources": [
 								{
 									"fileName": "src/core/lib/RemoteSuite.ts",
-									"line": 317,
+									"line": 320,
 									"character": 11
 								}
 							],
@@ -33114,7 +33114,7 @@
 							"sources": [
 								{
 									"fileName": "src/core/lib/RemoteSuite.ts",
-									"line": 315,
+									"line": 318,
 									"character": 11
 								}
 							],
@@ -33139,7 +33139,7 @@
 							"sources": [
 								{
 									"fileName": "src/core/lib/RemoteSuite.ts",
-									"line": 316,
+									"line": 319,
 									"character": 11
 								}
 							],
@@ -33193,7 +33193,7 @@
 							"sources": [
 								{
 									"fileName": "src/core/lib/RemoteSuite.ts",
-									"line": 318,
+									"line": 321,
 									"character": 12
 								}
 							],
@@ -33495,7 +33495,7 @@
 					"sources": [
 						{
 							"fileName": "src/core/lib/RemoteSuite.ts",
-							"line": 314,
+							"line": 317,
 							"character": 29
 						}
 					],
@@ -33726,7 +33726,7 @@
 							"sources": [
 								{
 									"fileName": "src/core/lib/RemoteSuite.ts",
-									"line": 311,
+									"line": 314,
 									"character": 14
 								}
 							],
@@ -34202,7 +34202,7 @@
 					"sources": [
 						{
 							"fileName": "src/core/lib/RemoteSuite.ts",
-							"line": 310,
+							"line": 313,
 							"character": 29
 						}
 					],
@@ -156381,7 +156381,7 @@
 							"sources": [
 								{
 									"fileName": "src/webdriver/Server.ts",
-									"line": 1861,
+									"line": 1865,
 									"character": 15
 								}
 							]
@@ -156531,7 +156531,7 @@
 							"sources": [
 								{
 									"fileName": "src/webdriver/Server.ts",
-									"line": 1854,
+									"line": 1858,
 									"character": 24
 								}
 							]
@@ -156574,7 +156574,7 @@
 							"sources": [
 								{
 									"fileName": "src/webdriver/Server.ts",
-									"line": 1828,
+									"line": 1832,
 									"character": 13
 								}
 							]
@@ -156774,7 +156774,7 @@
 							"sources": [
 								{
 									"fileName": "src/webdriver/Server.ts",
-									"line": 2028,
+									"line": 2032,
 									"character": 6
 								}
 							],
@@ -156792,7 +156792,7 @@
 							"sources": [
 								{
 									"fileName": "src/webdriver/Server.ts",
-									"line": 2027,
+									"line": 2031,
 									"character": 10
 								}
 							],
@@ -156816,7 +156816,7 @@
 					"sources": [
 						{
 							"fileName": "src/webdriver/Server.ts",
-							"line": 2026,
+							"line": 2030,
 							"character": 22
 						}
 					]
@@ -156859,7 +156859,7 @@
 													"sources": [
 														{
 															"fileName": "src/webdriver/Server.ts",
-															"line": 1866,
+															"line": 1870,
 															"character": 51
 														}
 													],
@@ -156881,7 +156881,7 @@
 																	"sources": [
 																		{
 																			"fileName": "src/webdriver/Server.ts",
-																			"line": 1866,
+																			"line": 1870,
 																			"character": 60
 																		}
 																	],
@@ -156903,7 +156903,7 @@
 															"sources": [
 																{
 																	"fileName": "src/webdriver/Server.ts",
-																	"line": 1866,
+																	"line": 1870,
 																	"character": 52
 																}
 															]
@@ -156919,7 +156919,7 @@
 													"sources": [
 														{
 															"fileName": "src/webdriver/Server.ts",
-															"line": 1866,
+															"line": 1870,
 															"character": 35
 														}
 													],
@@ -156942,7 +156942,7 @@
 											"sources": [
 												{
 													"fileName": "src/webdriver/Server.ts",
-													"line": 1866,
+													"line": 1870,
 													"character": 28
 												}
 											]
@@ -156959,7 +156959,7 @@
 					"sources": [
 						{
 							"fileName": "src/webdriver/Server.ts",
-							"line": 1866,
+							"line": 1870,
 							"character": 21
 						}
 					]
@@ -157000,7 +157000,7 @@
 					"sources": [
 						{
 							"fileName": "src/webdriver/Server.ts",
-							"line": 1894,
+							"line": 1898,
 							"character": 18
 						}
 					]
@@ -157041,7 +157041,7 @@
 					"sources": [
 						{
 							"fileName": "src/webdriver/Server.ts",
-							"line": 1899,
+							"line": 1903,
 							"character": 26
 						}
 					]
@@ -157126,7 +157126,7 @@
 					"sources": [
 						{
 							"fileName": "src/webdriver/Server.ts",
-							"line": 1904,
+							"line": 1908,
 							"character": 17
 						}
 					]
@@ -157213,7 +157213,7 @@
 					"sources": [
 						{
 							"fileName": "src/webdriver/Server.ts",
-							"line": 1969,
+							"line": 1973,
 							"character": 25
 						}
 					]
@@ -157300,7 +157300,7 @@
 					"sources": [
 						{
 							"fileName": "src/webdriver/Server.ts",
-							"line": 1943,
+							"line": 1947,
 							"character": 34
 						}
 					]
@@ -157341,7 +157341,7 @@
 					"sources": [
 						{
 							"fileName": "src/webdriver/Server.ts",
-							"line": 1916,
+							"line": 1920,
 							"character": 14
 						}
 					]
@@ -157427,7 +157427,7 @@
 					"sources": [
 						{
 							"fileName": "src/webdriver/Server.ts",
-							"line": 1921,
+							"line": 1925,
 							"character": 14
 						}
 					]
@@ -157514,7 +157514,7 @@
 					"sources": [
 						{
 							"fileName": "src/webdriver/Server.ts",
-							"line": 1930,
+							"line": 1934,
 							"character": 24
 						}
 					]
@@ -157601,7 +157601,7 @@
 					"sources": [
 						{
 							"fileName": "src/webdriver/Server.ts",
-							"line": 1956,
+							"line": 1960,
 							"character": 24
 						}
 					]
@@ -157689,7 +157689,7 @@
 					"sources": [
 						{
 							"fileName": "src/webdriver/Server.ts",
-							"line": 1987,
+							"line": 1991,
 							"character": 23
 						}
 					]
@@ -157716,7 +157716,7 @@
 					"sources": [
 						{
 							"fileName": "src/webdriver/Server.ts",
-							"line": 2012,
+							"line": 2016,
 							"character": 13
 						}
 					]
@@ -157763,7 +157763,7 @@
 					"sources": [
 						{
 							"fileName": "src/webdriver/Server.ts",
-							"line": 2022,
+							"line": 2026,
 							"character": 20
 						}
 					]

diff --git a/intern.json b/intern.json
@@ -62,7 +62,7 @@
       "options": { "hideSkipped": false, "hidePassed": false }
     },
 
-    "tsconfig": "tsconfig-tests.json"
+    "tsconfig": "tsconfig.json"
   },
 
   "browser": {

diff --git a/src/core/lib/RemoteSuite.ts b/src/core/lib/RemoteSuite.ts
@@ -273,10 +273,13 @@ export default class RemoteSuite extends Suite {
           // Send the config data in an execute block to avoid sending
           // very large query strings
           .execute(
+            // This script should be IE11-compatible
             /* istanbul ignore next */ function(configString: string) {
               const options = JSON.parse(configString);
               intern.configure(options);
-              intern.run().catch(() => undefined);
+              intern.run().catch(function() {
+                return undefined;
+              });
             },
             [stringify(remoteConfig)]
           )

diff --git a/src/core/loaders/default.ts b/src/core/loaders/default.ts
@@ -1,12 +1,13 @@
 /**
  * A loader script for loading non-module JavaScript suites.
  *
- * Note that loader scripts must be simple scripts, not modules.
+ * Note that loader scripts must be simple scripts, not modules, and must use
+ * IE11 compatible code (no arrow functions).
  */
-intern.registerLoader(() => {
+intern.registerLoader(function() {
   intern.log('Using default loader');
 
-  return (modules: string[]) => {
+  return function(modules: string[]) {
     return intern.loadScript(modules);
   };
 });
diff --git a/src/core/loaders/dojo.ts b/src/core/loaders/dojo.ts
@@ -1,9 +1,10 @@
 /**
  * A loader script for setting up the Dojo loader.
  *
- * Note that loader scripts must be simple scripts, not modules.
+ * Note that loader scripts must be simple scripts, not modules, and must use
+ * IE11 compatible code (no arrow functions).
  */
-intern.registerLoader(options => {
+intern.registerLoader(function(options) {
   const globalObj: any = typeof window !== 'undefined' ? window : global;
 
   options.baseUrl = options.baseUrl || intern.config.basePath;
@@ -19,28 +20,28 @@ intern.registerLoader(options => {
   intern.log('Configuring Dojo loader with:', options);
   globalObj.dojoConfig = options;
 
-  return intern.loadScript('node_modules/dojo/dojo.js').then(() => {
+  return intern.loadScript('node_modules/dojo/dojo.js').then(function() {
     const require = globalObj.require;
     intern.log('Using Dojo loader');
 
-    return (modules: string[]) => {
+    return function(modules: string[]) {
       let handle: { remove(): void };
 
-      return new Promise((resolve, reject) => {
-        handle = require.on('error', (error: Error) => {
+      return new Promise(function(resolve, reject) {
+        handle = require.on('error', function(error: Error) {
           intern.emit('error', error);
           reject(new Error(`Dojo loader error: ${error.message}`));
         });
 
         intern.log('Loading modules:', modules);
-        require(modules, () => {
+        require(modules, function() {
           resolve();
         });
       }).then<void>(
-        () => {
+        function() {
           handle.remove();
         },
-        error => {
+        function(error) {
           handle && handle.remove();
           throw error;
         }