Fix CI & Remove Firefox 21 Tests (#909)

* Fix CI exit code reporting * Simplify local integration test usage * Fixed webpack compatibility with old browsers (safari 9) * Upgrade karma * Disabled websocket tests for old versions of firefox * Removed firefox 21 due to SSL incompatibility * Updated latest browser versions * Revert "added websocket transport to cancel propagation test (#904)"
improbable-eng · Mar 16, 2021 · 6a43460 · 6a43460
1 parent 36be481
commit 6a43460
Show file tree

Hide file tree

Showing 13 changed files with 168 additions and 5,623 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -92,19 +92,19 @@ workflows:
           matrix:
             parameters:
               browser-params:
-                - BROWSER=firefox80_win
-                - BROWSER=firefox39_win
-                - BROWSER=firefox38_win
-                - BROWSER=firefox21_win
-                - BROWSER=chrome_85
+                - BROWSER=firefox86_win
+                - BROWSER=firefox39_win DISABLE_WEBSOCKET_TESTS=true
+                - BROWSER=firefox38_win DISABLE_WEBSOCKET_TESTS=true
+                - BROWSER=chrome_89
                 - BROWSER=chrome_52
                 - BROWSER=chrome_43
                 - BROWSER=chrome_42
                 - BROWSER=chrome_41
-                - BROWSER=edge85_win
+                - BROWSER=edge88_win
                 - BROWSER=edge16_win
                 - BROWSER=edge14_win
                 - BROWSER=edge13_win
+                - BROWSER=safari14 SC_SSL_BUMPING=true DISABLE_WEBSOCKET_TESTS=true
                 - BROWSER=safari13_1 SC_SSL_BUMPING=true DISABLE_WEBSOCKET_TESTS=true
                 - BROWSER=safari12_1 SC_SSL_BUMPING=true DISABLE_WEBSOCKET_TESTS=true
                 - BROWSER=safari11_1 SC_SSL_BUMPING=true DISABLE_WEBSOCKET_TESTS=true

diff --git a/README.md b/README.md
@@ -137,7 +137,7 @@ The gRPC semantics encourage you to make multiple requests at once. With most mo
 
 This library is tested against:
   * Chrome >= 41
-  * Firefox >= 21
+  * Firefox >= 38
   * Edge >= 13
   * IE >= 11
   * Safari >= 8

diff --git a/client/grpc-web/src/client.ts b/client/grpc-web/src/client.ts
@@ -207,7 +207,7 @@ class GrpcClient<TRequest extends ProtobufMessage, TResponse extends ProtobufMes
       } catch (e) {
         setTimeout(() => {
           throw e;
-        })
+        }, 0);
       }
     });
   }
@@ -221,7 +221,7 @@ class GrpcClient<TRequest extends ProtobufMessage, TResponse extends ProtobufMes
       } catch (e) {
         setTimeout(() => {
           throw e;
-        })
+        }, 0);
       }
     });
   }
@@ -237,7 +237,7 @@ class GrpcClient<TRequest extends ProtobufMessage, TResponse extends ProtobufMes
       } catch (e) {
         setTimeout(() => {
           throw e;
-        })
+        }, 0);
       }
     });
   }
@@ -252,7 +252,7 @@ class GrpcClient<TRequest extends ProtobufMessage, TResponse extends ProtobufMes
       } catch (e) {
         setTimeout(() => {
           throw e;
-        })
+        }, 0);
       }
     });
   }

diff --git a/client/grpc-web/tsconfig.json b/client/grpc-web/tsconfig.json
@@ -5,6 +5,7 @@
     "declaration": true,
     "declarationDir": "./dist/typings",
     "target": "es5",
+    "lib": ["es6","dom"],
     "removeComments": true,
     "noImplicitReturns": true,
     "noImplicitAny": true,

