Commit Graph

360 Commits

Author SHA1 Message Date
bootstraponline 17e3fc3edb Prevent leaking state across executions 2014-03-21 11:05:50 -04:00
bootstraponline a259762835 Merge pull request #2116 from paymand/2085
Fixup for #2085. set isElement to false if getElement() throws.
2014-03-21 10:14:54 -04:00
Payman Delshad 60dae83db1 Fixup for #2085. set isElement to false if getElement() throws. 2014-03-21 11:30:52 +01:00
Jonathan Lipps d0456ff938 Merge pull request #2099 from rgonalo/master
Allow to have more than one emulator started
2014-03-20 16:20:05 -07:00
Ruben Gonzalez Alonso b47154f89e Wait for emulator is ready after launching it 2014-03-20 16:39:38 +01:00
Ruben Gonzalez Alonso 872cf19c43 Allow to have more than one emulator started 2014-03-20 16:39:30 +01:00
Isaac Murchie f4f730e1ee Use contexts for switching native/web 2014-03-19 21:13:47 -07:00
bootstraponline b1f8021737 temp.path doesn't create the file 2014-03-19 14:21:38 -04:00
Jonathan Lipps de567ae5da make sure the tempdir exists before trying to write aligned apk to it 2014-03-19 10:52:01 -07:00
Ruben Gonzalez Alonso c4006189a4 Print all errors while starting emulator 2014-03-19 18:41:20 +01:00
Ruben Gonzalez Alonso b805773310 Add --avd-args option to launch avd with additional args 2014-03-19 18:41:20 +01:00
bootstraponline 9abcd247d6 Fix android process detection 2014-03-19 12:44:30 -04:00
Ethan Goldblum 3de0e8ab84 Pass quiet flag to fruitstrap when appium in quiet mode.
If appium is started with the quiet flag, this will now be propagated to
the fruitstrap install command.  Fruitstap can be very noisy when
installing app with a large number of resources in the bundle.
2014-03-18 12:47:52 -07:00
bootstraponline 1e71cf8c30 Fix Android uninstall detection
API 19 uses the following stdout message:

WARNING: linker: libdvm.so has text relocations. This is wasting memory and is a security risk. Please fix.
Success

