Commit Graph
11595 Commits
Author SHA1 Message Date
Jonathan Lipps 585bf8218b Merge pull request #1814 from paymand/getIDeviceObj
getIDeviceObj() should return the device object.
2014-01-30 10:09:06 -08:00
Jonathan Lipps cdc34fedbf Merge pull request #1796 from sebv/sebv-working
Test reformatting, step2.
2014-01-30 10:02:31 -08:00
Dan Cuellar 4b2a2f0574 Merge pull request #1817 from davebassan/real-safari-ios7
Real safari ios7
2014-01-30 07:40:26 -08:00
bootstraponline 204542c001 Merge pull request #1830 from lbunschoten/patch-1
Update running-on-linux.md
2014-01-30 06:26:19 -08:00
sebv f4aa464cf4 bugfix, simplifying loop avoiding win=undefined 2014-01-30 21:36:04 +08:00
lbunschoten 1f14f37c60 Update running-on-linux.md
Fixed a typo (missing closing quote)
2014-01-30 14:22:06 +01:00
Dave Bassan 4c1048dfdd corrected failures against styling rules. 2014-01-30 11:30:33 +00:00
Dave Bassan acfb5403a2 Merge branch 'real-safari-ios7' of https://github.com/davebassan/appium into real-safari-ios7 2014-01-30 10:55:05 +00:00
Dave Bassan 387ee4b9b0 nonSyntheticWebClick does not work for real safari. 2014-01-30 10:53:01 +00:00
Dave Bassan d6f169c1aa do not click apple button for real safari. 2014-01-30 10:51:59 +00:00
sebv 968576af3d jshinting with white=true 2014-01-30 16:58:19 +08:00
sebv 714e24c789 Test reformatting, step2. 2014-01-30 16:55:47 +08:00
Jonathan Lipps 728f6c7df1 Merge pull request #1824 from bootstraponline/master
Escape single quotes for iOS id search
2014-01-29 15:09:50 -08:00
bootstraponline 05ce60fb8e Merge pull request #1826 from jlipps/master
update style guide with new spacing guide
2014-01-29 13:39:38 -08:00
Jonathan Lipps 3226bbe122 update style guide with new spacing guide 2014-01-29 13:29:55 -08:00
Jonathan Lipps 3448af6ee8 Merge pull request #1823 from sebv/jshint-white
Stricter jshint rules enforcable from editor
2014-01-29 11:35:24 -08:00
bootstraponline 2fa6443e47 Escape single quotes for iOS id search
Fixes: Selenium::WebDriver::Error::JavascriptError: Unable to parse the format string
2014-01-29 13:17:45 -05:00
sebv d971f72c46 stricter jshint rules enforcable from editor 2014-01-29 14:03:34 +08:00
Dave Bassan 83ee3cc341 nonSyntheticWebClick does not work for real safari. 2014-01-27 21:30:11 +00:00
Dave Bassan 60736352a0 do not click apple button for real safari. 2014-01-27 21:25:40 +00:00
Payman Delshad 6ad413105d No need to remove the app if bundleId is null. 2014-01-27 09:51:16 +01:00
Payman Delshad 8b9dba6413 getIDeviceObj() should return the device object. 2014-01-26 13:13:57 +01:00
Jonathan Lipps a2dff90975 Merge pull request #1809 from jlipps/master
fix some ios real device launch issues
2014-01-24 14:23:00 -08:00
Jonathan Lipps 6b637d8aa8 make sure we don't crash if IDevice init fails 2014-01-24 13:48:50 -08:00
Jonathan Lipps ab061642d0 finish locale udid fix (fix #1773) 2014-01-24 13:48:43 -08:00
Jonathan Lipps 08d93ce628 Merge pull request #1808 from jlipps/master
better support for settings/preferences app
2014-01-23 17:35:55 -08:00
Jonathan Lipps 4bd07d6bfc enable basic prefs tests to pass on ios7 sim
@sebv this will probably cause merge conflicts, I tried to make it easy
to see what's going on here
2014-01-23 15:29:47 -08:00
Jonathan Lipps 82875e7531 make settings app a first-class appium-supported ios app 2014-01-23 15:20:02 -08:00
Jonathan Lipps 5934782a36 add some logging around real device methods 2014-01-23 10:29:31 -08:00
bootstraponline cfc50b20c0 Merge pull request #1806 from jlipps/master
if we can't find ios logs, just log error, don't crash appium
2014-01-23 10:15:27 -08:00
Jonathan Lipps e943650ab8 if we can't find ios logs, just log error, don't crash appium 2014-01-23 10:10:14 -08:00
Jason Chutko e55cfb2a73 Fixed a crash when there is a URL in an alert's title. 2014-01-22 15:42:18 -08:00
Jonathan Lipps 046c0be31e Merge pull request #1767 from dandoveralba/instruments
Instruments Launch Failures
2014-01-22 14:49:32 -08:00
Dan Doveralba 6a01d34dc3 Instruments Launch Failures
* kill any Instruments processes in a bad state before retrying
2014-01-22 14:44:15 -08:00
bootstraponline 4e48ca24b4 Merge pull request #1797 from imurchie/isaac-docs
Fix Android system setup link
2014-01-22 12:09:07 -08:00
Isaac Murchie 117c3b6e69 Fix Android system setup link 2014-01-22 12:01:58 -08:00
Jonathan Lipps b49ad93c2c add tests for --force-iphone and --force-ipad 2014-01-21 19:22:31 -08:00
Jonathan Lipps 21b7ac9d56 Merge pull request #1788 from jlipps/master
make toggle test ready for appium test
2014-01-21 19:02:19 -08:00
Jonathan Lipps 8ce088c11a make toggle test ready for appium test
- build it in reset.sh
- move test files to an appropriate dir
- add to test.sh
cc @mobiware
2014-01-21 16:31:20 -08:00
Jonathan Lipps da0919c99c Merge pull request #1769 from mobiware/mobile-toggle
Add mobile: methods on Android: toggleData, toggleFlightMode, toggleWiFi...
2014-01-21 15:00:03 -08:00
Romain Criton 1b488f74e0 Add mobile: methods on Android: toggleData, toggleFlightMode, toggleWiFi, toggleLocationServices
Original commit message: didLaunch flag is set at the end of launch sequence

"Ping" ADB to check whether we're still connected

On Android Emulator, ADB is disconnected when we toggle Airplane Mode
or mobile Data. However, the problem does not manifest itself when
querying the list of devices via adb devices: the emulator is still
listed. After attempting to ping the emulator via a shell command, the
emulator is no longer listed and a kill-server is necessary to get ADB
back up and running

Partial recovery from a loss of ADB connection caused by turning off the data connection in the emulator

Conditionnally restart UI Automator in case of unexpected exit, mainly to address the use case of disconnecting the netwok on Android Emulator, which triggers a loss of ADB connection, and subsequently UI Automator connection

New method mobile: toggleData on Android

toggleData method on iOS

toggleFlightMode method

Make toggleData and toggleFlightMode mobile methods available for Selendroid

Fix indentation

Make sure we recover from ADB connection loss on Selendroid when disabling data on emulator

On Android emulator the ADB connection is lost when we disable the data
connection. On Android the ADB connection loss is handled by the UI
Automator exit handler, on Selendroid it must be handled in the toggle
method

Fixed indentation

Fixed ping method

Do not look for exact match in stdout

Reset uiautomatorRestartOnExit flag after we've disabled data connection

Refactor UI Automator exit handler and add a flag to completely ignore UI Automator exit

When we disconnect the network (via either disabling 3G or enabling
Flight Mode), the official Android emulator loses the ADB connection.
However, sometimes the UI Automator exit handler is not called until
the next attempt to send an ADB command. So we introduce a flag to tell
the UI automator exit handler to do nothing, i.e. neither restart UI
Automator nor uninstall the app, we take care of ADB and UI automator
reconnection before sending the next ADB command

Refactor toggleSetting code and handle ADB reconnection

Refactored the toggleSetting code in order to separate the code common
to both Android subplatforms, and code specific to either platforms
(UIAutomator and Selendroid)
Made sure UI Automator restart is handled in the toggleSetting code and
not in the UI Automator exit handler

Selendroid method for handling ADB disconnection in Emulator when turning network connection off

Right keyevent combination to position the focus on Airplane Mode checkbox for API <= 15

On Android 4.1+ (API 16+) there's a "Parent" button in the
AIRPLANE_MODE_SETTINGS Activity's ActionBar, whereas on earlier
versions there's no "Parent" button, so we need to take this into
account when performing the key sequence to position the focus on the
Airplane Mode checkbox

Generic mechanism to let each "toggle" method provide the sequence of key to position the focus

Each "toggle" mobile method may require a different sequence of keys in
order to position the focus within the corresponding Settings Activity.
Now this sequence is dynamically provided by each "toggle" method

mobile: toggleWiFi implementation

Remove blank line

mobile: toggleLocationServices implementation

When toggling LocationServices ON there's a dialog asking for user
confirmation, so we introduce a mechanism that lokks for this dialog
and acknowledge it, but if the dialog doesn't show up we proceed to
exit the settings activity

Adapt key sequence for toggleLocationServices on Android API 16

Fix bug on Kitkat when re-enabling Location Services

On Kitkat when re-entering the Location Services Activity after
disabling it, no UI element has the focus and no key press can let the
target switch grab the focus. The workaround is to make sure an element
has the focus by issuing a key press prior to opening the Location
Services activity.

Fix lint error (mixed tabs and spaces)

Fix lint error (mixed tabs and spaces)

Add comments

Spaces after if

Move variable definition

Shorten variable names

Remove dead code

Move restartAdb method to ADB (and rename to restart)

Rename rr variable to err

Android Test app for "mobile: toggle…" methods

Test script for "mobile: toggle…" methods

Refactoring of toggle test script to avoid code duplication

Adding other toggle methods

Fix lint warning

Handle an unexpected exit of logcat (for instance if ADB itself exits unexpectedly)

Make sure we can restart logcat after stoping it

Stop and restart logcat when restarting ADB

Fix UiAutomator state variable to prevent blocking when restarting UiAutomator

Refactored toggle test to allow testing on both Android and Selendroid

Get rid of the arbitrary timeout to account for ADB disconnection on emulator

When disconnecting the network connection through the "mobile: toggle"
methods, we no longer wait for an arbitrary period of time for the ADB
connection to go down.
Instead, we forcibly shut down ADB and restart it
2014-01-21 22:42:40 +00:00
Jonathan Lipps 0dceea21bb fix bug where --safari wouldn't pre-launch
and add tests
2014-01-21 14:34:38 -08:00
Jonathan Lipps da8d64158c fix node logic error preventing unlock errors from propagating in chrome 2014-01-21 14:18:07 -08:00
Jonathan Lipps 6354b7f700 Merge pull request #1787 from jlipps/master
misc fixes
2014-01-21 13:16:30 -08:00
Jonathan Lipps b4f014ebfe Merge pull request #1784 from thu2004/master
Support mobile method 'launchApp' for selendroid
2014-01-21 12:58:24 -08:00
Jonathan Lipps 0e73a74651 not sure why we were waiting 30 seconds for instruments to terminate
3 seconds should be more than enough
2014-01-21 12:53:14 -08:00
Jonathan Lipps e2f90d4ba2 actually log no colors when we say not to 2014-01-21 12:24:09 -08:00
Jonathan Lipps 113e796b85 changelog and bump to 0.14.2 for publish v0.14.2 2014-01-21 12:00:38 -08:00
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