Merge branch 'master' into bugfix/camera-threading

# Conflicts:
#	packages/camera/camera/CHANGELOG.md

Author: renefloor

.cirrus.yml

@@ -168,7 +168,7 @@ task:
       env:
         # Currently missing; see https://github.com/flutter/flutter/issues/81982
         # and https://github.com/flutter/flutter/issues/82211
-        PLUGINS_TO_EXCLUDE_INTEGRATION_TESTS: "file_selector,image_picker_for_web,shared_preferences_web"
+        PLUGINS_TO_EXCLUDE_INTEGRATION_TESTS: "file_selector,shared_preferences_web"
         matrix:
           CHANNEL: "master"
           CHANNEL: "stable"

packages/camera/camera/CHANGELOG.md

@@ -1,7 +1,12 @@
-## 0.8.1+4
+## 0.8.1+5
 
 * Fix registerTexture and result being called on background thread on iOS. 
 
+## 0.8.1+4
+
+* Silenced warnings that may occur during build when using a very
+  recent version of Flutter relating to null safety.
+
 ## 0.8.1+3
 
 * Do not change camera orientation when iOS device is flat.

packages/camera/camera/example/lib/main.dart

@@ -98,7 +98,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
 
   @override
   void dispose() {
-    WidgetsBinding.instance?.removeObserver(this);
+    _ambiguate(WidgetsBinding.instance)?.removeObserver(this);
     _flashModeControlRowAnimationController.dispose();
     _exposureModeControlRowAnimationController.dispose();
     super.dispose();

packages/camera/camera/pubspec.yaml

@@ -4,7 +4,7 @@ description: A Flutter plugin for getting information about and controlling the
   and streaming image buffers to dart.
 repository: https://github.com/flutter/plugins/tree/master/packages/camera/camera
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+camera%22
-version: 0.8.1+4
+version: 0.8.1+5
 
 environment:
   sdk: ">=2.12.0 <3.0.0"

packages/image_picker/image_picker_for_web/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 2.1.0
+
+* Implemented `getImage`, `getVideo` and `getFile` methods that return `XFile` instances.
+* Move tests to `example` directory, so they run as integration_tests with `flutter drive`.
+
 # 2.0.0
 
 * Migrate to null safety.

packages/image_picker/image_picker_for_web/example/README.md

@@ -0,0 +1,9 @@
+# Testing
+
+This package uses `package:integration_test` to run its tests in a web browser.
+
+See [Plugin Tests > Web Tests](https://github.com/flutter/flutter/wiki/Plugin-Tests#web-tests)
+in the Flutter wiki for instructions to setup and run the tests in this package.
+
+Check [flutter.dev > Integration testing](https://flutter.dev/docs/testing/integration-tests)
+for more info.

…_web/test/image_picker_for_web_test.dart …tion_test/image_picker_for_web_test.dartpackages/image_picker/image_picker_for_web/test/image_picker_for_web_test.dart renamed to packages/image_picker/image_picker_for_web/example/integration_test/image_picker_for_web_test.dart packages/image_picker/image_picker_for_web/test/image_picker_for_web_test.dart renamed to packages/image_picker/image_picker_for_web/example/integration_test/image_picker_for_web_test.dart

@@ -2,29 +2,30 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-@TestOn('chrome') // Uses dart:html
-
 import 'dart:convert';
 import 'dart:html' as html;
 import 'dart:typed_data';
 
 import 'package:flutter_test/flutter_test.dart';
 import 'package:image_picker_for_web/image_picker_for_web.dart';
 import 'package:image_picker_platform_interface/image_picker_platform_interface.dart';
+import 'package:integration_test/integration_test.dart';
 
 final String expectedStringContents = "Hello, world!";
 final Uint8List bytes = utf8.encode(expectedStringContents) as Uint8List;
 final html.File textFile = html.File([bytes], "hello.txt");
 
 void main() {
+  IntegrationTestWidgetsFlutterBinding.ensureInitialized();
+
   // Under test...
   late ImagePickerPlugin plugin;
 
   setUp(() {
     plugin = ImagePickerPlugin();
   });
 
-  test('Can select a file', () async {
+  testWidgets('Can select a file (Deprecated)', (WidgetTester tester) async {
     final mockInput = html.FileUploadInputElement();
 
     final overrides = ImagePickerPluginTestOverrides()
@@ -45,9 +46,30 @@ void main() {
     expect((await file).readAsBytes(), completion(isNotEmpty));
   });
 
+  testWidgets('Can select a file', (WidgetTester tester) async {
+    final mockInput = html.FileUploadInputElement();
+
+    final overrides = ImagePickerPluginTestOverrides()
+      ..createInputElement = ((_, __) => mockInput)
+      ..getFileFromInput = ((_) => textFile);
+
+    final plugin = ImagePickerPlugin(overrides: overrides);
+
+    // Init the pick file dialog...
+    final file = plugin.getFile();
+
+    // Mock the browser behavior of selecting a file...
+    mockInput.dispatchEvent(html.Event('change'));
+
+    // Now the file should be available
+    expect(file, completes);
+    // And readable
+    expect((await file).readAsBytes(), completion(isNotEmpty));
+  });
+
   // There's no good way of detecting when the user has "aborted" the selection.
 
-  test('computeCaptureAttribute', () {
+  testWidgets('computeCaptureAttribute', (WidgetTester tester) async {
     expect(
       plugin.computeCaptureAttribute(ImageSource.gallery, CameraDevice.front),
       isNull,
@@ -67,14 +89,14 @@ void main() {
   });
 
   group('createInputElement', () {
-    test('accept: any, capture: null', () {
+    testWidgets('accept: any, capture: null', (WidgetTester tester) async {
       html.Element input = plugin.createInputElement('any', null);
 
       expect(input.attributes, containsPair('accept', 'any'));
       expect(input.attributes, isNot(contains('capture')));
     });
 
-    test('accept: any, capture: something', () {
+    testWidgets('accept: any, capture: something', (WidgetTester tester) async {
       html.Element input = plugin.createInputElement('any', 'something');
 
       expect(input.attributes, containsPair('accept', 'any'));

packages/image_picker/image_picker_for_web/example/lib/main.dart

@@ -0,0 +1,25 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+
+void main() {
+  runApp(MyApp());
+}
+
+/// App for testing
+class MyApp extends StatefulWidget {
+  @override
+  _MyAppState createState() => _MyAppState();
+}
+
+class _MyAppState extends State<MyApp> {
+  @override
+  Widget build(BuildContext context) {
+    return Directionality(
+      textDirection: TextDirection.ltr,
+      child: Text('Testing... Look at the console output for results!'),
+    );
+  }
+}

packages/image_picker/image_picker_for_web/example/pubspec.yaml

@@ -0,0 +1,21 @@
+name: connectivity_for_web_integration_tests
+publish_to: none
+
+environment:
+  sdk: ">=2.12.0 <3.0.0"
+  flutter: ">=2.2.0"
+
+dependencies:
+  image_picker_for_web:
+    path: ../
+  flutter:
+    sdk: flutter
+
+dev_dependencies:
+  js: ^0.6.3
+  flutter_test:
+    sdk: flutter
+  flutter_driver:
+    sdk: flutter
+  integration_test:
+    sdk: flutter

packages/image_picker/image_picker_for_web/example/run_test.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/bash
+# Copyright 2013 The Flutter Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+if pgrep -lf chromedriver > /dev/null; then
+  echo "chromedriver is running."
+
+  if [ $# -eq 0 ]; then
+    echo "No target specified, running all tests..."
+    find integration_test/ -iname *_test.dart | xargs -n1 -i -t flutter drive -d web-server --web-port=7357 --browser-name=chrome --driver=test_driver/integration_test.dart --target='{}'
+  else
+    echo "Running test target: $1..."
+    set -x
+    flutter drive -d web-server --web-port=7357 --browser-name=chrome --driver=test_driver/integration_test.dart --target=$1
+  fi
+
+  else
+    echo "chromedriver is not running."
+    echo "Please, check the README.md for instructions on how to use run_test.sh"
+fi
+