Commit Graph
11339 Commits
Author SHA1 Message Date
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
Jonathan Lipps cfb41f5273 Merge pull request #1781 from bootstraponline/master
android fails to install apk when using old fashion reset
2014-01-20 15:13:25 -08:00
bootstraponline 168445332c fast reset without fast clear requires remote apk to exist 2014-01-20 17:57:31 -05:00
Dan Cuellar d08fde15f6 Merge pull request #1779 from jlipps/master
fix pre-launch bug (fix #1772)
2014-01-20 12:55:17 -08:00
Jonathan Lipps dba5e7393b fix pre-launch bug (fix #1772)
and add tests
2014-01-20 12:43:30 -08:00
Jonathan Lipps e1961db0cf Merge pull request #1776 from rgonalo/master
Fix issue #1775: Selendroid doesn't wait for app-wait-activity
2014-01-20 11:28:05 -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
Dan Cuellar 6ff1179897 Merge pull request #1771 from jasonchutko/alertview-notitle
Alerts with no title will return the text as null, instead of the alert's message content.
2014-01-18 05:50:20 -08: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
Jonathan Lipps 99155c6321 changelog and bump to 0.14.0 for publish v0.14.0 2014-01-17 14:06:22 -08:00
Jonathan Lipps 3b0d9b49dd reverse test assumption (cc @sebv) 2014-01-17 13:42:31 -08:00
Jonathan Lipps 4d7cac55c9 fix test, this is what i get for using another editor 2014-01-17 12:24:42 -08:00
Jonathan Lipps 0b66158074 make ios tests a bit more robust 2014-01-17 11:39:03 -08:00
Jonathan Lipps 50ad1d0c42 add test for app backgrounding to android/selendroid 2014-01-17 10:57:00 -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
Jonathan Lipps 0acc244ca7 Merge pull request #1764 from sebv/extra-caps
Added doc for nativeInstrumentsLib cap
2014-01-16 16:56:54 -08:00
sebv 8952c5bab8 Added doc for nativeInstrumentsLib cap 2014-01-17 08:05:39 +08:00
Jonathan Lipps 1d2211396c Merge pull request #1762 from mobiware/background-android3
Implementing mobile:background command for Android and Selendroid
2014-01-16 15:33:29 -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 0d05436ce2 Merge pull request #1761 from thu2004/master
Return accessibilityHint as element's attribute 'hint'
2014-01-16 12:26:21 -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
Jonathan Lipps f979f2e51a Merge pull request #1753 from patotskiy/fix_android
Fix android multiple devices: android/android-common.js
2014-01-16 09:14:09 -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 ecc0f6aee2 Merge pull request #1747 from c0nscience/develop
switch values at assertEquals statements
2014-01-15 12:27:17 -08:00
bootstraponline ab6430806b Merge pull request #1750 from jlipps/master
add bitdeli tracking
2014-01-15 11:02:11 -08:00
Jonathan Lipps b3d0b4ee80 add bitdeli tracking 2014-01-15 10:55:35 -08:00
Dan Cuellar 69a4a85b35 Merge pull request #1749 from jlipps/master
kill chromedriver before starting new chromedriver
2014-01-15 10:43:15 -08:00
Jonathan Lipps 3b1cc359cb kill chromedriver before starting new chromedriver 2014-01-15 10:31:45 -08:00
Jonathan Lipps 115bb96489 Merge pull request #1745 from zijie0/master
Fix issue #1713: Change killProc signal from SIGKILL to SIGTERM.
2014-01-15 10:07:03 -08:00
Benjamin Herzig c60f436aae switch values at assertEquals statements, to reflect the correct meaning 2014-01-15 17:02:26 +01:00
Yuan Zhou 1e97012bae Fix issue #1713: Change killProc signal from SIGKILL to SIGTERM. 2014-01-15 17:53:37 +08:00
Jonathan Lipps e08d537e5d Merge pull request #1734 from jlipps/master
fix some selendroid issues
2014-01-13 16:02:09 -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
Jonathan Lipps 98868defb4 Merge pull request #1732 from sebv/wd_promise_chain
Converted test to wd promise chain api.
2014-01-13 13:40:46 -08:00
sebv 6695dfe5fb Refactored tests to use wd promise-chain api 2014-01-14 04:31:19 +08:00
bootstraponline f20db13e5b Merge pull request #1729 from Markm21/patch-1
Support Latest SDK
2014-01-12 08:38:14 -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
Jonathan Lipps 84625b48ed Merge pull request #1727 from rectalogic/master
Use correct suffix (.zip or .apk) when downloading app from a url.
2014-01-10 14:29:32 -08: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