That broke the simple stdout === 'Success' check.
2014-03-18 09:51:27 -04:00
Jonathan Lipps 482d24e0e1 add packageAndLaunchActivity support for selendroid
also convert our tests to use this by default so that it's tested
also move it to after prepareDevice so we make sure to run adb commands
with the appropriate device id etc
fix #2083, cc @bootstraponline
2014-03-17 15:15:48 -07:00
Jonathan Lipps f14c5c9108 use adb's built-in isAppInstalled rather than one that doesn't work 2014-03-17 15:10:58 -07:00
Jonathan Lipps 426283aef8 fix getting logcat logs on selendroid 2014-03-17 14:28:14 -07:00
Jonathan Lipps 6a287a08e0 If we can't find the apple webview button in safari, just try and use the webview anyway 2014-03-17 11:58:48 -07:00
Jonathan Lipps 7a6670d7c5 realize what @dandoveralba was going for 2014-03-17 11:26:35 -07:00
bootstraponline 8367768680 Merge pull request #2082 from jlipps/master
fix jwpError (fix #2080)
2014-03-17 13:23:05 -04:00
Jonathan Lipps 8ef1922d73 fix jwpError (fix #2080) 2014-03-17 10:16:48 -07:00
Jonathan Lipps 9089f09831 new device launching strategy needs to use correct version
also, don't override retina/tall/64bit opts when user doesn't actually
pass in deviceName cap.
cc @dandoveralba
2014-03-17 10:10:08 -07:00
Jonathan Lipps 255ad390b0 Merge pull request #2028 from bootstraponline/android_default
Parse Android package and launch activity from apk
2014-03-17 09:37:20 -07:00
bootstraponline 497ab92f4c Merge pull request #2076 from dandoveralba/fix703
Fix for Instruments Before 7.1SDK
2014-03-16 12:19:04 -04:00
bootstraponline 9fd7718707 Parse Android package and launch activity from apk
Update logging

Add null guard

Prevent null waitPkg
2014-03-16 00:14:25 -04:00
Dan Doveralba 370e856f2d Fix for Instruments Before 7.1SDK
* don't pass the device string to instruments if we're less than 7.1 SDK
* clean up some logging
2014-03-15 20:01:41 -07:00
bootstraponline 40c8c6b8bc Ensure apks are run through zipalign 2014-03-15 15:44:29 -04:00
Dan Doveralba dd38977664 Correct Reset
* sent an outdated pull last time
2014-03-14 18:47:51 -07:00
Dan Doveralba 7d98d9ffaa Fix reset & setLocServicesPrefs interop
* same approach as with Safari prefs
2014-03-14 17:37:25 -07:00
Dan Doveralba a814b1cc2a Fix reset & setPreferences interop
*  restore reset to it's previous state for mobile/hybrid apps and preserve new approach for safari so it's app plist can be set
2014-03-14 17:06:46 -07:00
Jonathan Lipps 39e112e7a8 Merge pull request #2060 from dandoveralba/51support
Select Simulator Device & SDK
2014-03-14 15:35:19 -07:00
Jonathan Lipps c658945f9d change safari webview xpath so it works on 7.1 ipad as well 2014-03-14 15:17:20 -07:00
Dan Doveralba 968b28bfb4 Select Simulator Device & SDK
* use deviceName + version caps to launch a particular simulator device and SDK version (6.1, 7.0.3, 7.1)
* update appium-instruments submodule with corresponding change
* fail if the user tries to set preferences or language/locale and full-reset is requested since they don't work together

Fix #2032, #1642, #304
2014-03-14 13:26:38 -07:00
bootstraponline 6494df98d6 Android mobile push & pull
Ruby examples:

mobile :pushFile, data: Base64.encode64('test ruby'), path: '/data/local/tmp/test.txt'

pull_result = mobile :pullFile, path: '/data/local/tmp/test.txt'
Base64.decode64 pull_result
2014-03-14 15:09:13 -04:00
Jonathan Lipps 30deb2edfa Merge pull request #2054 from dandoveralba/fixcb
Remove Extra CB
2014-03-12 15:15:21 -07:00
Dan Doveralba ceb8581386 Remove Extra CB
* remove extra callback...

Fix #2044
2014-03-12 15:10:29 -07:00
Jonathan Lipps 775fb8fc8b add some logging to make it easier to follow ios startup flow 2014-03-12 14:44:48 -07:00
Jonathan Lipps 23be703991 ensure we get a decent error message if someone uses locationServicesAuthorized with no bundleId 2014-03-12 11:08:03 -07:00
Deivanai Meyyappan 5ebaf5f503 add process arguments for ios specific e.g usage
capability[:processArguments] = "forceLogout"
2014-03-11 16:41:53 -07:00
Jonathan Lipps b53b10c9dd Merge pull request #2033 from sebv/various-fixes
Various fixes
2014-03-11 11:03:50 -07:00
sebv be6f77b354 Added timeout to uninstallApk 2014-03-11 21:46:26 +08:00
sebv f61a321d2e bugfix, context was wrong 2014-03-11 21:44:59 +08:00
Jonathan Lipps bc6b2f8839 if plist base dirs don't exist, create them (fix loc services issues) 2014-03-10 17:28:12 -07:00
Jonathan Lipps a06e4d60c6 Merge pull request #2019 from imurchie/isaac-iosconfig
Use new version of Device.configureLocalApp
2014-03-07 13:15:39 -08:00
Isaac Murchie d45f2aee5c Use new version of Device.configureLocalApp 2014-03-07 13:07:46 -08:00
Jonathan Lipps 80ebe34278 add enablePerformanceLogging cap for chrome/android hybrid, so we can get performance logs 2014-03-07 11:52:20 -08:00
bootstraponline 1005235183 Merge pull request #2007 from paymand/down_up_move
Added support for touch{Down|Up|Move} on Android.
2014-03-07 09:20:28 -05:00
bootstraponline d70f8ac01d Clean up debug logging 2014-03-07 15:10:53 +01:00
Payman Delshad 113fe5ce10 Added support for touch{Down|Up|Move} on Android. 2014-03-07 15:10:52 +01:00
Jonathan Lipps e2573415ec don't delete /Applications unless we're doing fullRest, and add tests of safariIgnoreFraudWarning in safari itself 2014-03-06 17:47:20 -08:00