Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[webview_flutter] Fix Flaky Resize Test #4460

Merged
bparrishMines merged 7 commits into from
Nov 16, 2021
Merged

[webview_flutter] Fix Flaky Resize Test #4460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cb75075
fix resize test
bparrishMines Oct 29, 2021
1ea9f8c
comments
bparrishMines Oct 29, 2021
7c2b2db
wait for resizes instead
bparrishMines Nov 3, 2021
57fd7a5
await for pumpAndSettle
bparrishMines Nov 3, 2021
9b76598
wait for page to finish loading
bparrishMines Nov 3, 2021
ed1309a
Merge branch 'master' of github.com:flutter/plugins into webview_pige…
bparrishMines Nov 3, 2021
15bb4e9
fix platform dependent wait
bparrishMines Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
179 changes: 95 additions & 84 deletions packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import 'dart:io';
import 'dart:typed_data';

import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_test/flutter_test.dart';
Expand Down Expand Up @@ -162,91 +163,30 @@ void main() {
}, skip: Platform.isAndroid && _skipDueToIssue86757);

testWidgets('resize webview', (WidgetTester tester) async {
final String resizeTest = '''
<!DOCTYPE html><html>
<head><title>Resize test</title>
<script type="text/javascript">
function onResize() {
Resize.postMessage("resize");
}
function onLoad() {
window.onresize = onResize;
}
</script>
</head>
<body onload="onLoad();" bgColor="blue">
</body>
</html>
''';
final String resizeTestBase64 =
base64Encode(const Utf8Encoder().convert(resizeTest));
final Completer<void> resizeCompleter = Completer<void>();
final Completer<void> pageStarted = Completer<void>();
final Completer<void> pageLoaded = Completer<void>();
final Completer<WebViewController> controllerCompleter =
Completer<WebViewController>();
final GlobalKey key = GlobalKey();

final WebView webView = WebView(
key: key,
initialUrl: 'data:text/html;charset=utf-8;base64,$resizeTestBase64',
onWebViewCreated: (WebViewController controller) {
controllerCompleter.complete(controller);
final Completer<void> initialResizeCompleter = Completer<void>();
final Completer<void> buttonTapResizeCompleter = Completer<void>();
final Completer<void> onPageFinished = Completer<void>();

bool resizeButtonTapped = false;
await tester.pumpWidget(ResizableWebView(
onResize: (_) {
if (resizeButtonTapped) {
buttonTapResizeCompleter.complete();
} else {
initialResizeCompleter.complete();
}
},
javascriptChannels: <JavascriptChannel>{
JavascriptChannel(
name: 'Resize',
onMessageReceived: (JavascriptMessage message) {
resizeCompleter.complete(true);
},
),
},
onPageStarted: (String url) {
pageStarted.complete(null);
},
onPageFinished: (String url) {
pageLoaded.complete(null);
},
javascriptMode: JavascriptMode.unrestricted,
);

await tester.pumpWidget(
Directionality(
textDirection: TextDirection.ltr,
child: Column(
children: <Widget>[
SizedBox(
width: 200,
height: 200,
child: webView,
),
],
),
),
);

await controllerCompleter.future;
await pageStarted.future;
await pageLoaded.future;

expect(resizeCompleter.isCompleted, false);

await tester.pumpWidget(
Directionality(
textDirection: TextDirection.ltr,
child: Column(
children: <Widget>[
SizedBox(
width: 400,
height: 400,
child: webView,
),
],
),
),
);

await resizeCompleter.future;
onPageFinished: () => onPageFinished.complete(),
));
await onPageFinished.future;
if (Platform.isAndroid) {
await initialResizeCompleter.future;
}

resizeButtonTapped = true;
await tester.tap(find.byKey(const ValueKey('resizeButton')));
await tester.pumpAndSettle();
expect(buttonTapResizeCompleter.future, completes);
});

testWidgets('set custom userAgent', (WidgetTester tester) async {
Expand Down Expand Up @@ -1471,3 +1411,74 @@ Future<String> _evaluateJavascript(
}
return jsonDecode(await controller.evaluateJavascript(js));
}

class ResizableWebView extends StatefulWidget {
ResizableWebView({required this.onResize, required this.onPageFinished});

final JavascriptMessageHandler onResize;
final VoidCallback onPageFinished;

@override
State<StatefulWidget> createState() => ResizableWebViewState();
}

class ResizableWebViewState extends State<ResizableWebView> {
double webViewWidth = 200;
double webViewHeight = 200;

static const String resizePage = '''
<!DOCTYPE html><html>
<head><title>Resize test</title>
<script type="text/javascript">
function onResize() {
Resize.postMessage("resize");
}
function onLoad() {
window.onresize = onResize;
}
</script>
</head>
<body onload="onLoad();" bgColor="blue">
</body>
</html>
''';

@override
Widget build(BuildContext context) {
final String resizeTestBase64 =
base64Encode(const Utf8Encoder().convert(resizePage));
return Directionality(
textDirection: TextDirection.ltr,
child: Column(
children: <Widget>[
SizedBox(
width: webViewWidth,
height: webViewHeight,
child: WebView(
initialUrl:
'data:text/html;charset=utf-8;base64,$resizeTestBase64',
javascriptChannels: <JavascriptChannel>{
JavascriptChannel(
name: 'Resize',
onMessageReceived: widget.onResize,
),
},
onPageFinished: (_) => widget.onPageFinished(),
javascriptMode: JavascriptMode.unrestricted,
),
),
TextButton(
key: Key('resizeButton'),
onPressed: () {
setState(() {
webViewWidth += 100.0;
webViewHeight += 100.0;
});
},
child: Text('ResizeButton'),
),
],
),
);
}
}
177 changes: 93 additions & 84 deletions ...ebview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,91 +185,29 @@ void main() {
}, skip: _skipDueToIssue86757);

testWidgets('resize webview', (WidgetTester tester) async {
final String resizeTest = '''
<!DOCTYPE html><html>
<head><title>Resize test</title>
<script type="text/javascript">
function onResize() {
Resize.postMessage("resize");
}
function onLoad() {
window.onresize = onResize;
}
</script>
</head>
<body onload="onLoad();" bgColor="blue">
</body>
</html>
''';
final String resizeTestBase64 =
base64Encode(const Utf8Encoder().convert(resizeTest));
final Completer<void> resizeCompleter = Completer<void>();
final Completer<void> pageStarted = Completer<void>();
final Completer<void> pageLoaded = Completer<void>();
final Completer<WebViewController> controllerCompleter =
Completer<WebViewController>();
final GlobalKey key = GlobalKey();

final WebView webView = WebView(
key: key,
initialUrl: 'data:text/html;charset=utf-8;base64,$resizeTestBase64',
onWebViewCreated: (WebViewController controller) {
controllerCompleter.complete(controller);
final Completer<void> initialResizeCompleter = Completer<void>();
final Completer<void> buttonTapResizeCompleter = Completer<void>();
final Completer<void> onPageFinished = Completer<void>();

bool resizeButtonTapped = false;
await tester.pumpWidget(ResizableWebView(
onResize: (_) {
print(resizeButtonTapped);
if (resizeButtonTapped) {
buttonTapResizeCompleter.complete();
} else {
initialResizeCompleter.complete();
}
},
javascriptChannels: <JavascriptChannel>{
JavascriptChannel(
name: 'Resize',
onMessageReceived: (JavascriptMessage message) {
resizeCompleter.complete(true);
},
),
},
onPageStarted: (String url) {
pageStarted.complete(null);
},
onPageFinished: (String url) {
pageLoaded.complete(null);
},
javascriptMode: JavascriptMode.unrestricted,
);

await tester.pumpWidget(
Directionality(
textDirection: TextDirection.ltr,
child: Column(
children: <Widget>[
SizedBox(
width: 200,
height: 200,
child: webView,
),
],
),
),
);

await controllerCompleter.future;
await pageStarted.future;
await pageLoaded.future;

expect(resizeCompleter.isCompleted, false);

await tester.pumpWidget(
Directionality(
textDirection: TextDirection.ltr,
child: Column(
children: <Widget>[
SizedBox(
width: 400,
height: 400,
child: webView,
),
],
),
),
);

await resizeCompleter.future;
onPageFinished: () => onPageFinished.complete(),
));
await onPageFinished.future;
await initialResizeCompleter.future;

resizeButtonTapped = true;
await tester.tap(find.byKey(const ValueKey('resizeButton')));
await tester.pumpAndSettle();
expect(buttonTapResizeCompleter.future, completes);
});

testWidgets('set custom userAgent', (WidgetTester tester) async {
Expand Down Expand Up @@ -1440,3 +1378,74 @@ Future<String> _runJavaScriptReturningResult(
WebViewController controller, String js) async {
return jsonDecode(await controller.runJavascriptReturningResult(js));
}

class ResizableWebView extends StatefulWidget {
ResizableWebView({required this.onResize, required this.onPageFinished});

final JavascriptMessageHandler onResize;
final VoidCallback onPageFinished;

@override
State<StatefulWidget> createState() => ResizableWebViewState();
}

class ResizableWebViewState extends State<ResizableWebView> {
double webViewWidth = 200;
double webViewHeight = 200;

static const String resizePage = '''
<!DOCTYPE html><html>
<head><title>Resize test</title>
<script type="text/javascript">
function onResize() {
Resize.postMessage("resize");
}
function onLoad() {
window.onresize = onResize;
}
</script>
</head>
<body onload="onLoad();" bgColor="blue">
</body>
</html>
''';

@override
Widget build(BuildContext context) {
final String resizeTestBase64 =
base64Encode(const Utf8Encoder().convert(resizePage));
return Directionality(
textDirection: TextDirection.ltr,
child: Column(
children: <Widget>[
SizedBox(
width: webViewWidth,
height: webViewHeight,
child: WebView(
initialUrl:
'data:text/html;charset=utf-8;base64,$resizeTestBase64',
javascriptChannels: <JavascriptChannel>{
JavascriptChannel(
name: 'Resize',
onMessageReceived: widget.onResize,
),
},
onPageFinished: (_) => widget.onPageFinished(),
javascriptMode: JavascriptMode.unrestricted,
),
),
TextButton(
key: Key('resizeButton'),
onPressed: () {
setState(() {
webViewWidth += 100.0;
webViewHeight += 100.0;
});
},
child: Text('ResizeButton'),
),
],
),
);
}
}
Loading