Skip to content

Commit 56df73e

Browse files
[extension_google_sign_in_as_googleapis_auth][google_maps_flutter_ios] Manual roll with fixes to example and skipping some native tests (flutter#7571)
It looks like flutter/packages#7521 missed a few packages examples and they are now failing to compile on main. Some native tests have also began to fail consistently for `google_maps_flutter_ios`: flutter#154641 Some legacy iOS `webview_flutter` tests were also failing: flutter#154676
1 parent 71e827e commit 56df73e

File tree

5 files changed

+20
-5
lines changed

5 files changed

+20
-5
lines changed

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b8f89f70bf4e8c304fc909b58e23f2358983bb41
1+
45ef8f36ff417550b1bd80dfb2add356be1bb8d1

packages/extension_google_sign_in_as_googleapis_auth/example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:7.4.2'
8+
classpath 'com.android.tools.build:gradle:8.5.2'
99
classpath 'com.google.gms:google-services:4.3.15'
1010
}
1111
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
org.gradle.jvmargs=-Xmx1536M
1+
org.gradle.jvmargs=-Xmx4G
22
android.useAndroidX=true
33
android.enableJetifier=true

packages/google_maps_flutter/google_maps_flutter_ios/example/ios14/ios/RunnerUITests/GoogleMapsUITests.m

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
static const NSTimeInterval kWaitTime = 60;
1010

11+
// TODO(bparrishMines): Remove once https://github.com/flutter/flutter/issues/154641 is fixed.
12+
static const BOOL skipFor154641 = YES;
13+
1114
@interface GoogleMapsUITests : XCTestCase
1215
@property(nonatomic, strong) XCUIApplication *app;
1316
@end
@@ -46,6 +49,8 @@ - (void)setUp {
4649
}
4750

4851
- (void)testUserInterface {
52+
XCTSkipIf(skipFor154641);
53+
4954
XCUIApplication *app = self.app;
5055
XCUIElement *userInteface = app.staticTexts[@"User interface"];
5156
if (![userInteface waitForExistenceWithTimeout:kWaitTime]) {
@@ -77,6 +82,8 @@ - (void)testUserInterface {
7782
}
7883

7984
- (void)testMapCoordinatesPage {
85+
XCTSkipIf(skipFor154641);
86+
8087
XCUIApplication *app = self.app;
8188
XCUIElement *mapCoordinates = app.staticTexts[@"Map coordinates"];
8289
if (![mapCoordinates waitForExistenceWithTimeout:kWaitTime]) {
@@ -168,6 +175,8 @@ - (void)validateVisibleRegion:(NSString *)label
168175
}
169176

170177
- (void)testMapClickPage {
178+
XCTSkipIf(skipFor154641);
179+
171180
XCUIApplication *app = self.app;
172181
XCUIElement *mapClick = app.staticTexts[@"Map click"];
173182
if (![mapClick waitForExistenceWithTimeout:kWaitTime]) {
@@ -212,6 +221,8 @@ - (void)forceTap:(XCUIElement *)button {
212221
}
213222

214223
- (void)testMarkerDraggingCallbacks {
224+
XCTSkipIf(skipFor154641);
225+
215226
XCUIApplication *application = [[XCUIApplication alloc] init];
216227
[application launch];
217228
XCUIElement *placeMarkerButton = application.staticTexts[@"Place marker"];

packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/legacy/webview_flutter_test.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ import 'package:webview_flutter_wkwebview_example/legacy/navigation_decision.dar
2222
import 'package:webview_flutter_wkwebview_example/legacy/navigation_request.dart';
2323
import 'package:webview_flutter_wkwebview_example/legacy/web_view.dart';
2424

25+
// TODO(bparrishMines): Remove once https://github.com/flutter/flutter/issues/154676
26+
// is fixed.
27+
const bool skipOnIosFor154676 = true;
28+
2529
Future<void> main() async {
2630
IntegrationTestWidgetsFlutterBinding.ensureInitialized();
2731

@@ -537,7 +541,7 @@ Future<void> main() async {
537541
final String fullScreen =
538542
await controller.runJavascriptReturningResult('isFullScreen();');
539543
expect(fullScreen, _webviewBool(false));
540-
});
544+
}, skip: Platform.isMacOS || skipOnIosFor154676);
541545

542546
testWidgets(
543547
'Video plays full screen when allowsInlineMediaPlayback is false',
@@ -587,7 +591,7 @@ Future<void> main() async {
587591
final String fullScreen =
588592
await controller.runJavascriptReturningResult('isFullScreen();');
589593
expect(fullScreen, _webviewBool(true));
590-
});
594+
}, skip: Platform.isMacOS || skipOnIosFor154676);
591595
},
592596
// allowsInlineMediaPlayback has no effect on macOS.
593597
skip: Platform.isMacOS);

0 commit comments

Comments
 (0)