Skip to content

Commit 6a43460

Browse files
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)"
1 parent 36be481 commit 6a43460

File tree

13 files changed

+168
-5623
lines changed

13 files changed

+168
-5623
lines changed

.circleci/config.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,19 @@ workflows:
9292
matrix:
9393
parameters:
9494
browser-params:
95-
- BROWSER=firefox80_win
96-
- BROWSER=firefox39_win
97-
- BROWSER=firefox38_win
98-
- BROWSER=firefox21_win
99-
- BROWSER=chrome_85
95+
- BROWSER=firefox86_win
96+
- BROWSER=firefox39_win DISABLE_WEBSOCKET_TESTS=true
97+
- BROWSER=firefox38_win DISABLE_WEBSOCKET_TESTS=true
98+
- BROWSER=chrome_89
10099
- BROWSER=chrome_52
101100
- BROWSER=chrome_43
102101
- BROWSER=chrome_42
103102
- BROWSER=chrome_41
104-
- BROWSER=edge85_win
103+
- BROWSER=edge88_win
105104
- BROWSER=edge16_win
106105
- BROWSER=edge14_win
107106
- BROWSER=edge13_win
107+
- BROWSER=safari14 SC_SSL_BUMPING=true DISABLE_WEBSOCKET_TESTS=true
108108
- BROWSER=safari13_1 SC_SSL_BUMPING=true DISABLE_WEBSOCKET_TESTS=true
109109
- BROWSER=safari12_1 SC_SSL_BUMPING=true DISABLE_WEBSOCKET_TESTS=true
110110
- BROWSER=safari11_1 SC_SSL_BUMPING=true DISABLE_WEBSOCKET_TESTS=true

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ The gRPC semantics encourage you to make multiple requests at once. With most mo
137137

138138
This library is tested against:
139139
* Chrome >= 41
140-
* Firefox >= 21
140+
* Firefox >= 38
141141
* Edge >= 13
142142
* IE >= 11
143143
* Safari >= 8

client/grpc-web/src/client.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ class GrpcClient<TRequest extends ProtobufMessage, TResponse extends ProtobufMes
207207
} catch (e) {
208208
setTimeout(() => {
209209
throw e;
210-
})
210+
}, 0);
211211
}
212212
});
213213
}
@@ -221,7 +221,7 @@ class GrpcClient<TRequest extends ProtobufMessage, TResponse extends ProtobufMes
221221
} catch (e) {
222222
setTimeout(() => {
223223
throw e;
224-
})
224+
}, 0);
225225
}
226226
});
227227
}
@@ -237,7 +237,7 @@ class GrpcClient<TRequest extends ProtobufMessage, TResponse extends ProtobufMes
237237
} catch (e) {
238238
setTimeout(() => {
239239
throw e;
240-
})
240+
}, 0);
241241
}
242242
});
243243
}
@@ -252,7 +252,7 @@ class GrpcClient<TRequest extends ProtobufMessage, TResponse extends ProtobufMes
252252
} catch (e) {
253253
setTimeout(() => {
254254
throw e;
255-
})
255+
}, 0);
256256
}
257257
});
258258
}

client/grpc-web/tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"declaration": true,
66
"declarationDir": "./dist/typings",
77
"target": "es5",
8+
"lib": ["es6","dom"],
89
"removeComments": true,
910
"noImplicitReturns": true,
1011
"noImplicitAny": true,

