Add support for multiple full paths on macos

pkgs/test/CHANGELOG.md

@@ -3,6 +3,7 @@
 * Fix dart2wasm tests on windows.
 * Increase SDK constraint to ^3.5.0-311.0.dev.
 * Support running Node.js tests compiled with dart2wasm.
+* Allow `firefox` or `firefox-bin` executable name on macOS.
 
 ## 1.25.8
 

pkgs/test/lib/src/runner/browser/default_settings.dart

@@ -24,7 +24,10 @@ final defaultSettings = UnmodifiableMapView({
   ),
   Runtime.firefox: ExecutableSettings(
       linuxExecutable: 'firefox',
-      macOSExecutable: '/Applications/Firefox.app/Contents/MacOS/firefox-bin',
+      macOsAbsolutePaths: {
+        '/Applications/Firefox.app/Contents/MacOS/firefox-bin',
+        '/Applications/Firefox.app/Contents/MacOS/firefox'
+      },
       windowsExecutable: r'Mozilla Firefox\firefox.exe',
       environmentOverride: 'FIREFOX_EXECUTABLE'),
   Runtime.safari: ExecutableSettings(

pkgs/test/lib/src/runner/executable_settings.dart

@@ -20,12 +20,19 @@ class ExecutableSettings {
   /// looked up on the system path. It may not be relative.
   final String? _linuxExecutable;
 
-  /// The path to the executable on Mac OS.
+  /// The command to execute on Mac OS.
   ///
-  /// This may be an absolute path or a basename, in which case it will be
-  /// looked up on the system path. It may not be relative.
+  /// This may be a basename or an absolute path.
+  /// If this is a basename it is resolved by the OS on the system path.
+  /// Otherwise, the path must be absolute, not relative.
   final String? _macOSExecutable;
 
+  /// Potential absolute paths to the executable on Mac OS.
+  ///
+  /// When multiple paths are provided the first to exist on the filesystem is
+  /// chosen. Paths must be absolute.
+  final Set<String>? _macOSAbsolutePaths;
+
   /// The path to the executable on Windows.
   ///
   /// This may be an absolute path; a basename, in which case it will be looked
@@ -45,7 +52,14 @@ class ExecutableSettings {
       if (envVariable != null) return envVariable;
     }
 
-    if (Platform.isMacOS) return _macOSExecutable!;
+    if (Platform.isMacOS) {
+      if (_macOSAbsolutePaths case final paths?) {
+        for (final path in paths) {
+          if (File(path).existsSync()) return path;
+        }
+      }
+      return (_macOSExecutable ?? _macOSAbsolutePaths?.first)!;
+    }
     if (!Platform.isWindows) return _linuxExecutable!;
     final windowsExecutable = _windowsExecutable!;
     if (p.isAbsolute(windowsExecutable)) return windowsExecutable;
@@ -177,12 +191,14 @@ class ExecutableSettings {
       {Iterable<String>? arguments,
       String? linuxExecutable,
       String? macOSExecutable,
+      Set<String>? macOsAbsolutePaths,
       String? windowsExecutable,
       String? environmentOverride,
       bool? headless})
       : arguments = arguments == null ? const [] : List.unmodifiable(arguments),
         _linuxExecutable = linuxExecutable,
         _macOSExecutable = macOSExecutable,
+        _macOSAbsolutePaths = macOsAbsolutePaths,
         _windowsExecutable = windowsExecutable,
         _environmentOverride = environmentOverride,
         _headless = headless;
@@ -193,5 +209,6 @@ class ExecutableSettings {
       headless: other._headless ?? _headless,
       linuxExecutable: other._linuxExecutable ?? _linuxExecutable,
       macOSExecutable: other._macOSExecutable ?? _macOSExecutable,
+      macOsAbsolutePaths: other._macOSAbsolutePaths ?? _macOSAbsolutePaths,
       windowsExecutable: other._windowsExecutable ?? _windowsExecutable);
 }