Merge pull request #2551 from leancodepl/add-os-version-to-destination

Add os version to destination in xcodebuild test-without-building
leancodepl · Mar 4, 2025 · 8e93ded · 8e93ded
2 parents 5c272a9 + 8097c0c
commit 8e93ded
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 3 deletions.
diff --git a/packages/patrol_cli/CHANGELOG.md b/packages/patrol_cli/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Unreleased
+
+- Add `--ios` flag to `patrol test` that specifies the iOS version to use. (#2540)
+
 ## 3.5.1
 
 - Gracefully handle when analytics fail to send. (#2460)

diff --git a/packages/patrol_cli/lib/src/commands/build_ios.dart b/packages/patrol_cli/lib/src/commands/build_ios.dart
@@ -155,6 +155,7 @@ class BuildIOSCommand extends PatrolCommand {
       scheme: flutterOpts.buildMode.createScheme(flavor),
       configuration: flutterOpts.buildMode.createConfiguration(flavor),
       simulator: boolArg('simulator'),
+      osVersion: stringArg('ios') ?? 'latest',
       appServerPort: super.appServerPort,
       testServerPort: super.testServerPort,
       clearPermissions: boolArg('clear-permissions'),

diff --git a/packages/patrol_cli/lib/src/commands/develop.dart b/packages/patrol_cli/lib/src/commands/develop.dart
@@ -225,6 +225,7 @@ class DevelopCommand extends PatrolCommand {
       scheme: buildMode.createScheme(iosFlavor),
       configuration: buildMode.createConfiguration(iosFlavor),
       simulator: !device.real,
+      osVersion: stringArg('ios') ?? 'latest',
       appServerPort: super.appServerPort,
       testServerPort: super.testServerPort,
     );

diff --git a/packages/patrol_cli/lib/src/commands/test.dart b/packages/patrol_cli/lib/src/commands/test.dart
@@ -236,6 +236,7 @@ See https://github.com/leancodepl/patrol/issues/1316 to learn more.
       scheme: buildMode.createScheme(iosFlavor),
       configuration: buildMode.createConfiguration(iosFlavor),
       simulator: !device.real,
+      osVersion: stringArg('ios') ?? 'latest',
       appServerPort: super.appServerPort,
       testServerPort: super.testServerPort,
       clearPermissions: boolArg('clear-permissions'),

diff --git a/packages/patrol_cli/lib/src/crossplatform/app_options.dart b/packages/patrol_cli/lib/src/crossplatform/app_options.dart
@@ -190,6 +190,7 @@ class IOSAppOptions {
     required this.scheme,
     required this.configuration,
     required this.simulator,
+    required this.osVersion,
     required this.appServerPort,
     required this.testServerPort,
     this.clearPermissions = false,
@@ -199,6 +200,7 @@ class IOSAppOptions {
   final String? bundleId;
   final String scheme;
   final String configuration;
+  final String osVersion;
   final bool simulator;
   final int appServerPort;
   final int testServerPort;
@@ -274,7 +276,7 @@ class IOSAppOptions {
       ...['-only-testing', 'RunnerUITests/RunnerUITests'],
       ...[
         '-destination',
-        'platform=${device.real ? 'iOS' : 'iOS Simulator'},name=${device.name}',
+        'platform=${device.real ? 'iOS' : 'iOS Simulator'},name=${device.name},OS=$osVersion',
       ],
       ...['-destination-timeout', '1'],
       ...['-resultBundlePath', resultBundlePath],

diff --git a/packages/patrol_cli/lib/src/runner/patrol_command.dart b/packages/patrol_cli/lib/src/runner/patrol_command.dart
@@ -167,6 +167,11 @@ abstract class PatrolCommand extends Command<int> {
         help:
             'Clear permissions available through XCUIProtectedResource API before running each test.',
         negatable: false,
+      )
+      ..addOption(
+        'ios',
+        help: 'Pass iOS version. If empty, `latest` will be used.',
+        valueHelp: '17.5',
       );
   }
 

diff --git a/packages/patrol_cli/test/crossplatform/app_options_test.dart b/packages/patrol_cli/test/crossplatform/app_options_test.dart
@@ -199,6 +199,7 @@ void main() {
           scheme: 'Runner',
           configuration: 'Debug',
           simulator: true,
+          osVersion: 'latest',
           testServerPort: 8081,
           appServerPort: 8082,
         );
@@ -256,7 +257,7 @@ void main() {
             ...['xcodebuild', 'test-without-building'],
             ...['-xctestrun', xcTestRunPath],
             ...['-only-testing', 'RunnerUITests/RunnerUITests'],
-            ...['-destination', 'platform=iOS,name=iPhone 13'],
+            ...['-destination', 'platform=iOS,name=iPhone 13,OS=latest'],
             ...['-destination-timeout', '1'],
             ...['-resultBundlePath', ''],
           ]),
@@ -282,6 +283,7 @@ void main() {
           scheme: 'Runner',
           configuration: 'Debug',
           simulator: true,
+          osVersion: '17.5',
           testServerPort: 8081,
           appServerPort: 8082,
         );
@@ -337,7 +339,7 @@ void main() {
             ...['xcodebuild', 'test-without-building'],
             ...['-xctestrun', xcTestRunPath],
             ...['-only-testing', 'RunnerUITests/RunnerUITests'],
-            ...['-destination', 'platform=iOS,name=iPhone 13'],
+            ...['-destination', 'platform=iOS,name=iPhone 13,OS=17.5'],
             ...['-destination-timeout', '1'],
             ...['-resultBundlePath', ''],
           ]),
@@ -367,6 +369,7 @@ void main() {
             scheme: 'prod',
             configuration: 'Release-prod',
             simulator: false,
+            osVersion: '18.0',
             testServerPort: 8081,
             appServerPort: 8082,
           );