Merge branch 'main' into multicast-dns-excerpt-removal

flutter · Dec 8, 2023 · 6c317f0 · 6c317f0
2 parents 46b374e + b99ade6
commit 6c317f0
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 10 deletions.
diff --git a/...google_maps_flutter/google_maps_flutter/example/integration_test/src/maps_controller.dart b/...google_maps_flutter/google_maps_flutter/example/integration_test/src/maps_controller.dart
@@ -70,7 +70,9 @@ void runTests() {
       // Android doesn't like the layout required for the web, so we skip web in this test.
       // The equivalent web test already exists here:
       // https://github.com/flutter/packages/blob/c43cc13498a1a1c4f3d1b8af2add9ce7c15bd6d0/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/projection_test.dart#L78
-      skip: isWeb);
+      skip: isWeb ||
+          // TODO(stuartmorgan): Re-enable; see https://github.com/flutter/flutter/issues/139825
+          isIOS);
 
   testWidgets('testGetVisibleRegion', (WidgetTester tester) async {
     final Key key = GlobalKey();
@@ -135,7 +137,9 @@ void runTests() {
 
     expect(firstVisibleRegion, isNot(secondVisibleRegion));
     expect(secondVisibleRegion.contains(newCenter), isTrue);
-  });
+  },
+      // TODO(stuartmorgan): Re-enable; see https://github.com/flutter/flutter/issues/139825
+      skip: isIOS);
 
   testWidgets('testSetMapStyle valid Json String', (WidgetTester tester) async {
     final Key key = GlobalKey();
@@ -269,7 +273,9 @@ void runTests() {
     await tester.pumpAndSettle();
     zoom = await controller.getZoomLevel();
     expect(zoom, equals(7));
-  });
+  },
+      // TODO(stuartmorgan): Re-enable; see https://github.com/flutter/flutter/issues/139825
+      skip: isIOS);
 
   testWidgets('testScreenCoordinate', (WidgetTester tester) async {
     final Key key = GlobalKey();
@@ -302,7 +308,9 @@ void runTests() {
     final ScreenCoordinate topLeft =
         await controller.getScreenCoordinate(northWest);
     expect(topLeft, const ScreenCoordinate(x: 0, y: 0));
-  });
+  },
+      // TODO(stuartmorgan): Re-enable; see https://github.com/flutter/flutter/issues/139825
+      skip: isIOS);
 
   testWidgets('testResizeWidget', (WidgetTester tester) async {
     final Completer<GoogleMapController> controllerCompleter =
@@ -414,7 +422,8 @@ void runTests() {
   },
       // TODO(cyanglaz): un-skip the test when we can test this on CI with API key enabled.
       // https://github.com/flutter/flutter/issues/57057
-      skip: isAndroid || isWeb);
+      // https://github.com/flutter/flutter/issues/139825
+      skip: isAndroid || isWeb || isIOS);
 
   testWidgets(
     'testCloudMapId',

diff --git a/...maps_flutter/google_maps_flutter_ios/example/ios11/integration_test/google_maps_test.dart b/...maps_flutter/google_maps_flutter_ios/example/ios11/integration_test/google_maps_test.dart
@@ -341,7 +341,9 @@ void main() {
     expect(coordinate.y, (rect.center.dy - rect.topLeft.dy).round());
 
     await tester.binding.setSurfaceSize(null);
-  });
+  },
+      // TODO(stuartmorgan): Re-enable; see https://github.com/flutter/flutter/issues/139825
+      skip: true);
 
   testWidgets('testGetVisibleRegion', (WidgetTester tester) async {
     final Key key = GlobalKey();
@@ -409,7 +411,9 @@ void main() {
 
     expect(firstVisibleRegion, isNot(secondVisibleRegion));
     expect(secondVisibleRegion.contains(newCenter), isTrue);
-  });
+  },
+      // TODO(stuartmorgan): Re-enable; see https://github.com/flutter/flutter/issues/139825
+      skip: true);
 
   testWidgets('testTraffic', (WidgetTester tester) async {
     final Key key = GlobalKey();
@@ -699,7 +703,9 @@ void main() {
     await tester.pumpAndSettle();
     zoom = await controller.getZoomLevel();
     expect(zoom, equals(7));
-  });
+  },
+      // TODO(stuartmorgan): Re-enable; see https://github.com/flutter/flutter/issues/139825
+      skip: true);
 
   testWidgets('testScreenCoordinate', (WidgetTester tester) async {
     final Key key = GlobalKey();
@@ -733,7 +739,9 @@ void main() {
     final ScreenCoordinate topLeft =
         await controller.getScreenCoordinate(northWest);
     expect(topLeft, const ScreenCoordinate(x: 0, y: 0));
-  });
+  },
+      // TODO(stuartmorgan): Re-enable; see https://github.com/flutter/flutter/issues/139825
+      skip: true);
 
   testWidgets('testResizeWidget', (WidgetTester tester) async {
     final Completer<ExampleGoogleMapController> controllerCompleter =
@@ -841,7 +849,9 @@ void main() {
         await controllerCompleter.future;
     final Uint8List? bytes = await controller.takeSnapshot();
     expect(bytes?.isNotEmpty, true);
-  });
+  },
+      // TODO(stuartmorgan): Re-enable; see https://github.com/flutter/flutter/issues/139825
+      skip: true);
 
   testWidgets(
     'set tileOverlay correctly',