starting to update tests

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 6.0.0
+## 6.0.0-beta.1
 
 - Deprecated old classes/properties/methods to make them eventually compatible with other Platforms and WebView engines.
 - Added Web support

example/integration_test/in_app_webview/initial_url_request.dart

@@ -0,0 +1,28 @@
+import 'dart:async';
+
+import 'package:flutter/widgets.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void initialUrlRequest() {
+  testWidgets('initialUrlRequest', (WidgetTester tester) async {
+    final Completer controllerCompleter = Completer<InAppWebViewController>();
+    await tester.pumpWidget(
+      Directionality(
+        textDirection: TextDirection.ltr,
+        child: InAppWebView(
+          key: GlobalKey(),
+          initialUrlRequest:
+          URLRequest(url: Uri.parse('https://github.com/flutter')),
+          onWebViewCreated: (controller) {
+            controllerCompleter.complete(controller);
+          },
+        ),
+      ),
+    );
+    final InAppWebViewController controller =
+    await controllerCompleter.future;
+    final String? currentUrl = (await controller.getUrl())?.toString();
+    expect(currentUrl, 'https://github.com/flutter');
+  });
+}

example/integration_test/in_app_webview/main.dart

@@ -0,0 +1,11 @@
+import 'package:flutter_test/flutter_test.dart';
+
+import 'initial_url_request.dart';
+import 'set_get_settings.dart';
+
+void main() {
+  group('InAppWebView', () {
+    initialUrlRequest();
+    setGetSettings();
+  });
+}

example/integration_test/in_app_webview/set_get_settings.dart

@@ -0,0 +1,46 @@
+import 'dart:async';
+
+import 'package:flutter/widgets.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+void setGetSettings() {
+  testWidgets('set/get settings', (WidgetTester tester) async {
+    final Completer controllerCompleter = Completer<InAppWebViewController>();
+    final Completer<void> pageLoaded = Completer<void>();
+
+    await tester.pumpWidget(
+      Directionality(
+        textDirection: TextDirection.ltr,
+        child: InAppWebView(
+          key: GlobalKey(),
+          initialUrlRequest:
+          URLRequest(url: Uri.parse('https://github.com/flutter')),
+          initialSettings: InAppWebViewSettings(
+              javaScriptEnabled: false
+          ),
+          onWebViewCreated: (controller) {
+            controllerCompleter.complete(controller);
+          },
+          onLoadStop: (controller, url) {
+            pageLoaded.complete();
+          },
+        ),
+      ),
+    );
+    final InAppWebViewController controller =
+    await controllerCompleter.future;
+    await pageLoaded.future;
+
+    InAppWebViewSettings? settings = await controller.getSettings();
+    expect(settings, isNotNull);
+    expect(settings!.javaScriptEnabled, false);
+
+    await controller.setSettings(settings: InAppWebViewSettings(
+        javaScriptEnabled: true));
+
+    settings = await controller.getSettings();
+    expect(settings, isNotNull);
+    expect(settings!.javaScriptEnabled, true);
+  });
+}

example/integration_test/webview_flutter_test.dart

@@ -13,6 +13,8 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:path_provider/path_provider.dart';
 
+import 'in_app_webview/main.dart' as in_app_webview_test;
+
 import '.env.dart';
 
 /// Returns a matcher that matches the isNullOrEmpty property.
