Commit Graph
11536 Commits
Author SHA1 Message Date
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
Jonathan Lipps 0f0d0fc2b7 update appium.io again 2013-10-22 17:26:25 -07:00
Jonathan Lipps dfcc60a2bd update appium.io 2013-10-22 17:22:51 -07:00
Jonathan Lipps 11bef30110 missed some 'node server.js' updates 2013-10-22 14:28:43 -07:00
Jonathan Lipps fc7440a78d Merge pull request #1338 from jlipps/master
Massive refactor of ADB/Android code
2013-10-22 13:22:08 -07:00
Jonathan Lipps 8e5a0bb1f9 more cleanup including selendroid update 2013-10-22 11:29:19 -07:00
Jonathan Lipps bac7b069fa update selendroid 2013-10-22 11:29:19 -07:00
Jonathan Lipps d2a362118a fix a bunch of refactoring issues 2013-10-22 11:29:19 -07:00
Jonathan Lipps 9f129c2172 convert selendroid 2013-10-22 11:29:19 -07:00
Jonathan Lipps d63671ceee finish main rewrite of adb.js 2013-10-22 11:29:19 -07:00
Jonathan Lipps 2e1a13eb94 split up instrumentation responsibilities 2013-10-22 11:29:19 -07:00
Jonathan Lipps 3785fe5ca9 just use javascript's new operator rather than adding levels of abstraction 2013-10-22 11:29:19 -07:00
Jonathan Lipps c3db317842 fix logcat issue where it returns too many logs 2013-10-22 11:29:19 -07:00
Jonathan Lipps 1140908666 run commands from uiautomator.js, and migrate activity waiting methods 2013-10-22 11:29:19 -07:00
Jonathan Lipps 44c64db8e2 extract uiautomator behavior into its own object/library 2013-10-22 11:29:19 -07:00
Jonathan Lipps 389ae73e9a migrate push unlock and push appium 2013-10-22 11:29:18 -07:00
Jonathan Lipps 30b2c69ff6 migrate port forward logic 2013-10-22 11:29:18 -07:00
Jonathan Lipps 65bb08d84e finish migrating install logic 2013-10-22 11:29:18 -07:00
Jonathan Lipps 680d09a77a initial work on refactoring adb 2013-10-22 11:29:18 -07:00
Jonathan Lipps f7c8f9e6cb we don't use webatoms for android now that we use chrome 2013-10-22 11:29:18 -07:00
Jonathan Lipps 138f22f319 move android controller methods into their own file 2013-10-22 11:29:18 -07:00
Jonathan Lipps 7703df1be8 Merge pull request #1336 from ecomrobotics/ios-allow-use-ipa-in-app-param
Allow .ipa extension for desired capabilities param 'app'
2013-10-21 21:59:28 -07:00
Aleksandr Komlev 5ded674ae3 Allow .ipa extension for desired capabilities param 'app' 2013-10-21 21:32:03 +04:00
bootstraponline a9ff48409a Merge pull request #1334 from paymand/android_getClassName
Support for getClassName() from Android API level 18.
2013-10-21 06:29:52 -07:00