Commit Graph
11536 Commits
Author SHA1 Message Date
bootstraponline 8367768680 Merge pull request #2082 from jlipps/master
fix jwpError (fix #2080)
2014-03-17 13:23:05 -04:00
Jonathan Lipps 83b313d671 Merge pull request #2081 from appium/new-device-launching
new device launching strategy needs to use correct version
2014-03-17 10:18:49 -07: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
Jonathan Lipps e7b04f9a6d Merge pull request #2075 from sebv/track-published
npm submodules track published branch + package update.
2014-03-17 09:23:53 -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
Jonathan Lipps 0585ffdc15 Merge pull request #2074 from bootstraponline/zipalign
Ensure apks are run through zipalign
2014-03-15 16:24:50 -07:00
bootstraponline 40c8c6b8bc Ensure apks are run through zipalign 2014-03-15 15:44:29 -04:00
sebv 46e962d58f package update (regenerated using publish scripts) 2014-03-15 13:43:06 +08:00
sebv d15d573622 npm packages track published branches 2014-03-15 13:43:06 +08:00
bootstraponline 6d0b6c1728 Merge pull request #2073 from dandoveralba/fix-reset
Correct Reset
2014-03-14 21:55:52 -04:00
Dan Doveralba dd38977664 Correct Reset
* sent an outdated pull last time
2014-03-14 18:47:51 -07:00
bootstraponline 5c4829ece7 Merge pull request #2072 from dandoveralba/alerts
Add Location & Contacts Alerts
2014-03-14 21:37:10 -04:00
Dan Doveralba b07e1b633c Add Location & Contacts Alerts
* reqest access to location and contacts in our sample app
2014-03-14 18:26:31 -07:00
Jonathan Lipps 3968114011 Merge pull request #2070 from dandoveralba/fix-locale
Fix reset & setPreferences & setLocServicesPrefs interop
2014-03-14 18:13:48 -07:00
Dan Doveralba 7d98d9ffaa Fix reset & setLocServicesPrefs interop
* same approach as with Safari prefs
2014-03-14 17:37:25 -07:00
Jonathan Lipps 97424aad58 Merge pull request #2069 from dandoveralba/fix-locale
Update reset & setPreferences interop
2014-03-14 17:18:17 -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 a6d40bb6a8 Merge pull request #2068 from jlipps/master
change safari webview xpath so it works on 7.1 ipad as well
2014-03-14 15:23:51 -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
Jonathan Lipps 873d2df203 make sure we can do forceiPad and safari
heads up @DylanLacey, this will likely cause a conflict with your work
2014-03-14 14:47:48 -07:00
Jonathan Lipps 101dec6532 Merge pull request #2066 from bootstraponline/android_push
Android mobile push & pull
2014-03-14 13:44:05 -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
Jonathan Lipps 3b357841a5 using npmlink -m in reset.sh sometimes puts submodules at an earlier commit than the one we want 2014-03-14 12:35:47 -07:00
Jonathan Lipps b0a3cb2a6a update appium-uiauto submodule so we can get fix (cc @sebv) 2014-03-14 12:29:53 -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 56aca0c1c8 Merge pull request #2065 from sebv/dup-textfield
Package upgrade + duplicate test.
2014-03-14 11:28:17 -07:00
sebv 0dfb7bbdbb appium-uiauto + appium-instruments upgrade 2014-03-15 01:58:05 +08:00
sebv 90aa96e873 added duplicate textfield test 2014-03-15 01:58:05 +08:00
Jonathan Lipps e7beefaa12 Merge pull request #2061 from sebv/uicatalog-fix
UICatalog fix for 7.1
2014-03-14 09:41:46 -07:00
sebv 094564270d UICatalog fix for 7.1 2014-03-14 21:43:46 +08:00
Jonathan Lipps a8f0285336 Merge pull request #2059 from Jonahss/fixFindTest
Fix find-element tests for ios7
2014-03-13 18:42:00 -07:00
jonahss 3d5fdc9201 added better error reporting to test helper 2014-03-13 16:49:15 -07:00
jonahss 509d1c7271 fixed find-element tests for ios7 2014-03-13 16:49:08 -07: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 b2a782a899 actually clear out commandTimeout in between sessions so we don't start the timer while a new session is loading the app 2014-03-12 12:42:23 -07:00
Jonathan Lipps f98d93741a Merge pull request #2052 from jlipps/master
add locationServicesAuthorized errors/warnings when there's no bundleId
2014-03-12 11:52:41 -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
Jonathan Lipps 99e24ead3d point out that locationServicesEnabled cap requires bundleId 2014-03-12 10:56:02 -07:00
Jonathan Lipps ec46e59c28 Merge pull request #2048 from bootstraponline/ios_mercy
Default to mercy on iOS
2014-03-12 10:01:39 -07:00
bootstraponline 19b8fc4b10 Default to mercy on iOS 2014-03-12 12:50:58 -04:00
Jonathan Lipps 4784ed7558 Merge pull request #2046 from Javier84/patch-1
Update troubleshooting.md
2014-03-12 05:23:48 -07:00
Jonathan Lipps e37e1e04c2 Merge pull request #2043 from sebv/cwd
Making sure cwd is consistent
2014-03-12 05:16:38 -07:00
Javier84 05f79c26ab Update troubleshooting.md 2014-03-12 11:06:34 +02:00