Merge beta into master (#799)

experimental/desktop_photo_search/pubspec.lock

@@ -35,7 +35,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -162,13 +162,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.0"
-  coverage:
-    dependency: transitive
-    description:
-      name: coverage
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.15.2"
   cross_file:
     dependency: transitive
     description:
@@ -417,13 +410,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
-  node_preamble:
-    dependency: transitive
-    description:
-      name: node_preamble
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.4.13"
   package_config:
     dependency: transitive
     description:
@@ -494,20 +480,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
-  shelf_packages_handler:
-    dependency: transitive
-    description:
-      name: shelf_packages_handler
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.0"
-  shelf_static:
-    dependency: transitive
-    description:
-      name: shelf_static
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
   shelf_web_socket:
     dependency: transitive
     description:
@@ -527,27 +499,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.9.10+3"
-  source_map_stack_trace:
-    dependency: transitive
-    description:
-      name: source_map_stack_trace
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
-  source_maps:
-    dependency: transitive
-    description:
-      name: source_maps
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.10.10"
   source_span:
     dependency: transitive
     description:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
@@ -583,27 +541,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
-  test:
-    dependency: "direct dev"
-    description:
-      name: test
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.16.5"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19"
-  test_core:
-    dependency: transitive
-    description:
-      name: test_core
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.3.15"
+    version: "0.3.0"
   timing:
     dependency: transitive
     description:
@@ -681,13 +625,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "6.1.0+1"
   watcher:
     dependency: transitive
     description:
@@ -702,13 +639,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
-  webkit_inspection_protocol:
-    dependency: transitive
-    description:
-      name: webkit_inspection_protocol
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.7.5"
   yaml:
     dependency: transitive
     description:

experimental/desktop_photo_search/pubspec.yaml

@@ -41,7 +41,6 @@ dev_dependencies:
   grinder: ^0.8.3
   msix: ^0.1.5
   source_gen: ^0.9.4
-  test: ^1.9.4
 
 flutter:
   uses-material-design: true

experimental/desktop_photo_search/test/unsplash_test.dart

@@ -6,9 +6,9 @@ import 'package:desktop_photo_search/src/unsplash/photo.dart';
 import 'package:desktop_photo_search/src/unsplash/search_photos_response.dart';
 import 'package:desktop_photo_search/src/unsplash/unsplash.dart';
 import 'package:desktop_photo_search/src/unsplash/user.dart';
+import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart';
 import 'package:http/testing.dart';
-import 'package:test/test.dart';
 
 void main() {
   test('Photo.fromJson', () {