274 Commits
Author SHA1 Message Date
Jonathan Lipps b9de01e350 fix logic mistake
guess i should run some tests before releasing
2014-01-21 12:00:38 -08:00
Jonathan Lipps 954e32a897 Merge pull request #1777 from paymand/ios_drag
Implemented drag for iOS.
2014-01-21 11:43:41 -08:00
Jonathan Lipps 3bd3796ee0 ensure we don't set prefs when running a real device 2014-01-21 10:03:26 -08:00
Payman Delshad f4a1b6fcaf Implemented drag for iOS.
- Use same drag API on iOS and Android.
- Fixed some indentations.
2014-01-21 10:49:18 +01:00
Jonathan Lipps b7e706a93f allow enabling/disabling locationservices via caps 2014-01-20 16:59:55 -08:00
Jonathan Lipps d7860c093d round out settings methods and options 2014-01-20 16:59:55 -08:00
Jonathan Lipps a2482852db set down basic plist key/value options and logic 2014-01-20 16:59:55 -08:00
bootstraponline 168445332c fast reset without fast clear requires remote apk to exist 2014-01-20 17:57:31 -05:00
Jonathan Lipps dba5e7393b fix pre-launch bug (fix #1772)
and add tests
2014-01-20 12:43:30 -08:00
Ruben Gonzalez Alonso 19b2ac545f Fix issue #1775: Selendroid doesn't wait for app-wait-activity 2014-01-20 11:57:52 +01:00
Jason Chutko f920c9e45b Fixed an issue where alerts with no title will return the text as null, instead of the alert's message content. Similarly, fixed in the converse. 2014-01-17 20:10:14 -08:00
bootstraponline 365543575a Merge pull request #1765 from jlipps/fix-max-stack
fix max call stack in keytool zip issue
2014-01-16 19:36:05 -08:00
Jonathan Lipps 21fb8b2d9e use a messy loop instead of a deeply nested async fn chain (fix #1523) 2014-01-16 17:50:35 -08:00
Romain Criton 2d161528d8 Implementing mobile:background command for Android and Selendroid
Replay commit 1c6b495cd2

Remove debug log

Tidy up spaces according to pull request review

Fixed indentation according to Appium project style guide (2 spaces indent)

Fixed error management in background method

Add an argument to ADB.startApp in order to choose whether to stop the app prior to starting it

Conflicts:
	lib/devices/android/adb.js

Refactored mobile:background method for Android: using ADB.startApp rather than directly issuing am start command to ADB shell, do not return to callback until app is back to foreground

Mimick the launcher start intent for the app when starting it

The Android launcher uses the following settings to start apps:
- MAIN action
- LAUNCHER category
- FLAG_ACTIVITY_NEW_TASK
- FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
Without those settings there were discrepancies between Selendroid and
Android when trying to bring the app back to foreground: it would not
bring back the existing Activity stack but create new activities

Adapt background code to new startApp signature

Added "retry" argument

Missing space

Spaces after if

Fixed spacing issue

Split long line
2014-01-16 22:59:57 +00:00
Jonathan Lipps 0c1b04e41a Merge pull request #1760 from jlipps/master
windows compat fix in android binary finding logic
2014-01-16 12:30:29 -08:00
Jonathan Lipps 7b19a0e12d windows compat fix in android binary finding logic (attempt to fix #1759) 2014-01-16 12:21:29 -08:00
Chi Thu Le f811572a72 Return accessibilityHint as element's attribute 'hint' 2014-01-16 21:21:01 +01:00
Jonathan Lipps 8334ef5e65 Merge pull request #1755 from mobiware/full-reset2
Support full-reset for selendroid (2nd take)
2014-01-16 09:58:11 -08:00
Jonathan Lipps cd4051bea6 Merge pull request #1754 from sebv/extra-caps
Native instruments configurable as capabilities
2014-01-16 09:21:28 -08:00
Romain Criton 82434a5efe Support full-reset for selendroid
Replay commit ad9c73a3c4
2014-01-16 16:49:33 +00:00
sebv c86606e09c native instruments configurable as capabilities 2014-01-16 20:28:51 +08:00
patotskiy 30af76744d Fix android multiple devices: android/android-common.js 2014-01-16 14:06:26 +03:00
Jonathan Lipps 3b1cc359cb kill chromedriver before starting new chromedriver 2014-01-15 10:31:45 -08:00
Yuan Zhou 1e97012bae Fix issue #1713: Change killProc signal from SIGKILL to SIGTERM. 2014-01-15 17:53:37 +08:00
Jonathan Lipps a9841062e0 fix selendroid app launch issues
require a dot for a relative activity, otherwise we consider it a full one
2014-01-13 15:54:16 -08:00
Jonathan Lipps 4663e66ee3 support selendroid 4.4/19 better 2014-01-13 15:54:16 -08:00
Markyme 9be44a36bc Support Latest SDK
android-4.4 created by default on latest SDK installation
2014-01-12 17:41:03 +02:00
Andrew Wason 456fc65bd2 Use correct suffix (.zip or .apk) when downloading app from a url.
md5calculator (used in lib/devices/android/android-common.js)
can only handle files that end in .ipa or .apk, not .zip.
Currently urls that end in .apk are downloaded as appium-app.zip
2014-01-10 17:18:27 -05:00
Jonathan Lipps 78bb4e14f6 fix autoAcceptAlerts undefined issue (cc @dandoveralba) 2014-01-10 11:24:05 -08:00
bootstraponline 72a50d8d16 Merge pull request #1726 from jlipps/master
cleanup app state before a test too (rewrite of #1732)
2014-01-10 09:44:46 -08:00
Jonathan Lipps 76bba5db8d Merge pull request #1725 from paymand/install_remove_app_ios
Fix for installing/removing app on device when a .app path is used.
2014-01-10 09:43:00 -08:00
Payman Delshad 938c686de0 Fix for installing/removing app on device when a .app path is used. 2014-01-10 18:08:37 +01:00
Jonathan Lipps ea20c38f7a cleanup app state before a test too (rewrite of #1732)
cc @dandoveralba @bootstraponline
2014-01-10 09:08:20 -08:00
Jonathan Lipps 44b8ed86e0 actually allow removeApp to work with selendroid (fix #1686 for real) 2014-01-10 09:00:51 -08:00
Dan Doveralba 64522d746a Update Alert Logic
* by default appium doesn't interact with alerts
* set autoAcceptAlerts to true to have appium accept alerts
2014-01-09 22:27:08 -08:00
Jonathan Lipps c1a6fca60a fix forgotten bind issue 2014-01-09 09:39:50 -08:00
Jonathan Lipps f920a07f10 show selendroid logs in appium output
by making logcat an eventemitter.
also update selendroid test app version
2014-01-08 10:40:18 -08:00
Jonathan Lipps b67440ad0b if we have trouble proxying, best to actually error to the client 2014-01-08 10:02:27 -08:00
Jonathan Lipps 71ba778bd4 fix selendroid ECONNRESET crashes
by making sure that activities come prepended with a dot.
and add a test
2014-01-08 09:51:57 -08:00
Jonathan Lipps 98720225e8 Merge pull request #1674 from rockbot/ios-crash
Checks for crash log information - first attempt (fix #1590)
2014-01-07 17:46:09 -08:00
Jonathan Lipps e29d20bc0f make sure we catch photo alert names 2014-01-07 17:09:26 -08:00
rockbot c405d1b6eb completes iOS crash logging (fixes #1590) 2014-01-07 15:17:28 -08:00
Jonathan Lipps 377141fe05 update appium doctor to respect new auth db value 2014-01-07 14:58:44 -08:00
Jonathan Lipps 9fb163be2e automatically accept photo permission alerts (fix #1700)
and add manualPermissionAlerts desired cap if you want to
handle things manually
2014-01-07 14:44:20 -08:00
Dan Cuellar 82d49d0c7d Adding flag to show simulator logs 2014-01-07 14:09:18 -08:00
Jonathan Lipps 6d41352d9b bring back closeApp for selendroid (fix #1686) 2014-01-07 09:43:46 -08:00
Jonathan Lipps 5981667cca add support for doing web testing against android stock browser 2014-01-06 18:20:17 -08:00
rockbot 5d88a0eb48 Improves error handling in bootstrap's find.java (fixes #1549) 2014-01-03 11:52:26 -08:00
Jonathan Lipps 0dc74e9874 Merge pull request #1687 from sebv/chrome_fix
Modified session creation to cope with non redirect case
2014-01-03 11:33:01 -08:00
Jonathan Lipps fb10e134d1 Merge pull request #1681 from boxiong/master
Fixed a sporadic DOM corruption issue
2014-01-03 09:08:41 -08:00