diff --git a/packages/flutter_goldens/lib/flutter_goldens.dart b/packages/flutter_goldens/lib/flutter_goldens.dart index d824c53491..1675144d63 100644 --- a/packages/flutter_goldens/lib/flutter_goldens.dart +++ b/packages/flutter_goldens/lib/flutter_goldens.dart @@ -10,6 +10,7 @@ import 'package:file/local.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:platform/platform.dart'; +import 'package:process/process.dart'; import 'skia_client.dart'; export 'skia_client.dart'; @@ -56,6 +57,7 @@ Future testExecutable(FutureOr Function() testMain, {String? namePre ); const Platform platform = LocalPlatform(); const FileSystem fs = LocalFileSystem(); + const ProcessManager process = LocalProcessManager(); if (FlutterPostSubmitFileComparator.isForEnvironment(platform)) { goldenFileComparator = await FlutterPostSubmitFileComparator.fromLocalFileComparator( localFileComparator: goldenFileComparator as LocalFileComparator, @@ -63,6 +65,7 @@ Future testExecutable(FutureOr Function() testMain, {String? namePre namePrefix: namePrefix, log: print, fs: fs, + process: process, ); } else if (FlutterPreSubmitFileComparator.isForEnvironment(platform)) { goldenFileComparator = await FlutterPreSubmitFileComparator.fromLocalFileComparator( @@ -71,6 +74,7 @@ Future testExecutable(FutureOr Function() testMain, {String? namePre namePrefix: namePrefix, log: print, fs: fs, + process: process, ); } else if (FlutterSkippingFileComparator.isForEnvironment(platform)) { goldenFileComparator = FlutterSkippingFileComparator.fromLocalFileComparator( @@ -82,6 +86,7 @@ Future testExecutable(FutureOr Function() testMain, {String? namePre namePrefix: namePrefix, log: print, fs: fs, + process: process, ); } else { goldenFileComparator = await FlutterLocalFileComparator.fromLocalFileComparator( @@ -89,6 +94,7 @@ Future testExecutable(FutureOr Function() testMain, {String? namePre platform: platform, log: print, fs: fs, + process: process, ); } await testMain(); @@ -280,6 +286,7 @@ class FlutterPostSubmitFileComparator extends FlutterGoldenFileComparator { String? namePrefix, required LogCallback log, required FileSystem fs, + required ProcessManager process, }) async { final Directory baseDirectory = FlutterGoldenFileComparator.getBaseDirectory( localFileComparator, @@ -294,6 +301,7 @@ class FlutterPostSubmitFileComparator extends FlutterGoldenFileComparator { log: log, platform: platform, fs: fs, + process: process, ); await goldens.auth(); return FlutterPostSubmitFileComparator( @@ -369,6 +377,7 @@ class FlutterPreSubmitFileComparator extends FlutterGoldenFileComparator { String? namePrefix, required LogCallback log, required FileSystem fs, + required ProcessManager process, }) async { final Directory baseDirectory = testBasedir ?? FlutterGoldenFileComparator.getBaseDirectory( localFileComparator, @@ -386,6 +395,7 @@ class FlutterPreSubmitFileComparator extends FlutterGoldenFileComparator { platform: platform, log: log, fs: fs, + process: process, ); await goldens.auth(); @@ -466,6 +476,7 @@ class FlutterSkippingFileComparator extends FlutterGoldenFileComparator { required Platform platform, required LogCallback log, required FileSystem fs, + required ProcessManager process, }) { final Uri basedir = localFileComparator.basedir; final SkiaGoldClient skiaClient = SkiaGoldClient( @@ -473,6 +484,7 @@ class FlutterSkippingFileComparator extends FlutterGoldenFileComparator { platform: platform, log: log, fs: fs, + process: process, ); return FlutterSkippingFileComparator( basedir, @@ -559,6 +571,7 @@ class FlutterLocalFileComparator extends FlutterGoldenFileComparator with LocalC Directory? baseDirectory, required LogCallback log, required FileSystem fs, + required ProcessManager process, }) async { baseDirectory ??= FlutterGoldenFileComparator.getBaseDirectory( localFileComparator, @@ -575,6 +588,7 @@ class FlutterLocalFileComparator extends FlutterGoldenFileComparator with LocalC platform: platform, log: log, fs: fs, + process: process, ); try { // Check if we can reach Gold. diff --git a/packages/flutter_goldens/lib/skia_client.dart b/packages/flutter_goldens/lib/skia_client.dart index 5a5fbd21d9..d5296a068e 100644 --- a/packages/flutter_goldens/lib/skia_client.dart +++ b/packages/flutter_goldens/lib/skia_client.dart @@ -50,7 +50,7 @@ class SkiaGoldClient { SkiaGoldClient( this.workDirectory, { required this.fs, - this.process = const LocalProcessManager(), + required this.process, required this.platform, Abi? abi, io.HttpClient? httpClient, diff --git a/packages/flutter_goldens/test/flutter_goldens_test.dart b/packages/flutter_goldens/test/flutter_goldens_test.dart index 0f051203d1..3daca56ba4 100644 --- a/packages/flutter_goldens/test/flutter_goldens_test.dart +++ b/packages/flutter_goldens/test/flutter_goldens_test.dart @@ -858,6 +858,7 @@ void main() { goldens: fakeSkiaClient, log: (String message) => fail('skia gold client printed unexpected output: "$message"'), fs: fs, + process: FakeProcessManager(), ); expect(fakeSkiaClient.initCalls, 0); }); @@ -944,6 +945,7 @@ void main() { goldens: fakeSkiaClient, log: (String message) => fail('skia gold client printed unexpected output: "$message"'), fs: fs, + process: FakeProcessManager(), ); expect(fakeSkiaClient.tryInitCalls, 0); }); @@ -1047,6 +1049,7 @@ void main() { baseDirectory: fakeDirectory, log: (String message) => fail('skia gold client printed unexpected output: "$message"'), fs: fs, + process: FakeProcessManager(), ); expect(comparator1.runtimeType, FlutterSkippingFileComparator); @@ -1058,6 +1061,7 @@ void main() { baseDirectory: fakeDirectory, log: (String message) => fail('skia gold client printed unexpected output: "$message"'), fs: fs, + process: FakeProcessManager(), ); expect(comparator2.runtimeType, FlutterSkippingFileComparator); @@ -1069,6 +1073,7 @@ void main() { baseDirectory: fakeDirectory, log: (String message) => fail('skia gold client printed unexpected output: "$message"'), fs: fs, + process: FakeProcessManager(), ); expect(comparator3.runtimeType, FlutterSkippingFileComparator);