client/grpc-web/webpack.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const DIST_DIR = path.resolve(__dirname, 'dist');
1919
module.exports = [{
2020
name: 'lib-commonjs',
2121
...LIB_BASE_CONFIG,
22+
target: 'es5',
2223
output: {
2324
filename: `grpc-web-client.js`,
2425
path: DIST_DIR,
@@ -29,6 +30,7 @@ module.exports = [{
2930
{
3031
name: 'lib-umd',
3132
...LIB_BASE_CONFIG,
33+
target: 'es5',
3234
output: {
3335
filename: `grpc-web-client.umd.js`,
3436
path: DIST_DIR,

integration_test/browsers.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,31 @@
1414

1515
const browsers = {
1616
// Firefox
17-
firefox80_win: browser('firefox', '80', 'Windows 10',{custom: {acceptInsecureCerts: true}}),
17+
firefox86_win: browser('firefox', '86', 'Windows 10',{custom: {acceptInsecureCerts: true}}),
1818
firefox39_win: browser('firefox', '39', 'Windows 10',{custom: {acceptInsecureCerts: true}}), // Basic fetch added in 39
1919
firefox38_win: browser('firefox', '38', 'Windows 10',{custom: {acceptInsecureCerts: true}}),
20-
firefox21_win: browser('firefox', '21', 'Windows 10',{custom: {acceptInsecureCerts: true}}),
2120

2221
// Chrome
23-
chrome_85: browser('chrome', '85', 'Windows 10', {certOverrideJSElement: 'proceed-link'}),
22+
chrome_89: browser('chrome', '89', 'Windows 10', {certOverrideJSElement: 'proceed-link'}),
2423
chrome_52: browser('chrome', '52', 'Windows 10'),
2524
chrome_43: browser('chrome', '43', 'Linux'), // Readable stream fetch support added in 43
2625
chrome_42: browser('chrome', '42', 'Linux'), // Basic fetch added in 42
2726
chrome_41: browser('chrome', '41', 'Linux'),
2827

2928
// Edge
30-
edge85_win: browser('MicrosoftEdge', '85', 'Windows 10', {certOverrideJSElement: 'proceed-link'}),
29+
edge88_win: browser('MicrosoftEdge', '88', 'Windows 10', {certOverrideJSElement: 'proceed-link'}),
3130
edge16_win: browser('MicrosoftEdge', '16', 'Windows 10', {certOverrideJSElement: 'invalidcert_continue'}),
3231
edge14_win: browser('MicrosoftEdge', '14', 'Windows 10', {certOverrideJSElement: 'invalidcert_continue'}),
3332
edge13_win: browser('MicrosoftEdge', '13', 'Windows 10', {certOverrideJSElement: 'invalidcert_continue'}),
3433

3534
// Safari
36-
safari13_1: browser('safari', '13.1', 'OS X 10.15', {useSslBumping: true, disableWebsocketTests: true}),
37-
safari12_1: browser('safari', '12.0', 'OS X 10.14',{useSslBumping: true, disableWebsocketTests: true}),
38-
safari11_1: browser('safari', '11.1', 'OS X 10.13',{useSslBumping: true, disableWebsocketTests: true}),
39-
safari10_1: browser('safari', '10.1', 'OS X 10.12',{useSslBumping: true, disableWebsocketTests: true}),
40-
safari9_1: browser('safari', '9.0', 'OS X 10.11',{useSslBumping: true, disableWebsocketTests: true}),
41-
safari8: browser('safari', '8.0', 'OS X 10.10',{useSslBumping: true, disableWebsocketTests: true}),
35+
safari14: browser('safari', '14', 'macOS 11.00', {useSslBumping: true}),
36+
safari13_1: browser('safari', '13.1', 'OS X 10.15', {useSslBumping: true}),
37+
safari12_1: browser('safari', '12.0', 'OS X 10.14',{useSslBumping: true}),
38+
safari11_1: browser('safari', '11.1', 'OS X 10.13',{useSslBumping: true}),
39+
safari10_1: browser('safari', '10.1', 'OS X 10.12',{useSslBumping: true}),
40+
safari9_1: browser('safari', '9.0', 'OS X 10.11',{useSslBumping: true}),
41+
safari8: browser('safari', '8.0', 'OS X 10.10',{useSslBumping: true}),
4242

4343
// IE
4444
ie11_win: browser('internet explorer', '11', 'Windows 10', {certOverrideJSElement: 'overridelink', disableWebsocketTests: true}),

0 commit comments

Comments
 (0)