Skip to content

Loading…

window maneuvering magic in safari #297

Merged
merged 1 commit into from

2 participants

@jlipps
Appium member

also, host a basic guinea pig page of our own, we'll want to update this a bunch later.

@admc admc merged commit 5fb3dc5 into appium:master

1 check passed

Details default The Travis build passed
@zijie0 zijie0 referenced this pull request
@zijie0 zijie0 Squashed commit of the following:
commit 01f162ac41e2d1392a7f792b8fca02deb50688bf
Merge: 90f6bd8 19fd8d2
Author: zijie0 <myoilbox@gmail.com>
Date:   Tue Jan 14 16:47:14 2014 +0800

    Merge branch 'master' of https://github.com/zijie0/appium

commit 90f6bd8f5eec707285adde249836d152bf06725b
Merge: d0f23df 87f525d
Author: zijie0 <myoilbox@gmail.com>
Date:   Tue Jan 14 16:46:55 2014 +0800

    Merge branch 'master' of https://github.com/zijie0/appium

commit 19fd8d2548c93625514b006dd4d9363efbb77041
Merge: d0f23df 87f525d
Author: “zijie0export GIT_AUTHOR_EMAIL=“myoilbox@gmail.com <myoilbox@gmail.com>
Date:   Tue Jan 14 16:16:57 2014 +0800

    Merge branch 'master' of https://github.com/zijie0/appium

commit 87f525d6c98aa2ccd0cbfd477345d5e3dace1933
Merge: 1e6d323 843ec13
Author: Zhou <zhouyuan@yzhous-Mac-mini.local>
Date:   Tue Jan 14 15:31:47 2014 +0800

    Merge branch 'master' of https://github.com/zijie0/appium

commit d0f23dfd0e91c922c42dcdf9407b28f5d1bca860
Author: Yuan Zhou <myoilbox@gmail.com>
Date:   Tue Jan 14 15:29:30 2014 +0800

    Squashed commit of the following:

    commit 843ec138522de0701e01cf1219d01e55139ecf5e
    Author: Zhou <zhouyuan@yzhous-Mac-mini.local>
    Date:   Tue Jan 14 15:21:20 2014 +0800

        Fix issue #990: Change mechanic.js back

    commit a9de9d4741b5359ea49b1a6cc21a3fb041553a3c
    Author: Zhou <zhouyuan@yzhous-Mac-mini.local>
    Date:   Tue Jan 14 00:09:44 2014 +0800

        Fix issue #1713: Adding fallback for SIGTERM

    commit dcfed3cc5e0fadfd80a5e2311fa87db337b2c42a
    Author: Zhou <zhouyuan@yzhous-Mac-mini.local>
    Date:   Mon Jan 13 16:24:22 2014 +0800

        Fix issue #990: Change UIAElement map in mechanic.js

    commit 54998e968fe275af526c5494732641c95daf99f9
    Author: Zhou <zhouyuan@yzhous-Mac-mini.local>
    Date:   Mon Jan 13 16:19:04 2014 +0800

        Fix issue #990: Change UIAElement map in mechanic.js

    commit ef774d66f0e90d2c5b1476d59e0c63b9f2c57b56
    Author: Zhou <zhouyuan@yzhous-Mac-mini.local>
    Date:   Mon Jan 13 16:06:55 2014 +0800

        Fix issue #1713: Change killProc signal from SIGKILL to SIGTERM.

commit 1e6d323072a7a182e0eab44bcd04dd0e6b28d075
Author: Zhou <zhouyuan@yzhous-Mac-mini.local>
Date:   Tue Jan 14 15:29:30 2014 +0800

    Squashed commit of the following:

    commit 843ec138522de0701e01cf1219d01e55139ecf5e
    Author: Zhou <zhouyuan@yzhous-Mac-mini.local>
    Date:   Tue Jan 14 15:21:20 2014 +0800

        Fix issue #990: Change mechanic.js back

    commit a9de9d4741b5359ea49b1a6cc21a3fb041553a3c
    Author: Zhou <zhouyuan@yzhous-Mac-mini.local>
    Date:   Tue Jan 14 00:09:44 2014 +0800

        Fix issue #1713: Adding fallback for SIGTERM

    commit dcfed3cc5e0fadfd80a5e2311fa87db337b2c42a
    Author: Zhou <zhouyuan@yzhous-Mac-mini.local>
    Date:   Mon Jan 13 16:24:22 2014 +0800

        Fix issue #990: Change UIAElement map in mechanic.js

    commit 54998e968fe275af526c5494732641c95daf99f9
    Author: Zhou <zhouyuan@yzhous-Mac-mini.local>
    Date:   Mon Jan 13 16:19:04 2014 +0800

        Fix issue #990: Change UIAElement map in mechanic.js

    commit ef774d66f0e90d2c5b1476d59e0c63b9f2c57b56
    Author: Zhou <zhouyuan@yzhous-Mac-mini.local>
    Date:   Mon Jan 13 16:06:55 2014 +0800

        Fix issue #1713: Change killProc signal from SIGKILL to SIGTERM.

commit 843ec138522de0701e01cf1219d01e55139ecf5e
Author: Zhou <zhouyuan@yzhous-Mac-mini.local>
Date:   Tue Jan 14 15:21:20 2014 +0800

    Fix issue #990: Change mechanic.js back

commit a9de9d4741b5359ea49b1a6cc21a3fb041553a3c
Author: Zhou <zhouyuan@yzhous-Mac-mini.local>
Date:   Tue Jan 14 00:09:44 2014 +0800

    Fix issue #1713: Adding fallback for SIGTERM

commit dcfed3cc5e0fadfd80a5e2311fa87db337b2c42a
Author: Zhou <zhouyuan@yzhous-Mac-mini.local>
Date:   Mon Jan 13 16:24:22 2014 +0800

    Fix issue #990: Change UIAElement map in mechanic.js

commit 54998e968fe275af526c5494732641c95daf99f9
Author: Zhou <zhouyuan@yzhous-Mac-mini.local>
Date:   Mon Jan 13 16:19:04 2014 +0800

    Fix issue #990: Change UIAElement map in mechanic.js

commit ef774d66f0e90d2c5b1476d59e0c63b9f2c57b56
Author: Zhou <zhouyuan@yzhous-Mac-mini.local>
Date:   Mon Jan 13 16:06:55 2014 +0800

    Fix issue #1713: Change killProc signal from SIGKILL to SIGTERM.

commit f20db13e5b069e800a1c9700ba8b6bbf32de872e
Merge: 84625b4 9be44a3
Author: bootstraponline <code@bootstraponline.com>
Date:   Sun Jan 12 08:38:14 2014 -0800

    Merge pull request #1729 from Markm21/patch-1

    Support Latest SDK

commit 9be44a36bcb8ee8637b5f27b00a47fd9c2c7d83b
Author: Markyme <mark@soluto.com>
Date:   Sun Jan 12 17:41:03 2014 +0200

    Support Latest SDK

    android-4.4 created by default on latest SDK installation

commit 84625b48ed7c7bdea6c63c3126f39864d8a0c575
Merge: 78bb4e1 456fc65
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Jan 10 14:29:32 2014 -0800

    Merge pull request #1727 from rectalogic/master

    Use correct suffix (.zip or .apk) when downloading app from a url.

commit 456fc65bd2dee78852402ddfe5e0e030bd98504a
Author: Andrew Wason <rectalogic@rectalogic.com>
Date:   Fri Jan 10 17:18:27 2014 -0500

    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

commit 78bb4e14f6506b077cc6ca150b93ee761d2e190b
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Jan 10 11:24:00 2014 -0800

    fix autoAcceptAlerts undefined issue (cc @dandoveralba)

