Merge pull request #64 from goderbauer/addMouseEnum

adding enum for mouse buttons

dart/lib/async/html.dart

@@ -71,7 +71,7 @@ class _HtmlMouse implements PageLoaderMouse {
   _HtmlMouse(this.loader);
 
   @override
-  Future down(int button,
+  Future down(MouseButton button,
           {_ElementPageLoaderElement eventTarget, bool sync: true}) =>
       loader.executeSynced(
           () => dispatchEvent('mousedown', eventTarget, button), sync);
@@ -86,7 +86,7 @@ class _HtmlMouse implements PageLoaderMouse {
       }, sync);
 
   @override
-  Future up(int button,
+  Future up(MouseButton button,
           {_ElementPageLoaderElement eventTarget, bool sync: true}) =>
       loader.executeSynced(() => dispatchEvent('mouseup', eventTarget), sync);
 
@@ -101,9 +101,9 @@ class _HtmlMouse implements PageLoaderMouse {
       clientY;
 
   Future dispatchEvent(String type, _ElementPageLoaderElement eventTarget,
-      [int button = 0]) async {
+      [MouseButton button = MouseButton.primary]) async {
     var event = new MouseEvent(type,
-        button: button,
+        button: button.value,
         clientX: clientX,
         clientY: clientY,
         screenX: screenX,

dart/lib/async/src/interfaces.dart

@@ -15,6 +15,9 @@ library pageloader.async.interfaces;
 
 import 'dart:async';
 import 'dart:math';
+import 'package:webdriver/core.dart' show MouseButton;
+
+export 'package:webdriver/core.dart' show MouseButton;
 
 typedef Future<T> SyncedExecutionFn<T>(Future<T> fn());
 
@@ -36,13 +39,13 @@ abstract class PageLoaderMouse {
   /// specified, PageLoader will attempt to fire the corresponding mouse events
   /// on that target, otherwise it will fire the events on the target that is
   /// under the current mouse location.
-  Future down(int button, {PageLoaderElement eventTarget, bool sync: true});
+  Future down(MouseButton button, {PageLoaderElement eventTarget, bool sync: true});
 
   /// Release [button] on the mouse at its current location. If [eventTarget] is
   /// specified, PageLoader will attempt to fire the corresponding mouse events
   /// on that target, otherwise it will fire the events on the target that is
   /// under the current mouse location.
-  Future up(int button, {PageLoaderElement eventTarget, bool sync: true});
+  Future up(MouseButton button, {PageLoaderElement eventTarget, bool sync: true});
 
   /// Move the mouse to a location relative to [element].
   Future moveTo(PageLoaderElement element, int xOffset, int yOffset,

dart/lib/async/webdriver.dart

@@ -64,7 +64,7 @@ class _WebDriverMouse implements PageLoaderMouse {
   _WebDriverMouse(this.loader);
 
   @override
-  Future down(int button,
+  Future down(MouseButton button,
           {_WebElementPageLoaderElement eventTarget, bool sync: true}) =>
       loader.executeSynced(() {
         if (eventTarget == null) {
@@ -83,7 +83,7 @@ class _WebDriverMouse implements PageLoaderMouse {
           sync);
 
   @override
-  Future up(int button,
+  Future up(MouseButton button,
           {_WebElementPageLoaderElement eventTarget, bool sync: true}) =>
       loader.executeSynced(() {
         if (eventTarget == null) {
@@ -93,12 +93,12 @@ class _WebDriverMouse implements PageLoaderMouse {
         }
       }, sync);
 
-  Future _fireEvent(
-          _WebElementPageLoaderElement eventTarget, String type, int button) =>
+  Future _fireEvent(_WebElementPageLoaderElement eventTarget, String type,
+          MouseButton button) =>
       driver.execute(
           "arguments[0].dispatchEvent(new MouseEvent(arguments[1], "
           "{'button' : arguments[2]}));",
-          [eventTarget.context, type, button]);
+          [eventTarget.context, type, button.value]);
 }
 
 abstract class WebDriverPageLoaderElement implements PageLoaderElement {

dart/pubspec.yaml

@@ -1,5 +1,5 @@
 name: pageloader
-version: 2.0.0-pre.12
+version: 2.0.0-pre.13
 author: Marc Fisher II <[email protected]>
 description: >
   Supports the creation of page objects that can be shared between in-browser tests
@@ -12,7 +12,7 @@ dependencies:
   stack_trace: '^1.3.4'
   sync_webdriver: '^2.0.0-pre.0'
   unittest: '^0.11.6+1'
-  webdriver: '^0.10.0-pre.13'
+  webdriver: '^0.10.0-pre.15'
 dev_dependencies:
   path: '^1.3.6'
   test: '^0.12.3+9'

dart/test/async/src/mouse.dart

@@ -28,11 +28,11 @@ void runTests() {
           await loader.mouse.moveTo(page.element, 2, 2);
           await waitFor(() => page.element.visibleText,
               matcher: contains('MouseMove'));
-          await loader.mouse.down(0);
+          await loader.mouse.down(MouseButton.primary);
           await waitFor(() => page.element.visibleText,
               matcher: contains('MouseDown'));
           await loader.mouse.moveTo(page.element, 10, 10);
-          await loader.mouse.up(0);
+          await loader.mouse.up(MouseButton.primary);
           await waitFor(() => page.element.visibleText,
               matcher: contains('MouseUp'));
         },
@@ -43,11 +43,11 @@ void runTests() {
 
       // make sure mouse is not on element;
       await loader.mouse.moveTo(page.element, -10, -10);
-      await loader.mouse.down(0, eventTarget: page.element);
+      await loader.mouse.down(MouseButton.primary, eventTarget: page.element);
       await waitFor(() => page.element.visibleText,
           matcher: contains('MouseDown'));
       await loader.mouse.moveTo(page.element, 200, 200);
-      await loader.mouse..up(0, eventTarget: page.element);
+      await loader.mouse..up(MouseButton.primary, eventTarget: page.element);
       await waitFor(() => page.element.visibleText,
           matcher: contains('MouseUp'));
     });