Merge pull request #70 from DrMarcII/master
Update file names for better compatibility with test.
diff --git a/test/html_test.dart b/test/html_test.dart
index fbbaa76..c55c77c 100644
--- a/test/html_test.dart
+++ b/test/html_test.dart
@@ -21,16 +21,16 @@
import 'package:webdriver/html.dart'
show WebDriver, Capabilities, createDriver, fromExistingSession;
-import 'src/alert_test.dart' as alert;
-import 'src/keyboard_test.dart' as keyboard;
-import 'src/logs_test.dart' as logs;
-import 'src/mouse_test.dart' as mouse;
-import 'src/navigation_test.dart' as navigation;
-import 'src/options_test.dart' as options;
-import 'src/target_locator_test.dart' as target_locator;
-import 'src/web_driver_test.dart' as web_driver;
-import 'src/web_element_test.dart' as web_element;
-import 'src/window_test.dart' as window;
+import 'src/alert.dart' as alert;
+import 'src/keyboard.dart' as keyboard;
+import 'src/logs.dart' as logs;
+import 'src/mouse.dart' as mouse;
+import 'src/navigation.dart' as navigation;
+import 'src/options.dart' as options;
+import 'src/target_locator.dart' as target_locator;
+import 'src/web_driver.dart' as web_driver;
+import 'src/web_element.dart' as web_element;
+import 'src/window.dart' as window;
import 'test_util.dart' as test_util;
void main() {
diff --git a/test/io_test.dart b/test/io_test.dart
index dd66c75..aab433d 100644
--- a/test/io_test.dart
+++ b/test/io_test.dart
@@ -21,16 +21,16 @@
import 'package:webdriver/io.dart'
show WebDriver, Capabilities, createDriver, fromExistingSession;
-import 'src/alert_test.dart' as alert;
-import 'src/keyboard_test.dart' as keyboard;
-import 'src/logs_test.dart' as logs;
-import 'src/mouse_test.dart' as mouse;
-import 'src/navigation_test.dart' as navigation;
-import 'src/options_test.dart' as options;
-import 'src/target_locator_test.dart' as target_locator;
-import 'src/web_driver_test.dart' as web_driver;
-import 'src/web_element_test.dart' as web_element;
-import 'src/window_test.dart' as window;
+import 'src/alert.dart' as alert;
+import 'src/keyboard.dart' as keyboard;
+import 'src/logs.dart' as logs;
+import 'src/mouse.dart' as mouse;
+import 'src/navigation.dart' as navigation;
+import 'src/options.dart' as options;
+import 'src/target_locator.dart' as target_locator;
+import 'src/web_driver.dart' as web_driver;
+import 'src/web_element.dart' as web_element;
+import 'src/window.dart' as window;
import 'test_util.dart' as test_util;
diff --git a/test/src/alert_test.dart b/test/src/alert.dart
similarity index 100%
rename from test/src/alert_test.dart
rename to test/src/alert.dart
diff --git a/test/src/keyboard_test.dart b/test/src/keyboard.dart
similarity index 100%
rename from test/src/keyboard_test.dart
rename to test/src/keyboard.dart
diff --git a/test/src/logs_test.dart b/test/src/logs.dart
similarity index 100%
rename from test/src/logs_test.dart
rename to test/src/logs.dart
diff --git a/test/src/mouse_test.dart b/test/src/mouse.dart
similarity index 100%
rename from test/src/mouse_test.dart
rename to test/src/mouse.dart
diff --git a/test/src/navigation_test.dart b/test/src/navigation.dart
similarity index 100%
rename from test/src/navigation_test.dart
rename to test/src/navigation.dart
diff --git a/test/src/options_test.dart b/test/src/options.dart
similarity index 100%
rename from test/src/options_test.dart
rename to test/src/options.dart
diff --git a/test/src/target_locator_test.dart b/test/src/target_locator.dart
similarity index 100%
rename from test/src/target_locator_test.dart
rename to test/src/target_locator.dart
diff --git a/test/src/web_driver_test.dart b/test/src/web_driver.dart
similarity index 100%
rename from test/src/web_driver_test.dart
rename to test/src/web_driver.dart
diff --git a/test/src/web_element_test.dart b/test/src/web_element.dart
similarity index 100%
rename from test/src/web_element_test.dart
rename to test/src/web_element.dart
diff --git a/test/src/window_test.dart b/test/src/window.dart
similarity index 100%
rename from test/src/window_test.dart
rename to test/src/window.dart
diff --git a/tool/travis.sh b/tool/travis.sh
index b6a51fd..1f41e17 100755
--- a/tool/travis.sh
+++ b/tool/travis.sh
@@ -27,15 +27,12 @@
test/html_test.dart \
test/io_test.dart
-# run test/async_helpers_test.dart
-pub run test test/async_helpers_test.dart -p vm -r expanded
# Start chromedriver.
chromedriver --port=4444 --url-base=wd/hub &
-# Run test/io_test.dart.
-pub run test test/io_test.dart -p vm -r expanded
+# Run tests
+# TODO(DrMarcII) enable running tests in browser when chrome setuid problem
+# is fixed on travis.
+pub run test -r expanded -p vm
-# Run test/html_test.dart.
-# does not work with chromedriver
-# pub run test test/html_test.dart -p chrome -r expanded