commit 72a50d8d16fbcd33d6cbefce3fdf422de3fa85e7
Merge: 76bba5d ea20c38
Author: bootstraponline <code@bootstraponline.com>
Date:   Fri Jan 10 09:44:46 2014 -0800

    Merge pull request #1726 from jlipps/master

    cleanup app state before a test too (rewrite of #1732)

commit 76bba5db8df16df82e4b8f12267ca286730bdce7
Merge: 44b8ed8 938c686
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Jan 10 09:43:00 2014 -0800

    Merge pull request #1725 from paymand/install_remove_app_ios

    Fix for installing/removing app on device when a .app path is used.

commit 938c686de0de6d81711dc878b827b9c410841aa5
Author: Payman Delshad <paymand@opera.com>
Date:   Fri Jan 10 17:51:54 2014 +0100

    Fix for installing/removing app on device when a .app path is used.

commit ea20c38f7a520de7b977a8b9adbefaa9de9e2f68
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Jan 10 09:08:20 2014 -0800

    cleanup app state before a test too (rewrite of #1732)
    cc @dandoveralba @bootstraponline

commit 44b8ed86e00bfc7142677010ef1f7fcc35bf39d3
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Jan 10 09:00:45 2014 -0800

    actually allow removeApp to work with selendroid (fix #1686 for real)

commit 2fdc5df30dcb8c319e076562787cbdf89f207046
Merge: c1a6fca 64522d7
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Jan 9 23:07:30 2014 -0800

    Merge pull request #1724 from dandoveralba/alerts

    Update Alert Logic

commit 64522d746a25c18b73423416af9c8a433396b9c6
Author: Dan Doveralba <dan.doveralba@lookout.com>
Date:   Thu Jan 9 22:27:08 2014 -0800

    Update Alert Logic

    * by default appium doesn't interact with alerts
    * set autoAcceptAlerts to true to have appium accept alerts

commit c1a6fca60ac4b11b37646212bbca3e8998876006
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Jan 9 09:39:37 2014 -0800

    fix forgotten bind issue

commit 5cb30e39188cb1224ebd5bdd64ad11306b379198
Author: bootstraponline <code@bootstraponline.com>
Date:   Thu Jan 9 12:34:41 2014 -0500

    Update caps.md

commit cba25fa96b9f81268ee552ed4b7962de6a7139d8
Merge: b67440a f920a07
Author: bootstraponline <code@bootstraponline.com>
Date:   Wed Jan 8 11:26:09 2014 -0800

    Merge pull request #1715 from jlipps/master

    show selendroid logs in output

commit f920a07f10f09fea8ed50ceba6da4f19bf1839fc
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Jan 8 10:40:18 2014 -0800

    show selendroid logs in appium output
    by making logcat an eventemitter.
    also update selendroid test app version

commit 878c4b3499eca5838902cfdfe7b9a24cb1e615e7
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Jan 8 10:10:55 2014 -0800

    upgrade selendroid to 0.7.0

commit b67440ad0b8191cc68eb719100e9ad17f7f9529f
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Jan 8 10:02:21 2014 -0800

    if we have trouble proxying, best to actually error to the client

commit 1ab92b206b465a2233fe53328ce186e49e156a7d
Merge: 9872022 71ba778
Author: bootstraponline <code@bootstraponline.com>
Date:   Wed Jan 8 09:58:21 2014 -0800

    Merge pull request #1714 from jlipps/master

    fix selendroid ECONNRESET crashes

commit 71ba778bd43e6d71cfab212275c2fb68e61fb8da
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Jan 8 09:51:57 2014 -0800

    fix selendroid ECONNRESET crashes
    by making sure that activities come prepended with a dot.
    and add a test

commit 98720225e8e0b64e2be226ac09ef76c16b9c81e5
Merge: 26defff c405d1b
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Jan 7 17:46:09 2014 -0800

    Merge pull request #1674 from rockbot/ios-crash

    Checks for crash log information - first attempt (fix #1590)

commit 26defff22f35f5c5bcd758f1bd28cd2ddd5234e7
Merge: 44fc930 e29d20b
Author: bootstraponline <code@bootstraponline.com>
Date:   Tue Jan 7 17:39:01 2014 -0800

    Merge pull request #1711 from jlipps/master

    automatically accept photo permission alerts (fix #1700)

commit e29d20bc0f61d0832c297d68315d61be2f289cdc
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Jan 7 17:09:26 2014 -0800

    make sure we catch photo alert names

commit c405d1b6ebae84bfb812a9734a76ce02d55976b1
Author: rockbot <raquel@saucelabs.com>
Date:   Mon Dec 23 16:10:45 2013 -0800

    completes iOS crash logging (fixes #1590)

commit 377141fe059645509d9672794f2bb6222c097075
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Jan 7 14:58:44 2014 -0800

    update appium doctor to respect new auth db value

commit 9fb163be2e8e358de3164dc08c7fe73a422953a3
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Jan 7 14:40:26 2014 -0800

    automatically accept photo permission alerts (fix #1700)
    and add manualPermissionAlerts desired cap if you want to
    handle things manually

commit 44fc930cb8c3930f21c2bbb5be05298f0c69cdea
Merge: 41ac334 82d49d0
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Jan 7 14:15:05 2014 -0800

    Merge pull request #1710 from penguinho/sim_logs

    Adding flag to show simulator logs on the appium console

commit 82d49d0c7d4b797bb4a6a24d353df9bcc6e9ae9b
Author: Dan Cuellar <penguinho@aol.com>
Date:   Tue Jan 7 13:52:03 2014 -0800

    Adding flag to show simulator logs

commit 41ac334e3e3b3d1b1d44b6812e6815b77ff7439a
Merge: 1de0472 6d41352
Author: bootstraponline <code@bootstraponline.com>
Date:   Tue Jan 7 09:49:38 2014 -0800

    Merge pull request #1709 from jlipps/master

    bring back closeApp for selendroid (fix #1686)

commit 6d41352d9ba49f9f49a3032a5881c49b8e70067c
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Jan 7 09:43:42 2014 -0800

    bring back closeApp for selendroid (fix #1686)

commit 1de047202c4f7e565a1fcec65eaa5fcb39a2bc64
Merge: f7468ba 5981667
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Jan 6 21:47:06 2014 -0800

    Merge pull request #1705 from jlipps/master

    add support for testing stock browser in 4.4

commit 5981667cca8c78e68398ed178fe767e28bfb4e72
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Jan 6 18:18:52 2014 -0800

    add support for doing web testing against android stock browser

commit 38cd2116862af29b389c14df3540cee464cd7ab3
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Jan 6 10:46:05 2014 -0800

    update apidemos

commit f7468ba8cc029e5703c1229c257219da3da13fa9
Merge: da2f585 727e1d0
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Jan 6 11:33:14 2014 -0800

    Merge pull request #1701 from sebv/xcode46_reset

    Avoiding reset.sh crash when using Xcode 4.6

commit 727e1d06868157eca92a3144b09d15ac4ac03dae
Author: sebv <seb.vincent@gmail.com>
Date:   Mon Jan 6 21:34:47 2014 +0800

    making reset.sh xcode 4.6 friendly

commit da2f5857082037bbb1cfa974be60ae3b4521cc6a
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Jan 6 09:25:23 2014 -0800

    fix mechanic link (fix #1699)

commit 9b2f8751983f7d2e31aed8fab4f50bcf82e811d3
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Jan 6 08:59:36 2014 -0800

    update jshint with more style guidelines

commit 228cdbfedf43a106002d8e6373fff685b328705f
Merge: 67ff4b8 63aa6e1
Author: bootstraponline <code@bootstraponline.com>
Date:   Sun Jan 5 12:45:55 2014 -0800

    Merge pull request #1697 from testerhome/master

    add two doc in Chinese and update to the latest

commit 63aa6e1509eebf861991fddbaa7849a3ef1b1711
Author: seveniruby <seveniruby@gmail.com>
Date:   Fri Oct 25 11:35:21 2013 +0800

    add troubleshooting.cn.md
    add real-devices.cn.md
    update the cn doc to the latest
    add saucelabs-repository in pom.xml in testng example

commit 67ff4b8da8a30ee0188fc38d950449a09c91a570
Merge: 0dc74e9 5d88a0e
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Jan 3 11:54:48 2014 -0800

    Merge pull request #1695 from rockbot/bootstrap-error-handling

    Improves error handling in bootstrap's find.java (fixes #1549)

commit 5d88a0eb4866a0cde8e6cbdfdeb01e6089045415
Author: rockbot <raquel@saucelabs.com>
Date:   Fri Jan 3 11:31:51 2014 -0800

    Improves error handling in bootstrap's find.java (fixes #1549)

commit 0dc74e9874cb66b5a836c7519ae3d828f8359b86
Merge: fb10e13 7d4b0e5
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Jan 3 11:33:01 2014 -0800

    Merge pull request #1687 from sebv/chrome_fix

    Modified session creation to cope with non redirect case

commit fb10e134d16de96494e33c6dc2fdf4f791c3cb4f
Merge: 27d4820 fa6ae3b
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Jan 3 09:08:41 2014 -0800

    Merge pull request #1681 from boxiong/master

    Fixed a sporadic DOM corruption issue

commit 27d482074c38c1b0fa2525c0d877776c80aa8251
Merge: 9594e95 f603af0
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Jan 3 01:14:46 2014 -0800

    Merge pull request #1679 from bootstraponline/shell

    Fix appium shell

commit 9594e9555481a4d6b030decca9360e026451e029
Merge: e78ded3 f1f40fd
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Jan 2 18:42:12 2014 -0800

    Merge pull request #1694 from bootstraponline/fix_app_not_responding

    Fix app not responding

commit e78ded368ba5cebfa15ac792e78665b920bb0d2e
Merge: 425782e 50e0e36
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Jan 2 18:21:32 2014 -0800

    Merge pull request #1688 from vkmtse/patch-1

    Update troubleshooting.md

commit 425782e153ee6adfb073e3775e7ac4744479c9ca
Merge: e9cce3f 6129c29
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Jan 2 18:20:16 2014 -0800

    Merge pull request #1689 from sebv/node_examples

    Node example refresh.

commit 6129c29a46228356d50c362a87b3385484d68f32
Author: sebv <seb.vincent@gmail.com>
Date:   Fri Jan 3 02:03:41 2014 +0800

    fixing one liner if

commit b793ce3ce8bcfcf30c425329d952716c784ded28
Author: sebv <seb.vincent@gmail.com>
Date:   Fri Jan 3 02:00:59 2014 +0800

    fixing spaces

commit 7d4b0e5718a0be331040515fce994951fc8253a6
Author: sebv <seb.vincent@gmail.com>
Date:   Fri Jan 3 01:47:50 2014 +0800

    fixing spaces

commit 8cc864e98b6bc59c817cdc5c2b094aff821d2a0f
Author: sebv <seb.vincent@gmail.com>
Date:   Thu Jan 2 13:18:41 2014 +0800

    adding dev packages

commit 50e0e3621a072ff78ce76808d3ea3a435ba5afaf
Author: vkmtse <victortse93@alumni.purdue.edu>
Date:   Wed Jan 1 20:53:23 2014 -0800

    Update troubleshooting.md

commit c765cdf7fb7043324bb9c764935385a983eb5276
Author: sebv <seb.vincent@gmail.com>
Date:   Thu Jan 2 11:41:31 2014 +0800

    Modified session creation to cope with non redirect case

commit 0fc75bdbe6f56ac8c4514a108f53638345408d8c
Author: sebv <seb.vincent@gmail.com>
Date:   Thu Jan 2 11:36:40 2014 +0800

    dev package update

commit bbe86980772e4dbc266a90dd4e901d59d1293b5b
Author: sebv <seb.vincent@gmail.com>
Date:   Thu Jan 2 11:33:04 2014 +0800

    new node examples

commit fa6ae3b3d93a90a2ccef092b7d036ecdecad9148
Author: BX017301 <bo.xiong@cerner.com>
Date:   Sat Dec 28 22:17:08 2013 -0600

    Fixed sporadic DOM corruption issue

commit e9cce3f709e3d27261899bc9ce8621f42233098e
Merge: 0ed0ae7 9a13665
Author: bootstraponline <code@bootstraponline.com>
Date:   Thu Dec 26 18:30:50 2013 -0800

    Merge pull request #1680 from bootstraponline/keystore

    Fix checkApkKeystoreMatch argument order

commit 9a13665ffb8420a5a51bdeeee34c5d30e4b15857
Author: bootstraponline <code@bootstraponline.com>
Date:   Thu Dec 26 21:29:00 2013 -0500

    Fix checkApkKeystoreMatch argument order

commit f603af0684a2e90a5eb9dc64085524f255e483d9
Author: bootstraponline <code@bootstraponline.com>
Date:   Thu Dec 26 21:01:38 2013 -0500

    Fix appium shell

    node appium.js --shell

commit f1f40fd66a74f67050809e551c6e949cff7be8b0
Author: bootstraponline <code@bootstraponline.com>
Date:   Thu Dec 26 14:00:06 2013 -0500

    Fix app not responding

commit 0ed0ae7c34715c2cb60f79e2e48c51bb5af015cd
Merge: 957e39c 79fb97b
Author: Raquel Vélez <raquel.velez@gmail.com>
Date:   Mon Dec 23 10:38:16 2013 -0800

    Merge pull request #1670 from rockbot/master

    first attempt at fixing appium avd startup bug

commit 79fb97ba608b1e9d12140624e4df079d55b63c6e
Author: rockbot <raquel@saucelabs.com>
Date:   Mon Dec 23 10:03:42 2013 -0800

    first attempt at fixing appium avd startup bug

commit 957e39c79e8b86322e05778852873e1e9340960a
Merge: 2df0775 158a4ba
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Dec 20 15:03:45 2013 -0800

    Merge pull request #1664 from rockbot/master

    requires users to specify their device in their desired capabilities (fix #1656)

commit 158a4ba2d28f47050fee9eaa3b112958e6964398
Author: rockbot <raquel@saucelabs.com>
Date:   Fri Dec 20 14:29:05 2013 -0800

    requires users to specify their device in their desired capabilities

commit 2df07751084e35bfd5b7ce94fe5bb5afe9922a98
Merge: 13dac43 50cd798
Author: bootstraponline <code@bootstraponline.com>
Date:   Fri Dec 20 12:57:56 2013 -0800

    Merge pull request #1663 from Jonahss/patch-1

    Readme typo

commit 50cd798174413601bd8a6ed676e6c97d9a2eb14a
Author: Jonah <jonahss@gmail.com>
Date:   Fri Dec 20 12:48:40 2013 -0800

    Readme typo

commit 13dac43000feda7701b2b424e118aac168cbef7f
Merge: 93f6306 31bd697
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Dec 20 11:20:06 2013 -0800

    Merge pull request #1662 from jlipps/master

    add ability to set launch timeout from the command line so it can be use...

commit 31bd697cf406ed027796ab2b316d87a85133c975
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Dec 20 10:57:42 2013 -0800

    add ability to set launch timeout from the command line so it can be used in conjunction with pre-launch

commit 93f6306159a3bd8c90dc60ab32b992098dc7a5f3
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 19 17:03:18 2013 -0800

    getiOSSDKVersion only returns major version, but we need minor versions for clearing out safari. use glob instead

commit 20c368f2963c73eb20cc3bca1585346c31fec387
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 19 16:18:24 2013 -0800

    changelog and bump to 0.13.0 for publish

commit 4d159743e667a7a4d9b39a685b6b5a1b45e8789c
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 19 16:17:37 2013 -0800

    make sure that if we delete a built-in app, we look in /tmp to try and launch it if it ends up being not put back yet

commit 20e1580362584525a0fad522f8399c61a6d1723c
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 19 15:53:22 2013 -0800

    adb shell doesn't return exit codes so we need to specifically look for this failure

commit 42bd48bc36c0e77717827abadedd8a4ec16da42f
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 19 15:43:48 2013 -0800

    actually, selendroid does need to support a few mobile methods as it turns out! cc @rockbot

commit 1cddb162215ce31f6d6b81f206fdcfffad5c83a7
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 19 15:28:14 2013 -0800

    update selendroid

commit 5d7f71d4c81f48c383ec98ccfa603d2345243695
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 19 15:20:20 2013 -0800

    make sure origAppPath doesn't hang around between sessions

commit 9741c332d7dee17f25423b45ebe076a22c2f86a1
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 19 14:28:30 2013 -0800

    show a warning in reset.sh if you're not on ios7

commit 84549edbe0bc67c89e97b58953aa39aa17ff1b6a
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 19 14:12:50 2013 -0800

    update i-w-d (fix #1640)

commit e08970b75d480ce975d6cfc8b36ca2851462d020
Merge: 5b4d41a 413a9be
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 19 13:36:21 2013 -0800

    Merge pull request #1657 from jlipps/safari7

    Safari on iOS 7

commit 413a9bee384dacddbe341e6f8190f17bccf69415
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 19 11:27:09 2013 -0800

    make sure that gappium tests are run for both ios and android

commit a0c997a907f24be00bc6cafd58887e04b94252e0
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 19 11:22:07 2013 -0800

    have safari tests automatically use current sdk

commit cd6f1b2a2ef808762ddaa8edce641d0a285990bf
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 19 11:19:34 2013 -0800

    wait a bit after a non-synthetic click since it takes longer than javascript

commit 2622b2589b97a399dff039dbb123234ae9fc65bd
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 19 11:18:49 2013 -0800

    if instruments chooses not to die, leave it in its grave and find another one

commit 049f9a631da421e47f454d535faa516d95a97952
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 19 10:21:41 2013 -0800

    update mobile safari behavior to work better with ios7

commit 5b4d41ac243079ab67470c74922413ab2301d166
Merge: ca96a52 eaaea6e
Author: bootstraponline <code@bootstraponline.com>
Date:   Wed Dec 18 19:14:30 2013 -0800

    Merge pull request #1653 from elgalu/patch-2

    Markdown-related improvements to README.md ruby examples

commit eaaea6e2aabfc18a989fbebd0e2fe05e4edc1b50
Author: Leo Gallucci <elgalu3@gmail.com>
Date:   Thu Dec 19 01:09:10 2013 -0200

    Markdown-related improvements to README.md ruby examples

commit ca96a526ce698fce1bff148ce79a9cd7a19600dc
Author: bootstraponline <code@bootstraponline.com>
Date:   Wed Dec 18 21:44:20 2013 -0500

    Fix spacing

commit 85fb14bfece57e3e5396322307ac5aadb7337737
Merge: 0e397b4 005f9ac
Author: bootstraponline <code@bootstraponline.com>
Date:   Wed Dec 18 18:42:34 2013 -0800

    Merge pull request #1651 from rockbot/master

    changes md5 module for more efficient md5hashing

commit 0e397b4cf3ed34acad376fcaecbb2f6dea9e1820
Merge: eefb31e 2932f01
Author: bootstraponline <code@bootstraponline.com>
Date:   Wed Dec 18 18:42:11 2013 -0800

    Merge pull request #1652 from elgalu/patch-1

    Small typo 'sessoin' for 'session'

commit 2932f010959853ca8fc1ed1518cf5da25d494303
Author: Leo Gallucci <elgalu3@gmail.com>
Date:   Thu Dec 19 00:38:20 2013 -0200

    Small typo 'sessoin' for 'session'

commit 005f9ac1ac756a0c59450c16761bd1c5de1cb78c
Author: rockbot <raquel@saucelabs.com>
Date:   Wed Dec 18 17:12:31 2013 -0800

    changes md5 module for more efficient md5hashing

commit e8a685da602a1e1910884058b0d4036506872d6d
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 18 17:09:42 2013 -0800

    allow safari on ipad to launch correctly as well

commit 06e711237a91550f1027be7ebbf1abdb886573da
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 18 16:56:02 2013 -0800

    support automation of safari on ios7

commit 038561117d645faccc4a672c9c6614df1b0fd209
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 18 16:55:36 2013 -0800

    allow setting ios sdk version in tests with IOS_VERSION env var

commit 321b161124997c5b4d3b335c7dc8c538150d60f8
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 18 16:52:36 2013 -0800

    allow built-in apps to be automated by temporarily moving them

commit eefb31edfc248fce91d8b1607cf34223ae21f5cc
Merge: c9b6f55 f23748c
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 18 15:56:27 2013 -0800

    Merge pull request #1634 from grz0/master

    Catch SyntaxError exception and log nice error message

commit c9b6f5573948deeae0aedc734b21e56c6577cf18
Merge: a68c928 91caf79
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 18 15:56:02 2013 -0800

    Merge pull request #1645 from rockbot/master

    politely informs user that mobile commands don't work in selenium

commit a68c9282cf65ebf6be197545594e9f85cc4b26fb
Merge: 9afbf03 a48247a
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 18 15:51:51 2013 -0800

    Merge pull request #1650 from jlipps/instruments-rearch

    Instruments rearch

commit f23748c29d00607ed6563998201f474aa35b8fda
Author: grz0 <grzegorz.halat@gmail.com>
Date:   Tue Dec 17 18:33:05 2013 +0100

    Catch SyntaxError exception and log nice error message

commit a4f82c31cd207be718ef11a23f8dc8f37f1b68c2
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 18 14:03:30 2013 -0800

    remove safari launcher as strategy for safari + sim

commit a48247a9104b7442f5ae08f5be30eb43b63a69be
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 18 13:49:10 2013 -0800

    clean up instruments pathfinding

commit 8bc99f2bb45244ce3fdb63f0be38cf9cff04c551
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 18 13:33:55 2013 -0800

    remove retry support from appium test code
    since it is now handled in appium itself

commit 4a1cc2580c26d14d1ca609bdf49d778f805fba52
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 18 13:29:02 2013 -0800

    refactor instruments and add appium-internal flake support
    This commit constitutes a pretty big refactor of the instruments
    process handler. It also introduces a server flag, '--backend-retries',
    with a default of '3', which specifies how many times Appium will retry
    launching instruments before giving up and saying that it crashed or
    timed out. This works in concert with launchTimeout, of course.

    I think this refactor also fixes some longstanding callback reasoning
    errors and maybe some other bugs.

    It might also introduce some bugs of its own though :-)

commit 91caf798f70b774163fc90dd9c7c65e72418ce22
Author: rockbot <raquel@saucelabs.com>
Date:   Tue Dec 17 17:42:22 2013 -0800

    politely informs user that mobile commands don't work in selenium

    adds extra test to ensure it's the mobile: error message that's getting sent

commit 9afbf03875ca25c56d2aa17411ff6227c9d5b08c
Merge: 5f1a7a1 88d8033
Author: bootstraponline <code@bootstraponline.com>
Date:   Tue Dec 17 15:39:54 2013 -0800

    Merge pull request #1643 from bootstraponline/master

    Fix cleanupAppState logging messages

commit 5f1a7a11852051200ef591c509f8260eeb926a51
Merge: e28b3c2 686a16a
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 17 15:37:29 2013 -0800

    Merge pull request #1626 from rockbot/master

    adds check for API level; stops test if device is 'android' but API < 17

commit 686a16ae839702b97673177fa4177b4c6f3acab2
Author: rockbot <raquel@saucelabs.com>
Date:   Mon Dec 16 18:01:35 2013 -0800

    adds check for API level; stops test if device is 'android' but API < 17

    separates checkApiLevel functionality and cleans up little bits

    cleans up the last bits

commit 88d80339fa428ffd547a3fb59904f082e24f8d75
Author: bootstraponline <code@bootstraponline.com>
Date:   Tue Dec 17 17:52:03 2013 -0500

    Update iOS mobile reset

commit e28b3c271872aa84460f8982190e9bc489d68322
Merge: a3f7e80 0b80544
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 17 15:16:39 2013 -0800

    Merge pull request #1636 from jlipps/master

    fix #1631

commit 0b80544c3663cc4f3d287852cff915150fab3519
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 17 12:46:47 2013 -0800

    add tests for apk downloading, delete old tests (fix #1631)

commit 7b15d05abaa7c04a738c722ae12bba1def96eafe
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 17 12:30:38 2013 -0800

    remove unused testfiles

commit a3f7e8086e8f1aee40e6161b865e63707b0b0265
Merge: 91a3c9e 24e899b
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 17 12:04:18 2013 -0800

    Merge pull request #1632 from jlipps/master

    misc fixes

commit 24e899bdca26215409024b53d10596f55bcbda02
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 17 11:10:42 2013 -0800

    make sure show-config works with npm (fix #1630)

commit 9fe8358cb4d88c5c7297b7e8b5f2bc0db5fdbafa
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Dec 16 11:35:52 2013 -0800

    don't reset build/ if we're not using --hardcore, and some other fixes

commit 91a3c9eff77f1fc83d437d9c86bdbfc807eff1b1
Merge: 7f488eb 7403a54
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Dec 16 16:45:52 2013 -0800

    Merge pull request #1625 from filmaj/new-build-tools

    add 19.0.0 build tools search path for figuring out where aapt is

commit 7403a54939ff3aaa82745e6f46a72feb23dcff75
Author: filmaj <maj.fil@gmail.com>
Date:   Mon Dec 16 16:36:00 2013 -0800

    add 19.0.0 build tools search path for figuring out where aapt is. helps w/ support for new android sdks.

commit 7f488eb92dcab1d662a8a9dd4f0ffe516a2ff0fa
Merge: f62bf64 bb725eb
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sun Dec 15 17:09:00 2013 -0800

    Merge pull request #1619 from penguinho/sim-wait

    Adding wait for simulator to launch by waiting for log to populate

commit bb725eb436f1e051383c088b184dcbf3e7152bff
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sun Dec 15 15:05:19 2013 -0800

    Fix #1442

commit 7dd6f09310a319b8de027be4470168b8e2d6a59d
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sun Dec 15 08:36:26 2013 -0800

    Adding automatic detection of the last used simulator version

commit bd0c9c16689f9829ad12ce33a48acba4a991af72
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sat Dec 14 18:46:25 2013 -0800

    Adding code to kill zombie deamon launchers

commit f62bf64aa973b23f1a577b4d668ee6bb65b88979
Merge: 1aabd1f e272906
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sat Dec 14 18:00:26 2013 -0800

    Merge pull request #1620 from penguinho/doctor

    Doctor Improvements

commit e3f449c6e5437fdcc4c73d7f6328de8dad7febaa
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sat Dec 14 13:57:23 2013 -0800

    start-up sequence will now wait for at least one line in the simulator log before proceeding

    had to fix the log capture code to make this work

commit e272906144a79007ee648db8d71a2d30ab8f14ae
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sat Dec 14 15:21:31 2013 -0800

    Fixing Issue Where Linux tried to run iOS Checks and where sometimes checks did not run

commit 8f7ee335906ae5f233b3b04989ff1e4e3001d365
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sat Dec 14 14:58:45 2013 -0800

    Fixing the authorization db check to work for Mountain Lion

commit 1aabd1f0ee7c898aa1cbc103b87cafa0fd2d8212
Merge: 2414e72 d3fc47f
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Sat Dec 14 09:09:08 2013 -0800

    Merge pull request #1617 from DylanLacey/master

    Update Sauce examples with reporting, cleaner layout

commit d3fc47fa43a3726aabcbf22306fcbe7255acd2c7
Author: Dylan Lacey <github@dylanlacey.com>
Date:   Fri Dec 13 22:50:57 2013 -0800

    Make ruby sauce examples follow the same structure.

    Make Android and Ruby examples have helper code at the bottom, similar
    method names

commit 6e416550db5e4cb0ae934af368cf196a6edd5a99
Author: Dylan Lacey <github@dylanlacey.com>
Date:   Fri Dec 13 22:34:34 2013 -0800

    Make Ruby Sauce example report success, and actually work

commit 64bf117a5592cb68f945cc699687a37c46a08ed1
Author: Dylan Lacey <github@dylanlacey.com>
Date:   Fri Dec 13 22:07:49 2013 -0800

    Add result reporting to Ruby Android Sauce example

commit 2414e72fa4a2cdc567985ccef0bfeecdd6f11272
Merge: 2756536 0862d12
Author: bootstraponline <code@bootstraponline.com>
Date:   Fri Dec 13 18:44:52 2013 -0800

    Merge pull request #1615 from jlipps/master

    wait a bit for webviews to show up and fix safari callback issue

commit 0862d1292713e2d6d80b5e3258b28eb3e7285ede
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Dec 13 16:02:21 2013 -0800

    wait a bit for webviews to show up and fix safari callback issue

commit 27565366161c9f4ca48f042d16d782dfd9f6238f
Merge: 4172d71 48e2302
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Dec 13 14:39:31 2013 -0800

    Merge pull request #1614 from dandoveralba/set-locale

    setLocale should not run for real devices

commit 48e2302663f4c158f3409c878d8312d180c4d6c3
Author: Dan Doveralba <dan.doveralba@lookout.com>
Date:   Fri Dec 13 11:56:18 2013 -0800

    setLocale should not run for real devices

    * add a check if the udid is null to determine if setLocale should run
    * log message if we do/don't setLocale

    ISSUE: 1611

commit 4172d71d5bbb46127e0db87eaf81b68dd9b7795b
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 12 11:12:10 2013 -0800

    fix authorize-ios (fix #1499)

commit 12d8e1a05aa18ae7d1e146c3dfb1bf53d6b6304e
Merge: 58b5827 1d34f84
Author: bootstraponline <code@bootstraponline.com>
Date:   Wed Dec 11 11:27:01 2013 -0800

    Merge pull request #1607 from jlipps/master

    remove dependency on grep for android device (fix #1540)

commit 1d34f84593691ac6091d3db8e7d068581e2b6faf
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 11 10:50:46 2013 -0800

    remove dependency on grep for android device (fix #1540)

commit 58b5827950eff56971db92655f18d213558943f7
Merge: c8abd03 9e881f1
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 11 09:49:46 2013 -0800

    Merge pull request #1606 from Nefry/patch-1

    Update ios-webkit-debug-proxy instalation first step command

commit 9e881f1ed3f0a19f1e0f882a94fe8bd1d4731a8c
Author: Maryana Bezler <marianna.bezler@gmail.com>
Date:   Wed Dec 11 20:37:01 2013 +0300

    Update ios-webkit-debug-proxy instalation first step command

commit c8abd030c0cedcc387532f2aa986fd956e46eb4f
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 10 14:42:29 2013 -0800

    changelog and bump to 0.12.3 for publish

commit ed3c4906bd8c688dedcfd4d149dc9e3cf95974ac
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 10 13:40:11 2013 -0800

    update selendroid to 0.7.0

commit ecdd05532325991ce268d80c6adf16b62bba05fe
Merge: 4e3caf7 1ebc3dd
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 10 14:29:18 2013 -0800

    Merge pull request #1603 from jlipps/master

    refactor server/main and fix force-kill instruments issues

commit 1ebc3dd655ce3672a0887135fb3cab653bc9f7e5
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 10 13:36:43 2013 -0800

    make sure we don't start FQInstruments on non-mac or mac < 10.9 (fix #1585)

commit abe22334b1dcd94dfcebc28482b1fd76a7c7cb2f
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 10 13:25:58 2013 -0800

    refactor server/main
    and add --merciful flag to avoid the force quit instruments watcher

commit 4e3caf7043533c9bea2d923807dde5e4b00b4368
Merge: e145065 5181bb9
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 10 12:30:18 2013 -0800

    Merge pull request #1602 from bootstraponline/master

    Pipe force quit logs to console

commit e1450652615c3e504b9a87050bfbe6c9240bc24a
Merge: d7985cb 7b770c8
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 10 12:28:24 2013 -0800

    Merge pull request #1601 from jlipps/master

    add lots more tests for command timeout

commit 5181bb90ddfeef04d0026316731f48ae4a57889a
Author: bootstraponline <code@bootstraponline.com>
Date:   Tue Dec 10 15:12:10 2013 -0500

    Pipe force quit logs to console

    info: [ForceQuitUnresponsiveApps] 2013-12-10 15:11:16.424 ForceQuitUnresponsiveApps[56799:507] Force quit unresponsive instruments v0.0.1
    info: [ForceQuitUnresponsiveApps] 2013-12-10 15:11:42.708 ForceQuitUnresponsiveApps[56799:507] Force quitting: 'freeze2' at 'file:///Users/user/ForceQuitUnresponsiveApps/freeze2/./bin/freeze2.app/Contents/MacOS/instruments'

commit 7b770c8411502e6fcf7c22efa719bf9f324e196f
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 10 11:46:07 2013 -0800

    add lots more tests for command timeout
    testing setting via desired caps as well
    also, make it so passing in 'false' also disables timeout

commit d7985cbc3c5537acb7a10a952a453f9949d44e40
Merge: 501ffa6 d0a1968
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 10 11:24:32 2013 -0800

    Merge pull request #1598 from haveahennessy/disable-timeout

    Setting newCommandTimeout capability to 0 disables timeout.

commit d0a1968fd039243086fcff98535715b146f9df1b
Author: Matt Isaacs <misaacs@gilt.com>
Date:   Tue Dec 10 12:30:53 2013 -0500

    Setting newCommandTimeout capability to 0 disables timeout.

commit 501ffa677cc6b8deda2bfae41536b917cf6411c9
Merge: 6db7212 a732b46
Author: bootstraponline <code@bootstraponline.com>
Date:   Tue Dec 10 06:27:02 2013 -0800

    Merge pull request #1596 from mobiware/master

    Fix for #1595

commit a732b467fa2b63c9d69ee76516ca85e67f02a65d
Author: Romain Criton <romain.criton@gmail.com>
Date:   Tue Dec 10 11:03:23 2013 +0100

    Add class name as a valid strategy for non-Web platforms

commit 6db7212e9601e89cb408ef65944f6674e31556d1
Merge: 73c36f4 ac5da51
Author: bootstraponline <code@bootstraponline.com>
Date:   Mon Dec 9 18:02:42 2013 -0800

    Merge pull request #1594 from jlipps/master

    we don't write to authfile anymore, so get rid of that code

commit ac5da51b59a389d0a53b02c092538b9aeda2794a
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Dec 9 15:26:58 2013 -0800

    we don't write to authfile anymore, so get rid of that code
    and give users the ability to give total and insecure access to taskport

commit 73c36f4786d4e773b917539fc9d942a8af7af232
Merge: 4409efb 1891769
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Dec 9 15:28:21 2013 -0800

    Merge pull request #1593 from jlipps/master

    update sauce android example to not be dependent on driverblock

commit 18917698a46b9db6e506adc60978c7ee203d0697
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Dec 9 15:12:41 2013 -0800

    update sauce android example to not be dependent on driverblock

commit 4409efb42229990f3ee3e67e8949b82e04047345
Merge: 0edd3a6 6319f73
Author: Dan Cuellar <penguinho@aol.com>
Date:   Mon Dec 9 14:48:23 2013 -0800

    Merge pull request #1592 from jlipps/master

    allow user to let instruments launch device with --default-device

commit 6319f734b88ed2d8c15f60e829b47025fd212525
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Dec 9 14:44:23 2013 -0800

    allow user to let instruments launch device with --default-device

commit 0edd3a629d0bdc3d7ab43d348f493cd67daef611
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Dec 9 14:39:46 2013 -0800

    make sure --show-config doesn't crash main server :-)

commit 89031857891688afbe468fd7ada160f6df87c5d7
Merge: 3e39227 52bb752
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Dec 9 14:26:02 2013 -0800

    Merge pull request #1591 from jlipps/master

    add --show-config flag to show appium config, and include server build t...

commit 52bb75277356d7be19aa3c77e4083246031dc0ad
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Dec 9 14:13:42 2013 -0800

    add --show-config flag to show appium config, and include server build time

commit 3e3922701545520063fab3eeae2c03a9c2977a0b
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Dec 6 11:15:30 2013 -0800

    xcode 5.0.2 is out

commit 1a8f8fd8c8fab8f52093011b90b8b6c55e0477b9
Merge: 78fe223 9e2a4d7
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Dec 6 10:50:39 2013 -0800

    Merge pull request #1584 from bootstraponline/master

    Fix #1583

commit 9e2a4d77ace6d3c65a6d6f254d1f0e5448ea4077
Author: bootstraponline <code@bootstraponline.com>
Date:   Fri Dec 6 13:46:30 2013 -0500

    Fix #1583

commit 78fe22384dc913c1b646ffee07c541612bb5504f
Merge: 76ceb5a d687a31
Author: bootstraponline <code@bootstraponline.com>
Date:   Thu Dec 5 18:58:37 2013 -0800

    Merge pull request #1582 from jlipps/master

    retina shouldn't be default for ios 6

commit d687a316dd629cc1a0aae991d6fe73132807cd9f
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 5 16:44:33 2013 -0800

    retina shouldn't be default for ios 6

commit 76ceb5afdf15a6f64513c3889fdfae9512ad35b7
Merge: ec68643 b3e34ab
Author: bootstraponline <code@bootstraponline.com>
Date:   Thu Dec 5 15:51:41 2013 -0800

    Merge pull request #1581 from jlipps/master

    make sure to reset command timeout during mobile: reset (fix #1579)

commit b3e34ab4b06c2141bcaf398ce82c590ceafc34a2
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 5 14:57:57 2013 -0800

    make sure to reset command timeout during mobile: reset (fix #1579)

commit ec68643ebb6639423a0b97e66fd779c07f25c9fb
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Dec 5 09:57:11 2013 -0800

    don't try to outsmart npm, I guess. 0.12.2

commit d87d86687e7ece4c31ad1b443127eccf44a16d98
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 4 19:58:38 2013 -0800

    try to republish for npm

commit 0ab38e38912b886447b641134aadef1cc195f7a4
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 4 13:58:39 2013 -0800

    changelog and bump to 0.12.1 for publish

commit 232c46f7b9c30dc24518586fc786d6a54d1b4690
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 4 13:56:46 2013 -0800

    make spinTitle a bit more lenient webview tests

commit 1167713037fa644c44ee44e1e9aeeaaad6b4681f
Merge: 17d88ee 99f0c16
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 4 13:05:56 2013 -0800

    Merge pull request #1576 from jlipps/master

    fix loc strat failure cases

commit 99f0c16d9ae88862feb5e2f02d36b3b73dd24d11
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 4 12:24:31 2013 -0800

    make sure we don't discount web locators in webviews

commit 17d88ee6da4daf2af48d35ae7c2b6b33976356a5
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 4 11:42:45 2013 -0800

    remove duplicate test and fix isScreenLocked test

commit 526dde3850df0b0e8f69ae4ea87cfd97670e313d
Merge: 481103c b41fbed
Author: bootstraponline <code@bootstraponline.com>
Date:   Wed Dec 4 11:06:17 2013 -0800

    Merge pull request #1575 from bootstraponline/master

    Fix scheme error by updating ForceQuitUnresponsiveApps

commit b41fbedb93f3cd650f55cb7b7737da8978d87965
Author: bootstraponline <code@bootstraponline.com>
Date:   Wed Dec 4 14:05:28 2013 -0500

    Fix scheme error by updating ForceQuitUnresponsiveApps

commit 481103ca45612949f58e9bdfb8aa94b5187be14d
Merge: 1181cba 5b79c64
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Dec 4 10:13:19 2013 -0800

    Merge pull request #1573 from jlipps/master

    misc fixes

commit 5b79c647ea18df3333138883b0f858b59c9a5697
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 3 17:06:09 2013 -0800

    make sure we extract the right file from the zip (fix #1557)

commit f4477adfd13b39ef10ce780687c2ad96e6514601
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 3 16:47:47 2013 -0800

    fail sooner if user passes in a bad locator strategy (fix #1539)

commit 1181cbaa49713ca5ccaf025b78495d7cd747498b
Merge: 160e22c eaa6cb3
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Dec 3 11:16:56 2013 -0800

    Merge pull request #1565 from bootstraponline/fix_unresponsive_instruments

    Recover from unresponsive instruments process

commit eaa6cb3d185b341aa6baba1b5f62b116e6536ddb
Author: bootstraponline <code@bootstraponline.com>
Date:   Tue Dec 3 14:07:38 2013 -0500

    Recover from unresponsive instruments process

    Register for kCGSNotificationAppUnresponsive and if the process is Instruments then terminate it.
    This enables Appium to continue even when instruments is unresponsive. The current behavior is to wait forever.

    To test this feature works properly, run ./instruments.sh from https://github.com/appium/ForceQuitUnresponsiveApps

    instruments.sh will launch a process that's unresponsive and appium will force quit the process. The unresponsive process can be visually confirmed by using OS X Activity Monitor.

commit 160e22c748e8ea665179a97276c3e800161d15ab
Merge: e07651d 75d3192
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Dec 2 11:06:37 2013 -0800

    Merge pull request #1562 from penguinho/doctor

    Adding More Doctor Checks for Android and Dev

commit 75d31929c6df04d481989f0ac4cb24ebc9985995
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sun Dec 1 12:48:13 2013 -0800

    Adding Dev Checks

commit 4147158291692bc31c5f1f0be73f047f5092cff8
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sun Dec 1 12:29:23 2013 -0800

    Adding more android checks, adding optional cb to log.pass and log.fail

commit 269bfaf4c43cdedb57752de4bd1a31bbe12ba91a
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sun Dec 1 09:03:48 2013 -0800

    Adding doctor check for node binary path

commit e07651d9e0df80a666fb1e59c3f84f822693bada
Merge: 34375d5 2e1733a
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sat Nov 30 20:43:35 2013 -0800

    Merge pull request #1560 from penguinho/doctor

    Adding checks to see if authorize iOS needs to be run

commit 2e1733a654e23f2d6e13ca7389a8d85e5bc15128
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sat Nov 30 19:33:29 2013 -0800

    Adding checks to see if authorize iOS needs to be run

commit 34375d525ab84235a5edf84f262147d1adee007d
Merge: 95e7008 98667ea
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sat Nov 30 18:12:31 2013 -0800

    Merge pull request #1559 from penguinho/doctor-gui

    Adding the ability to run appium-doctor via the app using socket.io

commit 98667ea8f0b6b043138b540fae97999cc4f7b4d6
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sat Nov 30 18:11:56 2013 -0800

    Adding the ability to run appium-doctor via the app using socket.io

commit 95e70081bec29f3e5250cec4cd40b53ac3f3d03e
Merge: 828409c 27ddd0b
Author: Dan Cuellar <penguinho@aol.com>
Date:   Wed Nov 27 16:07:06 2013 -0800

    Merge pull request #1550 from Astro03/master

    Update appium doctor for OS 10.8

commit 27ddd0bd54f12a7c68e883035ea8fcbb2544bc14
Author: Astro03 <locopelon03@hotmail.com>
Date:   Wed Nov 27 16:03:38 2013 -0800

    Update appium doctor for OS 10.8

commit 828409c31ee312572b8df03a4c3596bd46ddd5ac
Merge: d877639 d7a39ad
Author: bootstraponline <code@bootstraponline.com>
Date:   Wed Nov 27 06:48:55 2013 -0800

    Merge pull request #1547 from fbai/patch-1

    Update adb.js: fix typo error

commit d877639ba542b261d18a8ce080233d976176c1dc
Merge: 6eeea18 1428a81
Author: bootstraponline <code@bootstraponline.com>
Date:   Wed Nov 27 06:47:32 2013 -0800

    Merge pull request #1546 from jlipps/master

    go ahead and kill sims before launching a new one

commit d7a39ad2bc1fb2f1c62138998b4a44202de35391
Author: Fan Bai <fbai@microstrategy.com>
Date:   Wed Nov 27 18:46:12 2013 +0800

    Update adb.js: fix typo error

    line 511

    this.getDeviceWithRetry(120000, cb);
    changed to
    this.getDevicesWithRetry(120000, cb);

commit 1428a818846e306eb871a764fab2e01bad9eaa0a
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Nov 26 18:15:49 2013 -0800

    go ahead and kill sims before launching a new one

commit 6eeea18fcbd10bf9a38c7ee7ce3b75f935835780
Merge: fd4cfea 3822519
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Nov 26 17:52:00 2013 -0800

    Merge pull request #1545 from jlipps/iwebview-https

    allow iwebview to access https sites with self-signed certs

commit fd4cfea48c05913fd79d5f4c80f6102b90753a43
Merge: 81f3cd2 3bc4cd5
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Nov 26 17:51:28 2013 -0800

    Merge pull request #1530 from penguinho/doctor

    Appium Doctor Start

commit 3822519efb664c828acc8c36339f7e62c2166af0
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Nov 26 17:07:22 2013 -0800

    allow iwebview to access https sites with self-signed certs

commit 3bc4cd577992aba7a5d57424b7d0df302304bea3
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sun Nov 24 11:07:25 2013 -0800

    Appium Doctor Start

    This is a basic vesion of Appium Doctor that checks for Xcode, Xcode
    Command Line Tools, JAVA_HOME, and ANDROID_HOME

commit 81f3cd235b967baa7d20f879a2c9af9dde992e1b
Merge: 6e07808 9f4272c
Author: Dan Cuellar <penguinho@aol.com>
Date:   Tue Nov 26 13:51:02 2013 -0800

    Merge pull request #1544 from curtissiemens/master

    Fixing iosDeviceString for iPad 64-bit case (missing parentheses).

commit 9f4272c62a0aaa2ac8466f19b382cd84cf43fde7
Author: Curtis Siemens <curtissiemens@gmail.com>
Date:   Tue Nov 26 13:44:08 2013 -0800

    Fixing iosDeviceString for iPad 64-bit case (missing parentheses).

commit 6e07808890a9802d89069e277cffea1156aef362
Merge: 5afe69b e43c1c7
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Nov 26 13:09:54 2013 -0800

    Merge pull request #1543 from penguinho/locale_fix

    Fixing get iOS SDK version for Xcode 4

commit e43c1c7861d64f7f866acc1de648a21a28d633c3
Author: Dan Cuellar <penguinho@aol.com>
Date:   Tue Nov 26 12:32:05 2013 -0800

    Fixing get iOS SDK version for Xcode 4

commit 5afe69b1dd515f2cf89286534de061b6c617822d
Merge: 6b5ef95 7d4dbda
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Nov 26 11:51:48 2013 -0800

    Merge pull request #1542 from jlipps/master

    misc fixes

commit 7d4dbda6a209b57f2d2d6c03e059809c775e55c9
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Nov 26 11:34:04 2013 -0800

    fix at least one case of ios sims not being killed
    cc @penguinho

commit a9da500c260fcc8c372525ae22bbf48658400659
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Nov 26 11:31:40 2013 -0800

    fail with a nice error message if xcrun can't find instruments (fix #1538)

commit 6b5ef9590840f6d53aff954f1ef5736a55acc1cd
Merge: 9edc467 6f62a6e
Author: bootstraponline <code@bootstraponline.com>
Date:   Mon Nov 25 13:21:52 2013 -0800

    Merge pull request #1537 from curtissiemens/master

    Fix 4-inch 64-bit device string building (was missing dash in 64 inch).

commit 6f62a6e9b2bde301ad11a59faa97cea357aa7b90
Author: Curtis Siemens <curtissiemens@gmail.com>
Date:   Mon Nov 25 13:19:56 2013 -0800

    Fix 4-inch 64-bit device string building (was missing dash in 64 inch).

commit 9edc4679fe0e004180ee8b84153ed17f1f805c4a
Author: Dan Cuellar <penguinho@aol.com>
Date:   Mon Nov 25 09:12:00 2013 -0800

    Making default iOS version a string in the capabilities object

commit 088fd18d9bcd63a6d071c842bdf254d62312a333
Merge: 340c451 1129ba8
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Nov 25 08:56:49 2013 -0800

    Merge pull request #1527 from penguinho/ios_version

    Returning iOS Version number in capabilities

commit 340c4515f483e1244bcd969dbd37af8f3488fc92
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Nov 25 08:45:04 2013 -0800

    fix changelog

commit 1129ba84095b8fd6ace21400f811d5b4bf2d7d32
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sat Nov 23 14:08:17 2013 -0800

    Returning iOS Version number in capabilities

    Fixes #1332

commit 60ea4c39521afed7e2cbeca6deb829ab25257f48
Merge: a9d2180 67a172b
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sat Nov 23 13:25:29 2013 -0800

    Merge pull request #1504 from penguinho/locale_fix

    Fix Locale Settings for iOS > 7.0.0

commit 67a172ba8d507d3ace78a53ce1f579c1793e70fa
Author: Dan Cuellar <penguinho@aol.com>
Date:   Tue Nov 19 09:10:11 2013 -0800

    Fix Locale Settings for iOS > 7.0.0

commit a9d21807874190ae6d19f8251375cfe4da7b2ae5
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 21 17:25:34 2013 -0800

    changelog and bump to 0.12.0 for publish

commit a88313aa315e61c0b48034898a6ff914d4d64c91
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 21 17:24:26 2013 -0800

    fix screen unlocking test

commit 0556a73b05ad7081129ecd6b292b693b738df401
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 21 17:22:38 2013 -0800

    fix orientation test

commit 41e9a6ed2e4413cdeed9995e6006ed49f4926f35
Merge: a1305c7 1bfa59f
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 21 17:12:27 2013 -0800

    Merge pull request #1524 from bootstraponline/master

    Fix onAlert

commit 1bfa59f11f86f212b49fb71a41cd3e9c6e59aab3
Author: bootstraponline <code@bootstraponline.com>
Date:   Thu Nov 21 20:03:49 2013 -0500

    Fix onAlert

commit a1305c7d352704b4b993dbd7ead7736b5342b783
Merge: 84eff8b 4a322ba
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 21 14:27:40 2013 -0800

    Merge pull request #1522 from jlipps/master

    ensure ios flicks don't return control too soon (fix#742)

commit 4a322ba347dbbd3b0fc405a94f1d30b02dfec12e
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 21 14:18:31 2013 -0800

    ensure ios flicks don't return control too soon (fix#742)

commit 84eff8b2abed252adac5241764c3204e3491fca2
Merge: fbf7fd3 0dd0b95
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 21 13:47:11 2013 -0800

    Merge pull request #1521 from jlipps/master

    keep track of 'dumpsys window' logs for research (fix #1401)

commit 0dd0b95d1c953b1a94c48e2c0c9409c8e26aa5e0
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 21 13:44:42 2013 -0800

    keep track of 'dumpsys window' logs for research (fix #1401)

commit fbf7fd3d492f079e23025f2cb06cfbe5afe82036
Merge: 580cc2f e207483
Author: bootstraponline <code@bootstraponline.com>
Date:   Thu Nov 21 13:35:29 2013 -0800

    Merge pull request #1520 from jlipps/master

    allow alternative type of clear through fastClear: false cap

commit e207483a255c29016b4c6240ec2dce42bf7be7d1
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 21 13:11:33 2013 -0800

    allow alternative type of clear through fastClear: false cap
    fix #1514

commit 580cc2fc241dc9dbf2bff1cc7fac8e85e82d836e
Merge: 96caa1c 0f4ea56
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 21 11:49:31 2013 -0800

    Merge pull request #1519 from jlipps/master

    kill uiautomator before running test (fix #1517)

commit 0f4ea5609abf93c9e88be38d7b56f46cdba8d4ef
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 21 11:05:52 2013 -0800

    kill uiautomator before running test (fix #1517)

commit 96caa1c4babc98dbaaf300fae72bdc720c747af9
Merge: 5504041 bd9639f
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 21 10:24:32 2013 -0800

    Merge pull request #1518 from jlipps/master

    enable setLocation on selendroid (fix #1511)

commit bd9639fa09e4a2fc97c9f6aea1af75a3ec1aa039
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 21 10:16:58 2013 -0800

    enable setLocation on selendroid (fix #1511)

commit 55040418b632a9f991a771af003d576944d48d4a
Merge: b20ae3f 1a4e8bb
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Nov 20 14:27:39 2013 -0800

    Merge pull request #1515 from prolificcoder/master

    fixing 1483

commit 1a4e8bbfc82bde3422d79214e09da4a79eaa6648
Author: Satyajit Malugu <satya@malugu.com>
Date:   Wed Nov 20 14:03:46 2013 -0800

    fixing 1483

commit b20ae3f29e86d307fc1471ee811372a5357e41e5
Merge: c7e8e20 efe804b
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Nov 20 10:51:17 2013 -0800

    Merge pull request #1513 from jlipps/master

    ideviceinstaller tweaks

commit efe804bafadb02fd7b66667b26ae42e31e830d57
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Nov 20 10:14:09 2013 -0800

    try built-in ideviceinstaller if we don't have one

commit 9bea66b71429ed93f2599ffe5da962ff5484fc51
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Wed Nov 20 10:00:28 2013 -0800

    fail better when ideviceinstaller is not present

commit c7e8e20b3189b803d12043cfaeea468a79f9dd0a
Merge: 8c9a1b2 72232e9
Author: bootstraponline <code@bootstraponline.com>
Date:   Tue Nov 19 15:54:45 2013 -0800

    Merge pull request #1509 from jlipps/master

    misc updates

commit 72232e9638ee025c9ca4db736d17eb2d13273f9c
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Nov 19 15:09:31 2013 -0800

    make sure we have some time to get logs

commit dc2fb9dfdc01ab44878867d09d7e6e917c8096a5
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Nov 19 15:06:19 2013 -0800

    accept pop-up windows by default

commit fc89e7f92d6922abb0a8f14b8f81336740fd0fef
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Nov 19 13:53:13 2013 -0800

    update dependencies

commit 8c9a1b2ed5e3909b517d8c2da5fac5321ff655d8
Merge: 5cee259 a96de44
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Nov 19 13:54:28 2013 -0800

    Merge pull request #1508 from bootstraponline/master

    Update style guide with undefined note

commit a96de44228a2bbe2e3aae122356cc747d76706f1
Author: bootstraponline <code@bootstraponline.com>
Date:   Tue Nov 19 16:51:05 2013 -0500

    Update style guide with undefined note

commit 5cee259000f48c1f80f39a850db78a7e2d439827
Merge: 692a262 ef3d1c8
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Nov 19 12:55:28 2013 -0800

    Merge pull request #1507 from jlipps/master

    add pass/fail status reporting to sauce node examples

commit ef3d1c80ac058ce75a57eeed9545b59de489ea3b
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Tue Nov 19 12:15:28 2013 -0800

    fix weird javascript error

commit 5f1713d57ba552872a05a1259835c01f0354435e
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Nov 18 16:02:57 2013 -0800

    add pass/fail status reporting to sauce node examples

commit 692a262e8ef548fce06c30696158bace4f95c9a5
Merge: a103227 94f4e3e
Author: Dan Cuellar <penguinho@aol.com>
Date:   Tue Nov 19 08:37:44 2013 -0800

    Merge pull request #1486 from penguinho/device

    Select your iOS Simulator Device

commit a10322756637bbfc568f5dcd50a2fd000f93cf60
Merge: 5fdec3f 2a88f14
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Nov 18 17:36:37 2013 -0800

    Merge pull request #1495 from bootstraponline/fix_null_crash

    Avoid crashing when device is null

commit 2a88f14b440f99af13d6e2085b37a390737cc83c
Author: bootstraponline <code@bootstraponline.com>
Date:   Mon Nov 18 19:36:47 2013 -0500

    Check for start err

commit 5fdec3f92ba8b27a58a125030cda8c6248f7104d
Merge: e0a874e 16c45f4
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Nov 18 15:00:26 2013 -0800

    Merge pull request #1497 from jlipps/master

    misc fixes

commit 94f4e3eb69a1f7b10948e8e59462e355d180e393
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sat Nov 16 13:00:07 2013 -0800

    select your iOS Simulator Device

commit e0a874e29594acc6c92aca057e059f6dad6cdec7
Merge: c1611ac 2fe7ea7
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Nov 18 14:15:17 2013 -0800

    Merge pull request #1498 from rossrowe/master

    Updated Sauce Java samples to use Sauce Java helper libraries, which sets the pass/fail status after the test has been run

commit 2fe7ea7b098ba2145e3c7b4cc31276a3e26921ec
Author: Ross Rowe <piaross@gmail.com>
Date:   Tue Nov 19 07:15:34 2013 +1100

    Updated Sauce Java samples to use Sauce Java helper libraries, which sets the pass/fail status after the test has been run

commit 16c45f446d57494f82a86b94272471164bf93120
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Nov 18 10:10:08 2013 -0800

    allow periods in xpath nodes (fix #881)

commit 674d199af2f77668734903734548f56e6bb5773e
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Nov 18 09:54:34 2013 -0800

    actually have this test prove that the session ended

commit c1611ace1ec5afeb99d1acfae6e8d978c2db8e82
Merge: d6bca76 5472fa6
Author: bootstraponline <code@bootstraponline.com>
Date:   Mon Nov 18 10:28:11 2013 -0800

    Merge pull request #1494 from testerhome/master

    add chinese docs and a ruby xunit testcase sample for android

commit d6bca766f78458d771b49aa595a38e46d961dae2
Merge: 6d3d1ac b21416d
Author: bootstraponline <code@bootstraponline.com>
Date:   Mon Nov 18 10:20:23 2013 -0800

    Merge pull request #1496 from jlipps/master

    force-stop app before starting it (fix #1142)

commit b21416de6e0a3cc6599381be40cb5e3aca74d4d3
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Nov 18 09:36:37 2013 -0800

    force-stop app before starting it (fix #1142)

commit 6d3d1ac512245c4ac62e4461374c67121d7f6b9d
Merge: 0880d54 f3ae7d5
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Mon Nov 18 09:09:08 2013 -0800

    Merge pull request #1482 from jlipps/webviewapp

    Promote WebViewApp to first-class mobile web testing platform

commit 5472fa6ace842e42f69dd23fbaea9d887298e2a3
Author: unknown <seveniruby@gmail.com>
Date:   Mon Nov 18 11:41:44 2013 +0800

    add chinese docs and a ruby xunit testcase sample for android

commit 0880d547e5a90146de0584f60a8901f394b60a02
Merge: ddd9b9e 2484cfa
Author: bootstraponline <code@bootstraponline.com>
Date:   Sun Nov 17 18:26:23 2013 -0800

    Merge pull request #1493 from penguinho/fix_udidetect

    Fixing automatic udid detection

commit 2484cfa179d08bc82f34f2894c7bcda553e037e9
Author: Dan Cuellar <penguinho@aol.com>
Date:   Sun Nov 17 17:27:19 2013 -0800

    Fixing automatic udid detection

    Fix #1399

commit ddd9b9eb5bc9a929f1627cbe5b0833d48dbcacdb
Merge: 6eb2710 f5015eb
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Nov 15 16:51:24 2013 -0800

    Merge pull request #1477 from curtissiemens/master

    Adding the ability to get node path out of .appiumconfig (for users who ...

commit f5015ebaa9f4a6beada6aedd1438557c3619f43d
Author: Curtis Siemens <curtissiemens@gmail.com>
Date:   Fri Nov 15 16:37:36 2013 -0800

    Code style tweak to .appiumconfig file load/parse.

commit c9df85cdda8f91f94466028a3d931bbf476ac393
Author: Curtis Siemens <curtissiemens@gmail.com>
Date:   Fri Nov 15 14:48:33 2013 -0800

    Improved getting .appiumconfig path location & now use JSON to parse .appiumconfig data.

commit f3ae7d5e6b9e17c33c3966cf4bf571707f7556fe
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Nov 15 12:23:06 2013 -0800

    make sure to run iwebview tests in ios7 testsuite

commit 8f16e64c1b4ed337c9f5107f4f7d3317ae016205
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Nov 15 12:22:47 2013 -0800

    new webviewapp works for both ios6.1 and ios7.0

commit 99098b09c49032fb340c9593277e9bca219681e2
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Nov 15 11:49:18 2013 -0800

    relax size/width requirements for testing purposes

commit eae9aca3b3d8c5d8335242f3cc734a79f994d693
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Nov 15 11:41:46 2013 -0800

    add iwebview test, right now just a clone of safari tests

commit a6c4c61c26d568fade028e4b8adc248acd159181
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Nov 15 11:39:07 2013 -0800

    allow 'iwebview' desired cap for running web tests in webviewapp instead of safari

commit c106c17c7fddfcd6249245f262d90990232d5d7e
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Nov 15 11:12:30 2013 -0800

    promote WebViewApp to build/ since it will be used for web tests in ios7

commit d84e8b92c2203116be0f2ece34040a54ab5c048e
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Nov 15 10:59:27 2013 -0800

    update webviewapp in assets since it will only build for 7.0 from now on

commit c3e7c1d03b56576e2f3e9e010ed8c0d4181178c3
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Nov 15 10:56:16 2013 -0800

    update webviewapp for ios7, all orientations, and loading notification

commit ccbc8a371ec75c9f22954984f531cf9ec1e68571
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Fri Nov 15 10:54:46 2013 -0800

    move autwebview-related methods to safari.js

commit f0721cf2b5c46768ec20b44acb4fd330556b2872
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 14 18:03:04 2013 -0800

    make safari its own device module

commit 45f47c66107b0e77254d124232ea867daab71ee6
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 14 18:02:13 2013 -0800

    update unit test to reflect new mock ios

commit 165014c7ba355ef006f2cf3eb9d3456358037e18
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 14 18:00:18 2013 -0800

    object orientify these methods

commit 92b6e54928e0321fc0f16886226bd963cf6d0da7
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 14 10:59:48 2013 -0800

    run webview tests on webviewapp now

commit 3d58646824043a91f8b40a29c4012d59dbbf224c
Author: Curtis Siemens <curtissiemens@gmail.com>
Date:   Thu Nov 14 17:37:00 2013 -0800

    Adding the ability to get node path out of .appiumconfig (for users who modify .appiumconfig)

commit 6eb271015bf820988440dc1b1ff586d9ad7e3d17
Merge: 338c546 2ddb764
Author: Jonathan Lipps <jlipps@gmail.com>
Date:   Thu Nov 14 14:20:48 2013 -0800

    Merge pull request #1472 from snevesbarros/close_tab_solution

    Added ability to close tabs in safari when using safariLauncher

commit 2ddb764bfaccacb0a3fa24ec018424dc5a2c6ab4
Author: Sergio Neves Barros <s.nevesbarros@googlemail.com>
Date:   Thu Nov 14 11:19:14 2013 +0000

    Updated close window to work on physical devices as well and when using safari launcher we connect to latest window as …
012c968
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 21, 2013
  1. @jlipps
This page is out of date. Refresh to see the latest.
Showing with 304 additions and 51 deletions.
  1. +11 −0 app/controller.js
  2. +27 −14 app/hybrid/ios/remote-debugger.js
  3. +83 −17 app/ios.js
  4. +1 −0 app/routing.js
  5. +131 −0 app/test/guinea-pig.html
  6. +22 −1 test/functional/safari/safari.js
  7. +29 −19 test/helpers/webview.js
View
11 app/controller.js
@@ -4,6 +4,8 @@
var status = require('./uiauto/lib/status')
, logger = require('../logger.js').get('appium')
, _s = require("underscore.string")
+ , fs = require('fs')
+ , path = require('path')
, _ = require('underscore');
function getResponseHandler(req, res) {
@@ -629,3 +631,12 @@ exports.produceError = function(req, res) {
exports.crash = function() {
throw new Error("We just tried to crash Appium!");
};
+
+exports.guineaPig = function(req, res) {
+ var file = path.resolve(__dirname, "test/guinea-pig.html");
+ fs.readFile(file, function(err, data) {
+ if (err) return res.send(500);
+ res.set('Content-Type', 'text/html');
+ res.send(data);
+ });
+};
View
41 app/hybrid/ios/remote-debugger.js
@@ -43,6 +43,7 @@ var RemoteDebugger = function(onDisconnect) {
this.curMsgId = 0;
this.dataCbs = [];
this.onAppDisconnect = onDisconnect || noop;
+ this.pageChangeCb = noop;
this.specialCbs = {
'_rpc_reportIdentifier:': noop
, '_rpc_forwardGetListing:': noop
@@ -58,8 +59,9 @@ var RemoteDebugger = function(onDisconnect) {
// API
// ====================================
-RemoteDebugger.prototype.connect = function(cb) {
+RemoteDebugger.prototype.connect = function(cb, pageChangeCb) {
var me = this;
+ this.pageChangeCb = pageChangeCb;
this.socket = new net.Socket({type: 'tcp6'});
this.socket.on('close', function() {
logger.info('Debugger socket disconnected');
@@ -99,17 +101,21 @@ RemoteDebugger.prototype.selectApp = function(appIdKey, cb) {
this.appIdKey = appIdKey;
var connectToApp = messages.connectToApp(this.connId, this.appIdKey);
logger.info("Selecting app");
- this.send(connectToApp, function(pageDict) {
- var newPageArray = [];
- _.each(pageDict, function(dict) {
- newPageArray.push({
- id: dict.WIRPageIdentifierKey
- , title: dict.WIRTitleKey
- , url: dict.WIRURLKey
- });
+ this.send(connectToApp, _.bind(function(pageDict) {
+ cb(this.pageArrayFromDict(pageDict));
+ }, this));
+};
+
+RemoteDebugger.prototype.pageArrayFromDict = function(pageDict) {
+ var newPageArray = [];
+ _.each(pageDict, function(dict) {
+ newPageArray.push({
+ id: dict.WIRPageIdentifierKey
+ , title: dict.WIRTitleKey
+ , url: dict.WIRURLKey
});
- cb(newPageArray);
});
+ return newPageArray;
};
RemoteDebugger.prototype.selectPage = function(pageIdKey, cb) {
@@ -127,12 +133,17 @@ RemoteDebugger.prototype.selectPage = function(pageIdKey, cb) {
if (err || res.result.value == 'loading') {
me.pageUnload();
}
+ me.specialCbs['_rpc_forwardGetListing:'] = _.bind(me.onPageChange, me);
cb();
}, 0);
});
});
};
+RemoteDebugger.prototype.onPageChange = function(pageDict) {
+ this.pageChangeCb(this.pageArrayFromDict(pageDict));
+};
+
RemoteDebugger.prototype.executeAtom = function(atom, args, cb) {
var atomSrc = atoms.get(atom);
args = _.map(args, JSON.stringify);
@@ -198,9 +209,9 @@ RemoteDebugger.prototype.pageLoad = function() {
};
RemoteDebugger.prototype.pageUnload = function() {
- logger.debug("Page loading");
- this.pageLoading = true;
- this.waitForDom(noop);
+ logger.debug("Page loading");
+ this.pageLoading = true;
+ this.waitForDom(noop);
};
RemoteDebugger.prototype.waitForDom = function(cb) {
@@ -229,7 +240,9 @@ RemoteDebugger.prototype.handleMessage = function(plist) {
RemoteDebugger.prototype.handleSpecialMessage = function(specialCb) {
var fn = this.specialCbs[specialCb];
if (fn) {
- this.specialCbs[specialCb] = null;
+ if (specialCb != "_rpc_forwardGetListing:") {
+ this.specialCbs[specialCb] = null;
+ }
fn.apply(this, _.rest(arguments));
}
};
View
100 app/ios.js
@@ -259,10 +259,6 @@ IOS.prototype.cleanupAppState = function(cb) {
IOS.prototype.listWebFrames = function(cb, exitCb) {
var me = this;
- if (this.remote) {
- logger.error("Can't enter a web frame when we're already in one!");
- throw new Error("Tried to enter a web frame when we were in one");
- }
if (!this.bundleId) {
logger.error("Can't enter web frame without a bundle ID");
throw new Error("Tried to enter web frame without a bundle ID");
@@ -281,11 +277,36 @@ IOS.prototype.listWebFrames = function(cb, exitCb) {
} else {
me.remote.selectApp(me.bundleId, cb);
}
- }, function() {
- logger.error("Remote debugger crashed before we shut it down!");
- me.stopRemote();
- exitCb();
+ }, _.bind(me.onPageChange, me));
+};
+
+IOS.prototype.onPageChange = function(pageArray) {
+ logger.info("Remote debugger notified us of a new page listing");
+ var newIds = []
+ , me = this;
+ _.each(pageArray, function(page) {
+ newIds.push(page.id.toString());
+ });
+ var newPages = [];
+ _.each(newIds, function(id) {
+ if (!_.contains(me.windowHandleCache, id)) {
+ newPages.push(id);
+ }
});
+ if (this.curWindowHandle === null) {
+ logger.info("We don't appear to have window set yet, ignoring");
+ } else if (newPages.length) {
+ logger.info("We have new pages, going to select page " + newPages[0]);
+ this.remote.selectPage(newPages[0], function() {
+ me.curWindowHandle = newPages[0];
+ });
+ } else if (!_.contains(me.windowHandleCache, me.curWindowHandle.toString())) {
+ logger.error("New page listing from remote debugger doesn't contain " +
+ "current window, not sure how to proceed");
+ } else {
+ logger.info("New page listing is same as old, doing nothing");
+ }
+ this.windowHandleCache = newIds;
};
IOS.prototype.getAtomsElement = function(wdId) {
@@ -507,8 +528,11 @@ IOS.prototype.findAndAct = function(strategy, selector, index, action, actionPar
// if you change these, also change in
// app/uiauto/appium/app.js:elemForAction
, supportedActions = ["tap", "isEnabled", "isValid", "isVisible",
- "value", "name", "label", "setValue"]
+ "value", "name", "label", "setValue", "click",
+ "selectPage"]
, many = index > 0;
+
+ if (action === "click") { action = "tap"; }
var doAction = function(findCb) {
var cmd = ["au.elemForAction(au.getElement", (many ? 's': ''), "By",
stratMap[strategy], "('", selector, "'), ", index].join('');
@@ -593,7 +617,6 @@ IOS.prototype.click = function(elementId, cb) {
};
IOS.prototype.clickCurrent = function(button, cb) {
- //console.log("clicking current loc");
var noMoveToErr = {
status: status.codes.UnknownError.code
, value: "Cannot call click() before calling moveTo() to set coords"
@@ -613,7 +636,6 @@ IOS.prototype.clickCurrent = function(button, cb) {
};
IOS.prototype.clickCoords = function(coords, cb) {
- //console.log("native-tapping coords");
var opts = coords;
opts.tapCount = 1;
opts.duration = 0.3;
@@ -1122,18 +1144,62 @@ IOS.prototype.setWindow = function(name, cb) {
var me = this;
if (_.contains(this.windowHandleCache, name)) {
var pageIdKey = parseInt(name, 10);
- me.remote.selectPage(pageIdKey, function() {
- me.curWindowHandle = pageIdKey;
- cb(null, {
- status: status.codes.Success.code
- , value: ''
+ var next = function() {
+ me.remote.selectPage(pageIdKey, function() {
+ me.curWindowHandle = pageIdKey;
+ cb(null, {
+ status: status.codes.Success.code
+ , value: ''
+ });
});
- });
+ };
+ //if (me.autoWebview) {
+ //me.setSafariWindow(pageIdKey - 1, function(err, res) {
+ //if (err) {
+ //cb(err);
+ //} else if (res.status !== status.codes.Success.code) {
+ //cb(res.status);
+ //} else {
+ //next();
+ //}
+ //});
+ //} else {
+ next();
+ //}
} else {
cb(status.codes.NoSuchWindow.code, null);
}
};
+IOS.prototype.setSafariWindow = function(windowId, cb) {
+ var me = this;
+ var success = function(err, res, cb) {
+ if (err || res.status !== status.codes.Success.code) {
+ cb(err, res);
+ return false;
+ }
+ return true;
+ };
+
+ me.findAndAct('name', 'Pages', 0, 'value', [], function(err, res) {
+ if (success(err, res, cb)) {
+ if (res.value === "") {
+ cb(err, res);
+ } else {
+ me.findAndAct('name', 'Pages', 0, 'tap', [], function(err, res) {
+ if (success(err, res, cb)) {
+ me.findAndAct('tag name', 'pageIndicator', 0, 'selectPage', [windowId], function(err, res) {
+ if (success(err, res, cb)) {
+ me.findAndAct('name', 'Done', 0, 'tap', [], cb);
+ }
+ });
+ }
+ });
+ }
+ }
+ });
+};
+
IOS.prototype.clearWebView = function(cb) {
if (this.curWindowHandle === null) {
cb(new NotImplementedError(), null);
View
1 app/routing.js
@@ -68,6 +68,7 @@ module.exports = function(appium) {
// these are for testing purposes only
rest.post('/wd/hub/produce_error', controller.produceError);
rest.post('/wd/hub/crash', controller.crash);
+ rest.get('/guinea-pig', controller.guineaPig);
// appium-specific extensions to JSONWP
// these aren't part of JSONWP but we want them or something like them to be
View
131 app/test/guinea-pig.html
@@ -0,0 +1,131 @@
+
+<!DOCTYPE html>
+<html>
+<head>
+ <title>I am a page title - Sauce Labs</title>
+ <link href="/css/themes/cupertino/jquery-ui-1.8.5.custom.css" media="screen" rel="stylesheet" type="text/css" />
+ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
+ <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"></script>
+</head>
+<body>
+
+<h1>This page is a Selenium sandbox</h1>
+
+I am some page content
+<div id="i_am_an_id" class="i_am_a_class">I am a div</div>
+<a href="/test-guinea-pig2.html" id="i am a link">i am a link</a><br/>
+<a href="http://google.com" id="googlelink" target="_blank">i am a google link</a>
+ <div>i appear 3 times</div>
+ <div>i appear 3 times</div>
+ <div>i appear 3 times</div>
+<div id="invisible div" style="display:none;">i am invisible</div>
+<form id="the_forms_id">
+<p>
+<input id="i_am_a_textbox" name="i_am_a_textbox" type="text" value="i has no focus" />
+</p>
+<input type="checkbox" id="unchecked_checkbox" name="unchecked_checkbox"/>
+<input type="checkbox" id="checked_checkbox" name="checked_checkbox" checked="checked"/>
+
+</form>
+<span id="your_comments">
+Your comments: None<br/>
+</span>
+ñ☃
+<script type="text/javascript">
+ $(document).ready(function(){
+ $("#i_am_a_textbox").focus(function(){$(this).val("");})
+ .blur(function(){$(this).val("i has no focus");});
+ });
+</script>
+
+ <div class="border">
+
+ <script type="text/javascript">
+ var resetFeedback = function() {
+ $(".jumpOkButton").css("display", "none")
+ $("form#jumpContact").css("display", "block");
+ $(".formMessage").css("display", "none");
+ $("#comments").attr("value", "");
+ $("#email").attr("value", "");
+ $("#email").trigger("focus");
+ };
+
+ var setupJumpFeedback = function() {
+ $("#jumpContact input[type=submit]").button();
+ var submitFunc = function() {
+ var form = $(this);
+ var data = form.serialize();
+ $("#comments").trigger("focus");
+
+ var successFunc = function(response) {
+ if (response == "Message sent") {
+ $(".formMessage")
+ .text("Thanks for your feedback, we'll get back to you soon if needed.")
+ .slideDown("normal");
+
+ form.slideUp("normal");
+ }
+ else {
+ $(".formMessage")
+ .text("Oops! Looks like something went wrong, please try again.")
+ .slideDown("normal");
+
+ $("input[type=submit]", form).slideDown();
+ }
+
+ $(".jumpOkButton").css("display", "block");
+ };
+
+ var errorFunc = function() {
+ $(".formMessage")
+ .text("Oops! Looks like something went wrong, please try again.")
+ .slideDown("normal");
+
+ $("input[type=submit]", form).slideDown();
+ };
+
+ $.ajax({
+ type: "POST",
+ url: "/jumpstart-send",
+ data: data,
+ success: successFunc,
+ error: errorFunc
+ });
+
+ return false;
+ };
+
+ $("form#jumpContact").submit(submitFunc);
+ };
+ </script>
+
+ <form id="jumpContact" method="post">
+ <p>
+ <label for="fbemail">Email:</label><br>
+ <input id="fbemail" type="text" size="50" name="fbemail" placeholder="We would really like to follow up!"></input>
+ </p>
+ <p>
+ <label for="comments">Comments:</label><br>
+ <textarea id="comments" style="width:400px;height:100px" name="comments" placeholder="Thanks in advance, this is really helpful."></textarea>
+ </p>
+ <div style="float:right">
+ <input class="jumpButton" type="submit" name="submit" id="submit" value="send" />
+ </div>
+ </form>
+ <div class="formMessage"></div><br><br>
+ <center>
+ <input style="display:none" class="jumpOkButton" type="button" value="OK" onclick="resetFeedback();"/>
+ </center>
+
+ </div>
+
+ <p>Server time: <span id="servertime">1363807183</span></p>
+ <p>Client time: <span id="clienttime"></span></p>
+ <script type="text/javascript">
+ $("#clienttime").text(parseInt(new Date().getTime() / 1000))
+ </script>
+
+ <p id="useragent">Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22</p>
+
+</body>
+</html>
View
23 test/functional/safari/safari.js
@@ -2,7 +2,11 @@
"use strict";
var describeWd = require("../../helpers/driverblock.js").describeForSafari()
- , webviewTests = require("../../helpers/webview.js").buildTests
+ , wvHelpers = require("../../helpers/webview.js")
+ , webviewTests = wvHelpers.buildTests
+ , loadWebView = wvHelpers.loadWebView
+ , spinTitle = wvHelpers.spinTitle
+ , _ = require('underscore')
, should = require('should');
describeWd('safari init', function(h) {
@@ -39,4 +43,21 @@ describeWd('safari ipad', function(h) {
});
}, null, null, {device: 'iPad Simulator'});
+_.each(["iPhone", "iPad"], function(sim) {
+ describeWd('windows and frames', function(h) {
+ it("should automate a new window if one opens (" + sim + ")", function(done) {
+ loadWebView("safari", h.driver, function() {
+ h.driver.elementById('googlelink', function(err, link) {
+ link.click(function() {
+ spinTitle("Google", h.driver, function(err) {
+ should.not.exist(err);
+ done();
+ });
+ });
+ });
+ }, "http://localhost:4723/guinea-pig");
+ });
+ }, null, null, {device: sim + " Simulator"});
+});
+
webviewTests('safari');
View
48 test/helpers/webview.js
@@ -7,7 +7,7 @@ var driverBlock = require("./driverblock.js")
, should = require('should')
, spinWait = require('./spin.js').spinWait;
-var spinTitle = function (expTitle, driver, cb, timeout) {
+module.exports.spinTitle = function (expTitle, driver, cb, timeout) {
timeout = typeof timeout == 'undefined' ? 60 : timeout;
timeout.should.be.above(0);
driver.title(function(err, pageTitle) {
@@ -16,12 +16,35 @@ var spinTitle = function (expTitle, driver, cb, timeout) {
cb();
} else {
setTimeout(function () {
- spinTitle(expTitle, driver, cb, timeout - 1);
+ module.exports.spinTitle(expTitle, driver, cb, timeout - 1);
}, 500);
}
});
};
+module.exports.loadWebView = function(webviewType, driver, cb, guineaOverride) {
+ var title = 'I am a page title - Sauce Labs';
+ if (typeof guineaOverride === "undefined") {
+ guineaOverride = guinea;
+ }
+ if (webviewType === "safari") {
+ driver.get(guineaOverride, function(err) {
+ should.not.exist(err);
+ module.exports.spinTitle(title, driver, cb);
+ });
+ } else {
+ driver.windowHandles(function(err, handles) {
+ should.not.exist(err);
+ handles.length.should.be.above(0);
+ driver.window(handles[0], function(err) {
+ should.not.exist(err);
+ module.exports.spinTitle(title, driver, cb);
+ });
+ });
+ }
+};
+
+
module.exports.buildTests = function(webviewType) {
if (typeof webviewType === "undefined") {
webviewType = "WebViewApp";
@@ -33,25 +56,12 @@ module.exports.buildTests = function(webviewType) {
desc = driverBlock.describeForApp(webviewType);
}
- var loadWebView = function(driver, cb) {
- var title = 'I am a page title - Sauce Labs';
- if (webviewType === "safari") {
- driver.get(guinea, function(err) {
- should.not.exist(err);
- spinTitle(title, driver, cb);
- });
- } else {
- driver.windowHandles(function(err, handles) {
- should.not.exist(err);
- handles.length.should.be.above(0);
- driver.window(handles[0], function(err) {
- should.not.exist(err);
- spinTitle(title, driver, cb);
- });
- });
- }
+ var loadWebView = function(driver, cb, guineaOverride) {
+ return module.exports.loadWebView(webviewType, driver, cb, guineaOverride);
};
+ var spinTitle = module.exports.spinTitle;
+
desc('window title', function(h) {
it('should return a valid title on web view', function(done) {
Something went wrong with that request. Please try again.