Merge branch 'master' of github.com:google/webdriver.dart
diff --git a/pubspec.yaml b/pubspec.yaml
index 383048c..182dfeb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,3 +15,4 @@
unittest: '^0.11.6+1'
dev_dependencies:
test: '^0.12.3+8'
+
diff --git a/test/src/command_event.dart b/test/src/command_event.dart
index 0baa524..06004ef 100644
--- a/test/src/command_event.dart
+++ b/test/src/command_event.dart
@@ -30,9 +30,15 @@
var events = [];
var sub;
+<<<<<<< HEAD
setUp(() async {
driver = await createTestDriver();
sub = driver.onCommand.listen(events.add);
+=======
+ setUp(() async {
+ driver = await createTestDriver();
+ sub = driver.onCommand.listen(events.add);
+>>>>>>> cf97653bdf1a5b77bb0246231b9770149f403f16
await driver.get(testPagePath);
});
@@ -45,6 +51,7 @@
driver = null;
});
+<<<<<<< HEAD
test('handles exceptions', () async {
try {
await driver.switchTo.alert;
@@ -72,4 +79,30 @@
});
},
testOn: '!js');
+=======
+ test('handles exceptions', () async {
+ try {
+ await driver.switchTo.alert;
+ } catch (e) {}
+ await waitFor(() => events, matcher: hasLength(2));
+ expect(events[1].method, 'GET');
+ expect(events[1].endPoint, contains('alert'));
+ expect(events[1].exception, new isInstanceOf<WebDriverException>());
+ expect(events[1].result, isNull);
+ expect(events[1].startTime.isBefore(events[1].endTime), isTrue);
+ expect(events[1].stackTrace, new isInstanceOf<Chain>());
+ });
+
+ test('handles normal operation', () async {
+ await driver.findElements(const By.cssSelector('nosuchelement')).toList();
+ await waitFor(() => events, matcher: hasLength(2));
+ expect(events[1].method, 'POST');
+ expect(events[1].endPoint, contains('elements'));
+ expect(events[1].exception, isNull);
+ expect(events[1].result, hasLength(0));
+ expect(events[1].startTime.isBefore(events[1].endTime), isTrue);
+ expect(events[1].stackTrace, new isInstanceOf<Chain>());
+ });
+ }, testOn: '!js');
+>>>>>>> cf97653bdf1a5b77bb0246231b9770149f403f16
}
