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

Commit d6f1705

Browse files
committed
Split helper classes from main example widget.
Move the `WebView` and related `WebViewController` classes from the main.dart into a separate web_view.dart file.
1 parent 39718f1 commit d6f1705

File tree

8 files changed

+669
-637
lines changed

8 files changed

+669
-637
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## 0.0.1
1+
## 2.0.13
22

33
* Extract Android implementation from `webview_flutter`.
44

packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ import 'package:flutter_test/flutter_test.dart';
1414
import 'package:integration_test/integration_test.dart';
1515
import 'package:webview_flutter_android/webview_android.dart';
1616
import 'package:webview_flutter_android/webview_surface_android.dart';
17-
import 'package:webview_flutter_android_example/main.dart';
17+
import 'package:webview_flutter_android_example/navigation_decision.dart';
18+
import 'package:webview_flutter_android_example/navigation_request.dart';
19+
import 'package:webview_flutter_android_example/web_view.dart';
1820
import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
1921

2022
void main() {
2123
IntegrationTestWidgetsFlutterBinding.ensureInitialized();
2224

23-
const bool _skipDueIssue86757 = true;
25+
const bool _skipDueToIssue86757 = true;
2426

2527
// TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757.
2628
testWidgets('initialUrl', (WidgetTester tester) async {
@@ -43,7 +45,7 @@ void main() {
4345
final WebViewController controller = await controllerCompleter.future;
4446
final String? currentUrl = await controller.currentUrl();
4547
expect(currentUrl, 'https://flutter.dev/');
46-
}, skip: _skipDueIssue86757);
48+
}, skip: _skipDueToIssue86757);
4749

4850
// TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757.
4951
testWidgets('loadUrl', (WidgetTester tester) async {
@@ -65,7 +67,7 @@ void main() {
6567
await controller.loadUrl('https://www.google.com/');
6668
final String? currentUrl = await controller.currentUrl();
6769
expect(currentUrl, 'https://www.google.com/');
68-
}, skip: _skipDueIssue86757);
70+
}, skip: _skipDueToIssue86757);
6971

7072
// TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757.
7173
testWidgets('loadUrl with headers', (WidgetTester tester) async {
@@ -107,7 +109,7 @@ void main() {
107109
final String content = await controller
108110
.evaluateJavascript('document.documentElement.innerText');
109111
expect(content.contains('flutter_test_header'), isTrue);
110-
}, skip: _skipDueIssue86757);
112+
}, skip: _skipDueToIssue86757);
111113

112114
// TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757.
113115
testWidgets('JavaScriptChannel', (WidgetTester tester) async {
@@ -156,7 +158,7 @@ void main() {
156158
// https://github.com/flutter/flutter/issues/66318
157159
await controller.evaluateJavascript('Echo.postMessage("hello");1;');
158160
expect(messagesReceived, equals(<String>['hello']));
159-
}, skip: _skipDueIssue86757);
161+
}, skip: _skipDueToIssue86757);
160162

161163
testWidgets('resize webview', (WidgetTester tester) async {
162164
final String resizeTest = '''
@@ -334,7 +336,7 @@ void main() {
334336

335337
final String customUserAgent2 = await _getUserAgent(controller);
336338
expect(customUserAgent2, defaultPlatformUserAgent);
337-
}, skip: _skipDueIssue86757);
339+
}, skip: _skipDueToIssue86757);
338340

339341
group('Video playback policy', () {
340342
late String videoTestBase64;
@@ -831,7 +833,7 @@ void main() {
831833
scrollPosY = await controller.getScrollY();
832834
expect(scrollPosX, X_SCROLL * 2);
833835
expect(scrollPosY, Y_SCROLL * 2);
834-
}, skip: _skipDueIssue86757);
836+
}, skip: _skipDueToIssue86757);
835837
});
836838

837839
group('SurfaceAndroidWebView', () {
@@ -910,7 +912,7 @@ void main() {
910912
scrollPosY = await controller.getScrollY();
911913
expect(X_SCROLL * 2, scrollPosX);
912914
expect(Y_SCROLL * 2, scrollPosY);
913-
}, skip: _skipDueIssue86757);
915+
}, skip: _skipDueToIssue86757);
914916

915917
// TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757.
916918
testWidgets('inputs are scrolled into view when focused',
@@ -1016,7 +1018,7 @@ void main() {
10161018
lastInputClientRectRelativeToViewport['right'] <=
10171019
viewportRectRelativeToViewport['right'],
10181020
isTrue);
1019-
}, skip: _skipDueIssue86757);
1021+
}, skip: _skipDueToIssue86757);
10201022
});
10211023

10221024
group('NavigationDelegate', () {
@@ -1281,7 +1283,7 @@ void main() {
12811283
expect(currentUrl, 'https://flutter.dev/');
12821284
},
12831285
// Flaky on Android: https://github.com/flutter/flutter/issues/86757
1284-
skip: _skipDueIssue86757);
1286+
skip: _skipDueToIssue86757);
12851287

12861288
// TODO(bparrishMines): skipped due to https://github.com/flutter/flutter/issues/86757.
12871289
testWidgets(
@@ -1322,7 +1324,7 @@ void main() {
13221324
await pageLoaded.future;
13231325
expect(controller.currentUrl(), completion('https://flutter.dev/'));
13241326
},
1325-
skip: _skipDueIssue86757,
1327+
skip: _skipDueToIssue86757,
13261328
);
13271329

13281330
testWidgets(

0 commit comments

Comments
 (0)