Added tests for new buttons and horizontal rule embed

packages/zefyr/lib/src/widgets/common.dart

@@ -144,7 +144,7 @@ class _RawZefyrLineState extends State<RawZefyrLine> {
     EmbedAttribute embed = node.style.get(NotusAttribute.embed);
 
     if (embed.type == EmbedType.horizontalRule) {
-      final hr = new HorizontalRule(node: node);
+      final hr = new ZefyrHorizontalRule(node: node);
       return new EditableBox(
         child: hr,
         node: widget.node,
@@ -156,7 +156,7 @@ class _RawZefyrLineState extends State<RawZefyrLine> {
       );
     } else if (embed.type == EmbedType.image) {
       return new EditableBox(
-        child: ImageEmbed(node: node, delegate: editable.imageDelegate),
+        child: ZefyrImage(node: node, delegate: editable.imageDelegate),
         node: widget.node,
         layerLink: _link,
         renderContext: editable.renderContext,

packages/zefyr/lib/src/widgets/horizontal_rule.dart

@@ -10,8 +10,8 @@ import 'package:notus/notus.dart';
 
 import 'editable_box.dart';
 
-class HorizontalRule extends LeafRenderObjectWidget {
-  HorizontalRule({@required this.node}) : assert(node != null);
+class ZefyrHorizontalRule extends LeafRenderObjectWidget {
+  ZefyrHorizontalRule({@required this.node}) : assert(node != null);
 
   final EmbedNode node;
 

packages/zefyr/lib/src/widgets/image.dart

@@ -39,18 +39,18 @@ class ZefyrDefaultImageDelegate implements ZefyrImageDelegate<ImageSource> {
   }
 }
 
-class ImageEmbed extends StatefulWidget {
-  const ImageEmbed({Key key, @required this.node, @required this.delegate})
+class ZefyrImage extends StatefulWidget {
+  const ZefyrImage({Key key, @required this.node, @required this.delegate})
       : super(key: key);
 
   final EmbedNode node;
   final ZefyrImageDelegate delegate;
 
   @override
-  _ImageEmbedState createState() => _ImageEmbedState();
+  _ZefyrImageState createState() => _ZefyrImageState();
 }
 
-class _ImageEmbedState extends State<ImageEmbed> {
+class _ZefyrImageState extends State<ZefyrImage> {
   ImageProvider _provider;
   ImageStream _imageStream;
   ImageInfo _imageInfo;
@@ -70,7 +70,7 @@ class _ImageEmbedState extends State<ImageEmbed> {
   }
 
   @override
-  void didUpdateWidget(ImageEmbed oldWidget) {
+  void didUpdateWidget(ZefyrImage oldWidget) {
     super.didUpdateWidget(oldWidget);
     EmbedAttribute oldStyle = oldWidget.node.style.get(NotusAttribute.embed);
     final oldSource = oldStyle.value['source'];

packages/zefyr/lib/zefyr.dart

@@ -15,6 +15,7 @@ export 'src/widgets/common.dart';
 export 'src/widgets/controller.dart';
 export 'src/widgets/editable_text.dart';
 export 'src/widgets/editor.dart';
+export 'src/widgets/horizontal_rule.dart';
 export 'src/widgets/image.dart';
 export 'src/widgets/list.dart';
 export 'src/widgets/paragraph.dart';

packages/zefyr/test/widgets/buttons_test.dart

@@ -2,6 +2,7 @@
 // for details. 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';
+import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:zefyr/src/widgets/buttons.dart';
 import 'package:zefyr/zefyr.dart';
@@ -67,6 +68,15 @@ void main() {
       await editor.tapButtonWithText('H2');
       expect(line.style.containsSame(NotusAttribute.heading.level2), isTrue);
     });
+
+    testWidgets('close overlay', (tester) async {
+      final editor = new EditorSandBox(tester: tester);
+      await editor.tapEditor();
+      await editor.tapButtonWithIcon(Icons.format_size);
+      expect(find.text('H1'), findsOneWidget);
+      await editor.tapButtonWithIcon(Icons.close);
+      expect(find.text('H1'), findsNothing);
+    });
   });
 
   group('$LinkButton', () {
@@ -132,4 +142,67 @@ void main() {
       expect(line.childCount, 1);
     });
   });
+
+  group('$ImageButton', () {
+    const MethodChannel channel =
+        const MethodChannel('plugins.flutter.io/image_picker');
+
+    final List<MethodCall> log = <MethodCall>[];
+
+    setUp(() {
+      channel.setMockMethodCallHandler((MethodCall methodCall) async {
+        log.add(methodCall);
+        return 'file:///tmp/test.jpg';
+      });
+      log.clear();
+    });
+
+    testWidgets('toggle overlay', (tester) async {
+      final editor = new EditorSandBox(tester: tester);
+      await editor.tapEditor();
+      await editor.tapButtonWithIcon(Icons.photo);
+
+      expect(find.byIcon(Icons.photo_camera), findsOneWidget);
+      await editor.tapButtonWithIcon(Icons.close);
+      expect(find.byIcon(Icons.photo_camera), findsNothing);
+    });
+
+    testWidgets('pick from camera', (tester) async {
+      final editor = new EditorSandBox(tester: tester);
+      await editor.tapEditor();
+      await editor.tapButtonWithIcon(Icons.photo);
+      await editor.tapButtonWithIcon(Icons.photo_camera);
+      expect(log, hasLength(1));
+      expect(
+        log.single,
+        isMethodCall(
+          'pickImage',
+          arguments: <String, dynamic>{
+            'source': 0,
+            'maxWidth': null,
+            'maxHeight': null,
+          },
+        ),
+      );
+    });
+
+    testWidgets('pick from gallery', (tester) async {
+      final editor = new EditorSandBox(tester: tester);
+      await editor.tapEditor();
+      await editor.tapButtonWithIcon(Icons.photo);
+      await editor.tapButtonWithIcon(Icons.photo_library);
+      expect(log, hasLength(1));
+      expect(
+        log.single,
+        isMethodCall(
+          'pickImage',
+          arguments: <String, dynamic>{
+            'source': 1,
+            'maxWidth': null,
+            'maxHeight': null,
+          },
+        ),
+      );
+    });
+  });
 }

packages/zefyr/test/widgets/horizontal_rule_test.dart

@@ -0,0 +1,66 @@
+// Copyright (c) 2018, the Zefyr project authors.  Please see the AUTHORS file
+// for details. 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';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:zefyr/zefyr.dart';
+
+import '../testing.dart';
+
+void main() {
+  group('$ZefyrHorizontalRule', () {
+    testWidgets('format as horizontal rule', (tester) async {
+      final editor = new EditorSandBox(tester: tester);
+      await editor.tapEditor();
+      await editor.tapButtonWithIcon(Icons.remove);
+
+      LineNode line = editor.document.root.children.last;
+      expect(line.hasEmbed, isTrue);
+    });
+
+    testWidgets('tap left side of horizontal rule puts caret before it',
+        (tester) async {
+      final editor = new EditorSandBox(tester: tester);
+      await editor.tapEditor();
+      await editor.tapButtonWithIcon(Icons.remove);
+      await editor.updateSelection(base: 0, extent: 0);
+
+      await tester.tapAt(tester.getTopLeft(find.byType(ZefyrHorizontalRule)));
+      LineNode line = editor.document.root.children.last;
+      EmbedNode embed = line.children.single;
+      expect(editor.selection.isCollapsed, isTrue);
+      expect(editor.selection.extentOffset, embed.documentOffset);
+    });
+
+    testWidgets('tap right side of horizontal rule puts caret after it',
+        (tester) async {
+      final editor = new EditorSandBox(tester: tester);
+      await editor.tapEditor();
+      await editor.tapButtonWithIcon(Icons.remove);
+      await editor.updateSelection(base: 0, extent: 0);
+
+      final hr = find.byType(ZefyrHorizontalRule);
+      final offset = tester.getBottomRight(hr) - new Offset(1.0, 1.0);
+      await tester.tapAt(offset);
+      LineNode line = editor.document.root.children.last;
+      EmbedNode embed = line.children.single;
+      expect(editor.selection.isCollapsed, isTrue);
+      expect(editor.selection.extentOffset, embed.documentOffset + 1);
+    });
+
+    testWidgets('selects on long press',
+        (tester) async {
+      final editor = new EditorSandBox(tester: tester);
+      await editor.tapEditor();
+      await editor.tapButtonWithIcon(Icons.remove);
+      await editor.updateSelection(base: 0, extent: 0);
+
+      final hr = find.byType(ZefyrHorizontalRule);
+      await tester.longPress(hr);
+      LineNode line = editor.document.root.children.last;
+      EmbedNode embed = line.children.single;
+      expect(editor.selection.baseOffset, embed.documentOffset);
+      expect(editor.selection.extentOffset, embed.documentOffset + 1);
+    });
+  });
+}