From 96676c8d659eabb2fae747f54037718503d8a6b3 Mon Sep 17 00:00:00 2001
From: Felix Angelov <felix@shorebird.dev>
Date: Fri, 18 Aug 2023 16:33:09 -0500
Subject: [PATCH] fix(shorebird_cli): `shorebird doctor` flutter version
 validator (#1133)

---
 packages/shorebird_cli/lib/src/git.dart              |  4 ++--
 .../shorebird_cli/lib/src/shorebird_flutter.dart     |  2 +-
 packages/shorebird_cli/test/src/git_test.dart        | 10 +++++-----
 .../test/src/shorebird_flutter_test.dart             | 12 ++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/shorebird_cli/lib/src/git.dart b/packages/shorebird_cli/lib/src/git.dart
index 8651fd92..7dfe4e0a 100644
--- a/packages/shorebird_cli/lib/src/git.dart
+++ b/packages/shorebird_cli/lib/src/git.dart
@@ -93,11 +93,11 @@ class Git {
     required String directory,
     required String format,
     required String pattern,
-    String? pointsAt,
+    String? contains,
   }) async {
     final arguments = [
       'for-each-ref',
-      if (pointsAt != null) ...['--points-at', pointsAt],
+      if (contains != null) ...['--contains', contains],
       '--format',
       format,
       pattern,
diff --git a/packages/shorebird_cli/lib/src/shorebird_flutter.dart b/packages/shorebird_cli/lib/src/shorebird_flutter.dart
index 24a4362a..4e21b719 100644
--- a/packages/shorebird_cli/lib/src/shorebird_flutter.dart
+++ b/packages/shorebird_cli/lib/src/shorebird_flutter.dart
@@ -91,7 +91,7 @@ class ShorebirdFlutter {
   /// parsed.
   Future<String?> getVersion() async {
     final result = await git.forEachRef(
-      pointsAt: shorebirdEnv.flutterRevision,
+      contains: shorebirdEnv.flutterRevision,
       format: '%(refname:short)',
       pattern: 'refs/remotes/origin/flutter_release/*',
       directory: _workingDirectory(),
diff --git a/packages/shorebird_cli/test/src/git_test.dart b/packages/shorebird_cli/test/src/git_test.dart
index 71084745..9126491d 100644
--- a/packages/shorebird_cli/test/src/git_test.dart
+++ b/packages/shorebird_cli/test/src/git_test.dart
@@ -223,13 +223,13 @@ origin/flutter_release/3.10.6''';
         ).called(1);
       });
 
-      test('executes correct command w/points-at', () async {
-        const pointsAt = 'revision';
+      test('executes correct command w/contains', () async {
+        const contains = 'revision';
         when(() => processResult.stdout).thenReturn(output);
         await expectLater(
           runWithOverrides(
             () => git.forEachRef(
-              pointsAt: pointsAt,
+              contains: contains,
               pattern: pattern,
               format: format,
               directory: directory,
@@ -242,8 +242,8 @@ origin/flutter_release/3.10.6''';
             'git',
             [
               'for-each-ref',
-              '--points-at',
-              pointsAt,
+              '--contains',
+              contains,
               '--format',
               format,
               pattern,
diff --git a/packages/shorebird_cli/test/src/shorebird_flutter_test.dart b/packages/shorebird_cli/test/src/shorebird_flutter_test.dart
index da4aae62..df730908 100644
--- a/packages/shorebird_cli/test/src/shorebird_flutter_test.dart
+++ b/packages/shorebird_cli/test/src/shorebird_flutter_test.dart
@@ -78,7 +78,7 @@ void main() {
       when(
         () => git.forEachRef(
           directory: any(named: 'directory'),
-          pointsAt: any(named: 'pointsAt'),
+          contains: any(named: 'contains'),
           format: any(named: 'format'),
           pattern: any(named: 'pattern'),
         ),
@@ -160,7 +160,7 @@ Tools • Dart 3.0.6 • DevTools 2.23.1''');
         when(
           () => git.forEachRef(
             directory: any(named: 'directory'),
-            pointsAt: any(named: 'pointsAt'),
+            contains: any(named: 'contains'),
             format: any(named: 'format'),
             pattern: any(named: 'pattern'),
           ),
@@ -184,7 +184,7 @@ Tools • Dart 3.0.6 • DevTools 2.23.1''');
         verify(
           () => git.forEachRef(
             directory: p.join(flutterDirectory.parent.path, flutterRevision),
-            pointsAt: flutterRevision,
+            contains: flutterRevision,
             format: '%(refname:short)',
             pattern: 'refs/remotes/origin/flutter_release/*',
           ),
@@ -195,7 +195,7 @@ Tools • Dart 3.0.6 • DevTools 2.23.1''');
         when(
           () => git.forEachRef(
             directory: any(named: 'directory'),
-            pointsAt: any(named: 'pointsAt'),
+            contains: any(named: 'contains'),
             format: any(named: 'format'),
             pattern: any(named: 'pattern'),
           ),
@@ -207,7 +207,7 @@ Tools • Dart 3.0.6 • DevTools 2.23.1''');
         verify(
           () => git.forEachRef(
             directory: p.join(flutterDirectory.parent.path, flutterRevision),
-            pointsAt: flutterRevision,
+            contains: flutterRevision,
             format: '%(refname:short)',
             pattern: 'refs/remotes/origin/flutter_release/*',
           ),
@@ -222,7 +222,7 @@ Tools • Dart 3.0.6 • DevTools 2.23.1''');
         verify(
           () => git.forEachRef(
             directory: p.join(flutterDirectory.parent.path, flutterRevision),
-            pointsAt: flutterRevision,
+            contains: flutterRevision,
             format: '%(refname:short)',
             pattern: 'refs/remotes/origin/flutter_release/*',
           ),