Commit Graph
12159 Commits
Author SHA1 Message Date
Jonathan Lipps 823d4da6a2 fiddle with some timeouts to account for older/slower emulators
and time testruns
2013-10-28 16:58:09 -07:00
Jonathan Lipps 0ce786284c Merge pull request #1375 from jlipps/master
add back launch and some logging options
2013-10-28 16:45:08 -07:00
Jonathan Lipps 3ba0e3f0c6 add --log-timestamp and --log-no-colors options
also clean up and consolidate logging code
2013-10-28 16:36:32 -07:00
Jonathan Lipps 8f2d933985 add back desiredCaps.launch flag 2013-10-28 16:36:32 -07:00
bootstraponline 7efd7cc396 Merge pull request #1374 from jlipps/master
update ios auth logic (fix #1373)
2013-10-28 12:25:59 -07:00
Jonathan Lipps 457ad14192 update ios auth logic (fix #1373) 2013-10-28 12:20:12 -07:00
Jonathan Lipps b4a9980ff5 Merge pull request #1372 from jlipps/master
Cleanup/refactor of appium/android startup/shutdown
2013-10-28 11:57:52 -07:00
Jonathan Lipps 8770f35afb Merge pull request #1371 from drpy/master
fix for #1040
2013-10-28 11:43:16 -07:00
Jonathan Lipps 9a402b0ea7 when we get an error starting up an android test, make sure we kill uiautomator
so it doesn't complain next time we run a test
2013-10-28 11:39:50 -07:00
Jonathan Lipps 805c55d464 command timeouts should be handled centrally by appium, not by each device 2013-10-28 11:39:50 -07:00
Jonathan Lipps 32d153b6ab finish making shutdown() callback-based 2013-10-28 11:39:50 -07:00
Jonathan Lipps 386de406f3 check in midway through android startup/shutdown refactor 2013-10-28 11:39:50 -07:00
Jonathan Lipps b537c4ae71 remove confusing multiple session handling code
it doesn't actually do anything and was cruft
also, make session overriding non-default based on the mobile
JSONWP discussions
2013-10-28 11:39:50 -07:00
drpy 2bb66b7f6d fix for #1040 2013-10-28 19:29:43 +01:00
Jonathan Lipps 27e684b6d3 Merge pull request #1370 from bicycleio/master
Missing callback parameter causing Appium to crash
2013-10-28 10:53:45 -07:00
Peter Schwarz 027ae9adea Fixed missing callback parameter 2013-10-28 12:38:41 -05:00
bootstraponline b225884777 Merge pull request #1360 from filmaj/android-docs
Expanded Android docs
2013-10-25 12:27:34 -07:00
filmaj 06add275df Small typo fixes in docs and expanded on android setup for mac osx 2013-10-25 12:24:37 -07:00
Jonathan Lipps ecec01d5c3 add some more caps to docs 2013-10-25 12:08:25 -07:00
Jonathan Lipps e500b81abe Merge pull request #1357 from paymand/element_methods
Element methods
2013-10-25 11:30:00 -07:00
Jonathan Lipps 60b677a201 Merge pull request #1358 from jlipps/master
copy status/xpath instead of linking
2013-10-25 11:28:53 -07:00
Payman Delshad 105fc6a5f1 (Android) Correct handling of 'element{Displayed|Enabled|Selected}'. 2013-10-25 19:21:13 +02:00
Payman Delshad 6aeb26574f Don't set Content-Length header for http POSTs with empty body. 2013-10-25 19:20:28 +02:00
Jonathan Lipps def9c4a7c7 copy status and xpath to uiauto instead of linking
so they get picked up appropriately by npm
2013-10-25 09:37:14 -07:00
bootstraponline 1f069163f0 Merge pull request #1354 from DylanLacey/master
Don't monkey-patch "capabilities" as this is now apparently a defined method
2013-10-25 06:03:32 -07:00
Dylan Lacey c2c09814bc Change name of capabilities method for sauce_example.rb to prevent us trampling a protected method 2013-10-24 23:20:45 -07:00
Jonathan Lipps 84ca50ae47 Merge pull request #1353 from filmaj/sh-compat
Shell compatibility w/ test.sh
2013-10-24 15:57:01 -07:00
filmaj 4969bba0f7 Made test.sh sh compatible (removed bashisms). Made test.sh not rely on mac-only tooling. Small documentation tweaks in readme and contributing doc. 2013-10-24 15:13:55 -07:00
bootstraponline 2f0d0a9c32 Merge pull request #1351 from jlipps/master
couple misc fixes
2013-10-24 14:08:32 -07:00
Jonathan Lipps dd863c7fa8 update all examples to use correct desired caps
we don't want people getting confused!
2013-10-24 14:03:17 -07:00
Jonathan Lipps 91e21ac13b replicate @snevesbarros reset fix for building safari 2013-10-24 13:45:55 -07:00
Jonathan Lipps bd8cbab399 change order of unlock regexes 2013-10-24 11:56:30 -07:00
Jonathan Lipps b3b29e7324 Merge pull request #1348 from jlipps/master
misc fixes
2013-10-24 11:13:12 -07:00
Jonathan Lipps 4ae0cd9c28 upgrade express so we don't get warning messages 2013-10-24 10:49:33 -07:00
Jonathan Lipps 592c6af31a remove .appiumconfig on reset
so we don't run into situations like reset.sh --[device] and then
appium won't start because other devices were configured at
a previous version
2013-10-24 10:49:33 -07:00
bootstraponline 461a397178 Merge pull request #1347 from jlipps/master
fix unlock retry logic so we actually unlock
2013-10-24 10:44:06 -07:00
Jonathan Lipps fe61ec8b8c fix unlock retry logic so we actually unlock (fix #1295) 2013-10-24 10:41:55 -07:00
Jonathan Lipps 16f42546c9 switch around auth strategies (fix #1346) 2013-10-24 10:04:38 -07:00
Jonathan Lipps 1ae8581df4 update travis to use newer node 2013-10-24 10:02:22 -07:00
Jonathan Lipps 4b0ed93914 fix launch timeout bug (fix #1340) 2013-10-24 08:05:35 -07:00
bootstraponline 82eeb3a3a9 Merge pull request #1345 from paymand/fast_reset
(Android) Don't uninstall the app on fast reset.
2013-10-24 06:23:08 -07:00
Payman Delshad e66d5fa2f8 (Android) Fix for crash when there's no connected devices. 2013-10-24 15:14:55 +02:00
Payman Delshad 85f0b3aa73 (Android) Don't uninstall the app on fast reset. 2013-10-24 14:58:09 +02:00
Jonathan Lipps 8bf8db3dc6 changelog and bump for publish 0.11.0 v0.11.0 2013-10-23 11:27:19 -07:00
Jonathan Lipps 9b0b00821d Merge pull request #1343 from jlipps/master
fix flakiness in getting session in appium testsuite
2013-10-23 11:08:16 -07:00
Jonathan Lipps 28114d9aea retry getting a session in appium tests (fix #1326) 2013-10-23 10:57:53 -07:00
Jonathan Lipps 634f8d4eb7 allow desired cap launchTimeout to tell appium how long to wait before declaring instruments unresponsive 2013-10-23 10:11:24 -07:00
Jonathan Lipps 677499343e refactor ios.js option passing 2013-10-23 10:05:08 -07:00
bootstraponline fab2f9a401 Merge pull request #1341 from bootstraponline/master
Fix null args.app
2013-10-23 07:52:45 -07:00
bootstraponline 4acdf90b17 Fix null args.app 2013-10-23 09:43:01 -04:00