Commit Graph

2794 Commits

Author SHA1 Message Date
Jonathan Lipps
8e965db971 make sure we don't shut uiautomator down if it's already gone (fix #1402) 2013-10-31 15:15:30 -07:00
Jonathan Lipps
6aa838e474 fix check in reset.sh
cc @snevesbarros
2013-10-31 13:55:37 -07:00
Jonathan Lipps
f0586be805 Merge pull request #1400 from jlipps/master
refactor ios authorize logic and use security db for 10.9
2013-10-31 11:39:09 -07:00
Jonathan Lipps
330a937f0a refactor ios authorize logic and use security db for 10.9 2013-10-31 11:35:18 -07:00
bootstraponline
dd29278b14 Merge pull request #1398 from jlipps/master
use adb api correctly
2013-10-31 11:17:31 -07:00
Jonathan Lipps
1c5663719f use adb api correctly 2013-10-31 11:07:42 -07:00
bootstraponline
52c3185e49 Merge pull request #1396 from twilly86/patch-1
Update running-on-osx.md
2013-10-31 10:55:27 -07:00
twilly86
6a7e0ded3b Update running-on-osx.md
switching path for xcode-select to include Contents/Developer/
2013-10-31 11:45:24 -06:00
Jonathan Lipps
4ee9e6713c Merge pull request #1394 from snevesbarros/safari_launcher_build
Added ability to select code signing identity (and if required profile).
2013-10-31 10:21:16 -07:00
Sergio Neves Barros
010a1df79f Shifting twice when the second argument doesn't start with -- 2013-10-31 17:19:26 +00:00
Jonathan Lipps
539b1fb9aa update selendroid 2013-10-31 10:02:42 -07:00
Sergio Neves Barros
c9e74d6340 Added ability to select code signing identity (and if required profile). 2013-10-31 16:29:52 +00:00
bootstraponline
fa051886d5 Merge pull request #1392 from jlipps/master
don't call start callback in onDie (fix #1391)
2013-10-30 16:56:19 -07:00
Jonathan Lipps
936ae9d8f5 don't call start callback in onDie (fix #1391) 2013-10-30 15:52:48 -07:00
bootstraponline
bd0c1a98ca Merge pull request #1390 from jlipps/master
fix appium device end callback logic (fix #1389)
2013-10-30 10:56:14 -07:00
Jonathan Lipps
d7aebe6d8f fix appium device end callback logic (fix #1389) 2013-10-30 09:27:40 -07:00
Jonathan Lipps
2ed4ce30ec Merge pull request #1387 from jlipps/master
fix tracetemplate detection logic and logging (fix #1386)
2013-10-30 08:17:21 -07:00
Jonathan Lipps
21e97dc959 fix tracetemplate detection logic and logging (fix #1386) 2013-10-30 08:04:12 -07:00
Jonathan Lipps
5b63fadfe8 use javascript rendering for json 2013-10-30 07:48:31 -07:00
Jonathan Lipps
5ff9b2311b update caps and formatting 2013-10-30 07:45:24 -07:00
Jonathan Lipps
d3539fb2f3 add selendroid test writing docs and link to running-tests doc from README 2013-10-30 07:42:34 -07:00
Jonathan Lipps
58c9699137 remove references to appium wiki 2013-10-30 07:30:21 -07:00
Jonathan Lipps
92ef8e370d make sure examples link doesn't point to node examples but to all 2013-10-30 07:28:18 -07:00
Jonathan Lipps
6e2d676ded log if we can't delete a tracedir 2013-10-30 07:14:12 -07:00
Jonathan Lipps
7002f7cd21 refactor ios startup cascade 2013-10-29 18:55:21 -07:00
Jonathan Lipps
a6c07f511a Merge pull request #1339 from snevesbarros/safari_launcher_simulator
Safari launcher integration with simulator and physical devices
2013-10-29 15:52:07 -07:00
Sergio Neves Barros
14748c4e1d Added support for both simulator and physical devices when using safari launcher. It now automatically connects to first web view and leave's web view at the end of the test. 2013-10-29 22:36:56 +00:00
Jonathan Lipps
d31a3729b1 changelog and update reset.sh to fix --real-safari bug v0.11.2 2013-10-29 14:49:14 -07:00
Jonathan Lipps
e802105a7b changelog and bump to 0.11.2 for publish 2013-10-29 14:41:16 -07:00
Jonathan Lipps
f73a030ad9 add logging initialization in bin/appium so npm will work (fix #1381) 2013-10-29 14:40:15 -07:00
Jonathan Lipps
8a1d43497c changelog and bump to 0.11.1 for publish v0.11.1 2013-10-29 12:33:07 -07:00
bootstraponline
4ede40e7f3 Merge pull request #1379 from jlipps/master
fail with an error message if user is on xcode 5.0.1 (address #1377)
2013-10-29 11:48:45 -07:00
Jonathan Lipps
fbf46618ba fail with an error message if user is on xcode 5.0.1 (address #1377) 2013-10-29 11:46:13 -07:00
Jonathan Lipps
4f8c0594c6 Merge pull request #1378 from drpy/master
Fix for #1364 (unable to build unlock_apk on Windows)
2013-10-29 11:07:02 -07:00
drpy
f20aa7fa76 Fix for #1364 2013-10-29 18:54:12 +01:00
Jonathan Lipps
823d4da6a2 fiddle with some timeouts to account for older/slower emulators
and time testruns
2013-10-28 16:58:09 -07:00
Jonathan Lipps
0ce786284c Merge pull request #1375 from jlipps/master
add back launch and some logging options
2013-10-28 16:45:08 -07:00
Jonathan Lipps
3ba0e3f0c6 add --log-timestamp and --log-no-colors options
also clean up and consolidate logging code
2013-10-28 16:36:32 -07:00
Jonathan Lipps
8f2d933985 add back desiredCaps.launch flag 2013-10-28 16:36:32 -07:00
bootstraponline
7efd7cc396 Merge pull request #1374 from jlipps/master
update ios auth logic (fix #1373)
2013-10-28 12:25:59 -07:00
Jonathan Lipps
457ad14192 update ios auth logic (fix #1373) 2013-10-28 12:20:12 -07:00
Jonathan Lipps
b4a9980ff5 Merge pull request #1372 from jlipps/master
Cleanup/refactor of appium/android startup/shutdown
2013-10-28 11:57:52 -07:00
Jonathan Lipps
8770f35afb Merge pull request #1371 from drpy/master
fix for #1040
2013-10-28 11:43:16 -07:00
Jonathan Lipps
9a402b0ea7 when we get an error starting up an android test, make sure we kill uiautomator
so it doesn't complain next time we run a test
2013-10-28 11:39:50 -07:00
Jonathan Lipps
805c55d464 command timeouts should be handled centrally by appium, not by each device 2013-10-28 11:39:50 -07:00
Jonathan Lipps
32d153b6ab finish making shutdown() callback-based 2013-10-28 11:39:50 -07:00
Jonathan Lipps
386de406f3 check in midway through android startup/shutdown refactor 2013-10-28 11:39:50 -07:00
Jonathan Lipps
b537c4ae71 remove confusing multiple session handling code
it doesn't actually do anything and was cruft
also, make session overriding non-default based on the mobile
JSONWP discussions
2013-10-28 11:39:50 -07:00
drpy
2bb66b7f6d fix for #1040 2013-10-28 19:29:43 +01:00
Jonathan Lipps
27e684b6d3 Merge pull request #1370 from bicycleio/master
Missing callback parameter causing Appium to crash
2013-10-28 10:53:45 -07:00