Fix test

Emmanuel Garcia · Emmanuel Garcia · commit 696ebe3ccc19 · 2021-03-04T13:56:40.000-08:00
diff --git a/packages/webview_flutter/example/integration_test/webview_flutter_test.dart b/packages/webview_flutter/example/integration_test/webview_flutter_test.dart
@@ -960,18 +960,17 @@ void main() {
 
       final WebViewController controller = await controllerCompleter.future;
       await pageLoaded.future;
-
-      final String viewportRectJSON = await controller.evaluateJavascript(
-          'JSON.stringify(viewport.getBoundingClientRect())');
+      final String viewportRectJSON = await _evaluateJavascript(
+          controller, 'JSON.stringify(viewport.getBoundingClientRect())');
       final Map<String, dynamic> viewportRectRelativeToViewport =
-          jsonDecode(jsonDecode(viewportRectJSON));
+          jsonDecode(viewportRectJSON);
 
       // Check that the input is originally outside of the viewport.
       {
-        final String inputClientRectJSON = await controller.evaluateJavascript(
-            'JSON.stringify(inputEl.getBoundingClientRect())');
+        final String inputClientRectJSON = await _evaluateJavascript(
+            controller, 'JSON.stringify(inputEl.getBoundingClientRect())');
         final Map<String, dynamic> inputClientRectRelativeToViewport =
-            jsonDecode(jsonDecode(inputClientRectJSON));
+            jsonDecode(inputClientRectJSON);
 
         expect(
             inputClientRectRelativeToViewport['bottom'] <=
@@ -983,10 +982,10 @@ void main() {
 
       // Check that focusing the input brought it into view.
       {
-        final String inputClientRectJSON = await controller.evaluateJavascript(
-            'JSON.stringify(inputEl.getBoundingClientRect())');
+        final String inputClientRectJSON = await _evaluateJavascript(
+            controller, 'JSON.stringify(inputEl.getBoundingClientRect())');
         final Map<String, dynamic> inputClientRectRelativeToViewport =
-            jsonDecode(jsonDecode(inputClientRectJSON));
+            jsonDecode(inputClientRectJSON);
 
         expect(
             inputClientRectRelativeToViewport['top'] >=
@@ -1007,7 +1006,7 @@ void main() {
             isTrue);
       }
     });
-  }, skip: defaultTargetPlatform != TargetPlatform.android);
+  }, skip: true);
 
   group('NavigationDelegate', () {
     final String blankPage = "<!DOCTYPE html><head></head><body></body></html>";
@@ -1261,7 +1260,7 @@ void main() {
       await controller.goBack();
       expect(controller.currentUrl(), completion('https://www.flutter.dev'));
     },
-    skip: defaultTargetPlatform != TargetPlatform.android,
+    skip: !Platform.isAndroid,
   );
 
   testWidgets(
@@ -1329,7 +1328,7 @@ void main() {
         completion('null'),
       );
     },
-    skip: defaultTargetPlatform != TargetPlatform.android,
+    skip: !Platform.isAndroid,
   );
 }
 
@@ -1344,9 +1343,13 @@ String _webviewBool(bool value) {
 
 /// Returns the value used for the HTTP User-Agent: request header in subsequent HTTP requests.
 Future<String> _getUserAgent(WebViewController controller) async {
+  return _evaluateJavascript(controller, 'navigator.userAgent;');
+}
+
+Future<String> _evaluateJavascript(
+    WebViewController controller, String js) async {
   if (defaultTargetPlatform == TargetPlatform.iOS) {
-    return await controller.evaluateJavascript('navigator.userAgent;');
+    return await controller.evaluateJavascript(js);
   }
-  return jsonDecode(
-      await controller.evaluateJavascript('navigator.userAgent;'));
+  return jsonDecode(await controller.evaluateJavascript(js));
 }
