Skip to content

Commit ac3d87a

Browse files
authored
Fix tests by adding fallback on macos (#72)
* Fix tests by adding fallback on macos * Disable firefox on macos
1 parent e3e950e commit ac3d87a

File tree

3 files changed

+40
-19
lines changed

3 files changed

+40
-19
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
-d chrome
4040
- run: xvfb-run flutter pub run test -p vm,chrome,firefox
4141
macos:
42-
name: webcrypto on macOS Chrome / Firefox
42+
name: webcrypto on macOS Chrome
4343
runs-on: macos-latest
4444
steps:
4545
- uses: actions/checkout@v3
@@ -66,7 +66,7 @@ jobs:
6666
--driver=test_driver/integration_test.dart \
6767
--target=integration_test/webcrypto_test.dart \
6868
-d chrome
69-
- run: flutter pub run test -p vm,chrome,firefox
69+
- run: flutter pub run test -p vm,chrome # TODO: Enable firefox if it works
7070
ios:
7171
name: webcrypto on iOS emulator (iPhone)
7272
runs-on: macos-latest

example/pubspec.lock

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ packages:
6161
dependency: transitive
6262
description:
6363
name: collection
64-
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
64+
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
6565
url: "https://pub.dev"
6666
source: hosted
67-
version: "1.17.1"
67+
version: "1.17.2"
6868
convert:
6969
dependency: "direct main"
7070
description:
@@ -211,18 +211,18 @@ packages:
211211
dependency: transitive
212212
description:
213213
name: matcher
214-
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
214+
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
215215
url: "https://pub.dev"
216216
source: hosted
217-
version: "0.12.15"
217+
version: "0.12.16"
218218
material_color_utilities:
219219
dependency: transitive
220220
description:
221221
name: material_color_utilities
222-
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
222+
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
223223
url: "https://pub.dev"
224224
source: hosted
225-
version: "0.2.0"
225+
version: "0.5.0"
226226
meta:
227227
dependency: transitive
228228
description:
@@ -352,10 +352,10 @@ packages:
352352
dependency: transitive
353353
description:
354354
name: source_span
355-
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
355+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
356356
url: "https://pub.dev"
357357
source: hosted
358-
version: "1.9.1"
358+
version: "1.10.0"
359359
stack_trace:
360360
dependency: transitive
361361
description:
@@ -400,26 +400,26 @@ packages:
400400
dependency: "direct dev"
401401
description:
402402
name: test
403-
sha256: "3dac9aecf2c3991d09b9cdde4f98ded7b30804a88a0d7e4e7e1678e78d6b97f4"
403+
sha256: "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46"
404404
url: "https://pub.dev"
405405
source: hosted
406-
version: "1.24.1"
406+
version: "1.24.3"
407407
test_api:
408408
dependency: transitive
409409
description:
410410
name: test_api
411-
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
411+
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
412412
url: "https://pub.dev"
413413
source: hosted
414-
version: "0.5.1"
414+
version: "0.6.0"
415415
test_core:
416416
dependency: transitive
417417
description:
418418
name: test_core
419-
sha256: "5138dbffb77b2289ecb12b81c11ba46036590b72a64a7a90d6ffb880f1a29e93"
419+
sha256: "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e"
420420
url: "https://pub.dev"
421421
source: hosted
422-
version: "0.5.1"
422+
version: "0.5.3"
423423
typed_data:
424424
dependency: transitive
425425
description:
@@ -440,10 +440,10 @@ packages:
440440
dependency: transitive
441441
description:
442442
name: vm_service
443-
sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe
443+
sha256: c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f
444444
url: "https://pub.dev"
445445
source: hosted
446-
version: "11.3.0"
446+
version: "11.7.1"
447447
watcher:
448448
dependency: transitive
449449
description:
@@ -452,6 +452,14 @@ packages:
452452
url: "https://pub.dev"
453453
source: hosted
454454
version: "1.0.2"
455+
web:
456+
dependency: transitive
457+
description:
458+
name: web
459+
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
460+
url: "https://pub.dev"
461+
source: hosted
462+
version: "0.1.4-beta"
455463
web_socket_channel:
456464
dependency: transitive
457465
description:
@@ -492,5 +500,5 @@ packages:
492500
source: hosted
493501
version: "3.1.1"
494502
sdks:
495-
dart: ">=3.0.0-0 <4.0.0"
503+
dart: ">=3.1.0-185.0.dev <4.0.0"
496504
flutter: ">=3.0.0"

lib/src/boringssl/lookup/lookup.dart

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,19 @@ final Pointer<T> Function<T extends NativeType>(String symbolName) lookup = () {
3636
library = DynamicLibrary.open('webcrypto.dll');
3737
} else {
3838
library = DynamicLibrary.executable();
39+
// If current executable doesn't provide the symbol, then we're
40+
if (!library.providesSymbol('webcrypto_lookup_symbol')) {
41+
final lookup = lookupLibraryInDotDartTool();
42+
if (lookup != null) {
43+
return lookup;
44+
}
45+
throw UnsupportedError(
46+
'package:webcrypto could not find required symbols in executable. '
47+
'If you are using package:webcrypto from scripts or `flutter test` '
48+
'make sure to run `flutter pub run webcrypto:setup` in the current '
49+
'root project.',
50+
);
51+
}
3952
}
4053

4154
// Try to lookup the 'webcrypto_lookup_symbol' symbol.

0 commit comments

Comments
 (0)