diff --git a/client/grpc-web/webpack.config.js b/client/grpc-web/webpack.config.js
@@ -19,6 +19,7 @@ const DIST_DIR = path.resolve(__dirname, 'dist');
 module.exports = [{
     name: 'lib-commonjs',
     ...LIB_BASE_CONFIG,
+    target: 'es5',
     output: {
       filename: `grpc-web-client.js`,
       path: DIST_DIR,
@@ -29,6 +30,7 @@ module.exports = [{
   {
     name: 'lib-umd',
     ...LIB_BASE_CONFIG,
+    target: 'es5',
     output: {
       filename: `grpc-web-client.umd.js`,
       path: DIST_DIR,

diff --git a/integration_test/browsers.ts b/integration_test/browsers.ts
@@ -14,31 +14,31 @@
 
 const browsers = {
   // Firefox
-  firefox80_win: browser('firefox', '80', 'Windows 10',{custom: {acceptInsecureCerts: true}}),
+  firefox86_win: browser('firefox', '86', 'Windows 10',{custom: {acceptInsecureCerts: true}}),
   firefox39_win: browser('firefox', '39', 'Windows 10',{custom: {acceptInsecureCerts: true}}), // Basic fetch added in 39
   firefox38_win: browser('firefox', '38', 'Windows 10',{custom: {acceptInsecureCerts: true}}),
-  firefox21_win: browser('firefox', '21', 'Windows 10',{custom: {acceptInsecureCerts: true}}),
 
   // Chrome
-  chrome_85: browser('chrome', '85', 'Windows 10', {certOverrideJSElement: 'proceed-link'}),
+  chrome_89: browser('chrome', '89', 'Windows 10', {certOverrideJSElement: 'proceed-link'}),
   chrome_52: browser('chrome', '52', 'Windows 10'),
   chrome_43: browser('chrome', '43', 'Linux'), // Readable stream fetch support added in 43
   chrome_42: browser('chrome', '42', 'Linux'), // Basic fetch added in 42
   chrome_41: browser('chrome', '41', 'Linux'),
 
   // Edge
-  edge85_win: browser('MicrosoftEdge', '85', 'Windows 10', {certOverrideJSElement: 'proceed-link'}),
+  edge88_win: browser('MicrosoftEdge', '88', 'Windows 10', {certOverrideJSElement: 'proceed-link'}),
   edge16_win: browser('MicrosoftEdge', '16', 'Windows 10', {certOverrideJSElement: 'invalidcert_continue'}),
   edge14_win: browser('MicrosoftEdge', '14', 'Windows 10', {certOverrideJSElement: 'invalidcert_continue'}),
   edge13_win: browser('MicrosoftEdge', '13', 'Windows 10', {certOverrideJSElement: 'invalidcert_continue'}),
 
   // Safari
-  safari13_1: browser('safari', '13.1', 'OS X 10.15', {useSslBumping: true, disableWebsocketTests: true}),
-  safari12_1: browser('safari', '12.0', 'OS X 10.14',{useSslBumping: true, disableWebsocketTests: true}),
-  safari11_1: browser('safari', '11.1', 'OS X 10.13',{useSslBumping: true, disableWebsocketTests: true}),
-  safari10_1: browser('safari', '10.1', 'OS X 10.12',{useSslBumping: true, disableWebsocketTests: true}),
-  safari9_1: browser('safari', '9.0', 'OS X 10.11',{useSslBumping: true, disableWebsocketTests: true}),
-  safari8: browser('safari', '8.0', 'OS X 10.10',{useSslBumping: true, disableWebsocketTests: true}),
+  safari14: browser('safari', '14', 'macOS 11.00', {useSslBumping: true}),
+  safari13_1: browser('safari', '13.1', 'OS X 10.15', {useSslBumping: true}),
+  safari12_1: browser('safari', '12.0', 'OS X 10.14',{useSslBumping: true}),
+  safari11_1: browser('safari', '11.1', 'OS X 10.13',{useSslBumping: true}),
+  safari10_1: browser('safari', '10.1', 'OS X 10.12',{useSslBumping: true}),
+  safari9_1: browser('safari', '9.0', 'OS X 10.11',{useSslBumping: true}),
+  safari8: browser('safari', '8.0', 'OS X 10.10',{useSslBumping: true}),
 
   // IE
   ie11_win: browser('internet explorer', '11', 'Windows 10', {certOverrideJSElement: 'overridelink', disableWebsocketTests: true}),