@@ -87,71 +89,13 @@ class MyChromeSafariBrowser extends ChromeSafariBrowser {
 
 void main() {
   IntegrationTestWidgetsFlutterBinding.ensureInitialized();
-
   if (Platform.isAndroid) {
-    AndroidInAppWebViewController.setWebContentsDebuggingEnabled(true);
+    InAppWebViewController.setWebContentsDebuggingEnabled(true);
   }
 
-  group('InAppWebView', () {
+  in_app_webview_test.main();
-    testWidgets('initialUrlRequest', (WidgetTester tester) async {
-      final Completer controllerCompleter = Completer<InAppWebViewController>();
-      await tester.pumpWidget(
-        Directionality(
-          textDirection: TextDirection.ltr,
-          child: InAppWebView(
-            key: GlobalKey(),
-            initialUrlRequest:
-                URLRequest(url: Uri.parse('https://github.com/flutter')),
-            onWebViewCreated: (controller) {
-              controllerCompleter.complete(controller);
-            },
-          ),
-        ),
-      );
-      final InAppWebViewController controller =
-          await controllerCompleter.future;
-      final String? currentUrl = (await controller.getUrl())?.toString();
-      expect(currentUrl, 'https://github.com/flutter');
-    });
 
-    testWidgets('set/get options', (WidgetTester tester) async {
+  group('OLD InAppWebView', () {
-      final Completer controllerCompleter = Completer<InAppWebViewController>();
-      final Completer<void> pageLoaded = Completer<void>();
-
-      await tester.pumpWidget(
-        Directionality(
-          textDirection: TextDirection.ltr,
-          child: InAppWebView(
-            key: GlobalKey(),
-            initialUrlRequest:
-                URLRequest(url: Uri.parse('https://github.com/flutter')),
-            initialOptions: InAppWebViewGroupOptions(
-                crossPlatform: InAppWebViewOptions(javaScriptEnabled: false)),
-            onWebViewCreated: (controller) {
-              controllerCompleter.complete(controller);
-            },
-            onLoadStop: (controller, url) {
-              pageLoaded.complete();
-            },
-          ),
-        ),
-      );
-      final InAppWebViewController controller =
-          await controllerCompleter.future;
-      await pageLoaded.future;
-
-      InAppWebViewGroupOptions? options = await controller.getOptions();
-      expect(options, isNotNull);
-      expect(options!.crossPlatform.javaScriptEnabled, false);
-
-      await controller.setOptions(
-          options: InAppWebViewGroupOptions(
-              crossPlatform: InAppWebViewOptions(javaScriptEnabled: true)));
-
-      options = await controller.getOptions();
-      expect(options, isNotNull);
-      expect(options!.crossPlatform.javaScriptEnabled, true);
-    });
 
     group('javascript code evaluation', () {
       testWidgets('evaluateJavascript', (WidgetTester tester) async {

example/ios/Flutter/Flutter.podspec

@@ -1,18 +0,0 @@
-#
-# NOTE: This podspec is NOT to be published. It is only used as a local source!
-#       This is a generated file; do not edit or check into version control.
-#
-
-Pod::Spec.new do |s|
-  s.name             = 'Flutter'
-  s.version          = '1.0.0'
-  s.summary          = 'High-performance, high-fidelity mobile apps.'
-  s.homepage         = 'https://flutter.io'
-  s.license          = { :type => 'MIT' }
-  s.author           = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
-  s.source           = { :git => 'https://github.com/flutter/engine', :tag => s.version.to_s }
-  s.ios.deployment_target = '9.0'
-  # Framework linking is handled by Flutter tooling, not CocoaPods.
-  # Add a placeholder to satisfy `s.dependency 'Flutter'` plugin podspecs.
-  s.vendored_frameworks = 'path/to/nothing'
-end

example/ios/Flutter/flutter_export_environment.sh

@@ -3,12 +3,11 @@
 export "FLUTTER_ROOT=/Users/lorenzopichilli/fvm/versions/2.10.4"
 export "FLUTTER_APPLICATION_PATH=/Users/lorenzopichilli/Desktop/flutter_inappwebview/example"
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
-export "FLUTTER_TARGET=/Users/lorenzopichilli/Desktop/flutter_inappwebview/example/lib/main.dart"
+export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "FLUTTER_BUILD_NAME=1.0.0"
 export "FLUTTER_BUILD_NUMBER=1"
-export "DART_DEFINES=Zmx1dHRlci5pbnNwZWN0b3Iuc3RydWN0dXJlZEVycm9ycz10cnVl,RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ=="
 export "DART_OBFUSCATION=false"
-export "TRACK_WIDGET_CREATION=true"
+export "TRACK_WIDGET_CREATION=false"
 export "TREE_SHAKE_ICONS=false"
-export "PACKAGE_CONFIG=/Users/lorenzopichilli/Desktop/flutter_inappwebview/example/.dart_tool/package_config.json"
+export "PACKAGE_CONFIG=.packages"

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_inappwebview
 description: A Flutter plugin that allows you to add an inline webview, to use an headless webview, and to open an in-app browser window.
-version: 6.0.0
+version: 6.0.0-beta.1
 homepage: https://github.com/pichillilorenzo/flutter_inappwebview
 
 environment: