Merge pull request #30 from devoncarew/devoncarew_update

update repo; fix analysis issues

.gitignore

@@ -2,5 +2,6 @@
 packages
 pubspec.lock
 .project
+.pub/
 .buildlog
-
+.settings/

lib/pageloader.dart

@@ -3,8 +3,6 @@ library pageloader;
 import 'dart:async';
 import 'dart:mirrors';
 
-import 'package:meta/meta.dart';
-
 import 'webdriver.dart';
 
 part 'src/pageloader/annotations.dart';

lib/src/command_processor.dart

@@ -18,9 +18,6 @@ class CommandProcessor {
   }
 
   void _failRequest(Completer completer, error, [stackTrace]) {
-    if (stackTrace == null) {
-      stackTrace = getAttachedStackTrace(error);
-    }
     completer
         .completeError(new WebDriverError(-1, error.toString()), stackTrace);
   }
@@ -110,7 +107,7 @@ class CommandProcessor {
                 completer.complete(value);
               }
             });
-      }).catchError((error) => _failRequest(completer, error));
+      }).catchError((error, s) => _failRequest(completer, error, s));
     } catch (e, s) {
       _failRequest(completer, e, s);
     }

lib/src/keyboard.dart

@@ -37,4 +37,7 @@ class Keyboard extends _WebDriverBase implements Future {
 
   Future whenComplete(action()) =>
       _future.whenComplete(action);
+
+  Future timeout(Duration timeLimit, {onTimeout()}) =>
+      _future.timeout(timeLimit, onTimeout: onTimeout);
 }

lib/src/mouse.dart

@@ -94,4 +94,7 @@ class Mouse extends _WebDriverBase implements Future {
 
   Future whenComplete(action()) =>
       _future.whenComplete(action);
+
+  Future timeout(Duration timeLimit, {onTimeout()}) =>
+      _future.timeout(timeLimit, onTimeout: onTimeout);
 }

lib/src/pageloader/core.dart

@@ -29,7 +29,9 @@ class PageLoader {
   InstanceMirror _reflectedInstance(ClassMirror aClass) {
     InstanceMirror page;
 
-    for (MethodMirror constructor in aClass.constructors.values) {
+    Iterable<MethodMirror> ctors = aClass.instanceMembers.values.where(
+        (member) => member.isConstructor);
+    for (MethodMirror constructor in ctors) {
       if (constructor.parameters.isEmpty) {
         page = aClass.newInstance(constructor.constructorName, []);
         break;

lib/src/touch.dart

@@ -95,4 +95,7 @@ class Touch extends _WebDriverBase implements Future {
 
   Future whenComplete(action()) =>
       _future.whenComplete(action);
+
+  Future timeout(Duration timeLimit, {onTimeout()}) =>
+      _future.timeout(timeLimit, onTimeout: onTimeout);
 }

lib/webdriver.dart

@@ -7,8 +7,8 @@ library webdriver;
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io' hide JSON;
+
 import 'package:crypto/crypto.dart';
-import 'package:meta/meta.dart';
 
 part 'src/alert.dart';
 part 'src/capabilities.dart';

pubspec.yaml

@@ -1,10 +1,12 @@
 name: webdriver
 version: 0.8.7
 author: Dart Team <[email protected]>
-description: Provides WebDriver bindings for Dart. These use the WebDriver JSON interface, and as such, require the use of the WebDriver remote server.
-homepage: https://github.com/dart-lang/webdriver
+description: >
+  Provides WebDriver bindings for Dart. These use the WebDriver JSON interface,
+  and as such, require the use of the WebDriver remote server.
+homepage: https://github.com/google/webdriver.dart
 environment:
-  sdk: '>=0.8.7'
+  sdk: '>=1.0.0 <2.0.0'
 dependencies:
   crypto: '>=0.8.7'
 dev_dependencies:

test/src/web_driver_test.dart

@@ -88,10 +88,9 @@ void main() {
       });
 
       test('findElement -- success', () {
-        driver.findElement(new By.tagName('tr'))
-            .then(expectAsync1((element) {
-              expect(element, isWebElement);
-            }));
+        return driver.findElement(new By.tagName('tr')) .then((element) {
+          expect(element, isWebElement);
+        });
       });
 
       test('findElement -- failure', () {