commit bdf5d6464fde69b79b8100b507884f46c652e080
author Max Kim <4298887+mk13@users.noreply.github.com> Mon Aug 13 13:39:03 2018 -0700
committer GitHub <noreply@github.com> Mon Aug 13 13:39:03 2018 -0700
tree 8f6808922695996bfda390cd2adc2cb0b37af020
parent df7044ef41b18de2d8696ae8814fbb983743f29b

Fix forwarder test (#208)

* Uncomment failing test with fixes

* Set as dev

* to 2.0.1

* remove <dynamic,dynamic> cast in favor of just Map

lib/support/forwarder.dart

diff --git a/lib/support/forwarder.dart b/lib/support/forwarder.dart
index 134a514..db304cb 100644
--- a/lib/support/forwarder.dart
+++ b/lib/support/forwarder.dart
@@ -89,11 +89,11 @@
       if (endpoint.startsWith('/')) {
         endpoint = endpoint.substring(1);
       }
-      Map<String, dynamic> params;
+      Map params;
       if (request.method == 'POST') {
         String requestBody = await utf8.decodeStream(request);
         if (requestBody != null && requestBody.isNotEmpty) {
-          params = json.decode(requestBody) as Map<String, dynamic>;
+          params = json.decode(requestBody) as Map;
         }
       }
       var value = await _forward(request.method, endpoint, params);
@@ -115,7 +115,7 @@
   }
 
   Future<dynamic> _forward(String method, String endpoint,
-      [Map<String, dynamic> params]) async {
+      [Map params]) async {
     List<String> endpointTokens = path.split(endpoint);
     if (endpointTokens.isEmpty) {
       endpointTokens = [''];
@@ -168,7 +168,7 @@
       case 'execute_async':
         // /execute and /execute_async allow arbitrary JSON objects with
         // embedded WebElememt ids.
-        params = await _deepCopy(params) as Map<String, dynamic>;
+        params = await _deepCopy(params) as Map;
         break;
     }
 

pubspec.yaml

diff --git a/pubspec.yaml b/pubspec.yaml
index 9ed0df7..3788a88 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: webdriver
-version: 2.0.0
+version: 2.0.1-dev
 authors:
   - Marc Fisher II <fisherii@google.com>
   - Matt Staats<staats@google.com>

test/support/forwarder_test.dart

diff --git a/test/support/forwarder_test.dart b/test/support/forwarder_test.dart
index feb4caa..1a9fe4e 100644
--- a/test/support/forwarder_test.dart
+++ b/test/support/forwarder_test.dart
@@ -106,20 +106,19 @@
           await forwardedDriver.getRequest('element/div/text'), buttonClicked);
     });
 
-    // TODO: investigate why this is failing on nested args
-//    test('execute_script', () async {
-//      expect(await forwardedDriver.getRequest('element/div/text'),
-//          buttonNotClicked);
-//
-//      await forwardedDriver.execute('arguments[0].el.click();', [
-//        {
-//          'el': {'ELEMENT': 'button'}
-//        }
-//      ]);
-//
-//      expect(
-//          await forwardedDriver.getRequest('element/div/text'), buttonClicked);
-//    });
+    test('execute_script', () async {
+      expect(await forwardedDriver.getRequest('element/div/text'),
+          buttonNotClicked);
+
+      await forwardedDriver.execute('arguments[0].el.click();', [
+        {
+          'el': {'ELEMENT': 'button'}
+        }
+      ]);
+
+      expect(
+          await forwardedDriver.getRequest('element/div/text'), buttonClicked);
+    });
 
     test('element equals', () async {
       expect(