Commit Graph
12167 Commits
Author SHA1 Message Date
Jonathan Lipps e7a72e5921 add --command-timeout server arg
so the server can set its own default timeout.
also, clean up some of the command timeout logic
2014-03-07 13:57:41 -08:00
Jonathan Lipps a06e4d60c6 Merge pull request #2019 from imurchie/isaac-iosconfig
Use new version of Device.configureLocalApp
2014-03-07 13:15:39 -08:00
Jonathan Lipps b942173de6 Merge pull request #2018 from jlipps/master
add enablePerformanceLogging cap for chrome/android hybrid
2014-03-07 13:14:45 -08:00
Isaac Murchie d45f2aee5c Use new version of Device.configureLocalApp 2014-03-07 13:07:46 -08:00
Jonathan Lipps 80ebe34278 add enablePerformanceLogging cap for chrome/android hybrid, so we can get performance logs 2014-03-07 11:52:20 -08:00
Jonathan Lipps 9ba883f97a Merge pull request #2017 from jlipps/master
show extra server params in logs for easier debugging
2014-03-07 10:47:41 -08:00
Jonathan Lipps 77c20b05d5 show extra server params in logs for easier debugging 2014-03-07 10:41:06 -08:00
Dan Cuellar ca2c4da4b5 Merge pull request #2016 from bootstraponline/master
Add license to package.json
2014-03-07 09:58:14 -08:00
bootstraponline 5aa953f877 Add license to package.json 2014-03-07 10:00:51 -05:00
bootstraponline 1005235183 Merge pull request #2007 from paymand/down_up_move
Added support for touch{Down|Up|Move} on Android.
2014-03-07 09:20:28 -05:00
bootstraponline d70f8ac01d Clean up debug logging 2014-03-07 15:10:53 +01:00
Payman Delshad 113fe5ce10 Added support for touch{Down|Up|Move} on Android. 2014-03-07 15:10:52 +01:00
Jonathan Lipps ff6a3cf378 Merge pull request #2000 from paymand/reset_udid
Added support for --udid to the reset scripts.
2014-03-06 18:40:34 -08:00
Jonathan Lipps fdbe2581f2 Merge pull request #2012 from jlipps/master
don't delete /Applications unless we're doing fullReset
2014-03-06 18:16:27 -08:00
Jonathan Lipps e2573415ec don't delete /Applications unless we're doing fullRest, and add tests of safariIgnoreFraudWarning in safari itself 2014-03-06 17:47:20 -08:00
bootstraponline e16264b963 Merge pull request #2009 from Jonahss/windowsTestFix
fixed custom mocha args
2014-03-06 15:19:22 -05:00
Jonahss fe36524034 fixed custom mocha args 2014-03-06 12:05:52 -08:00
bootstraponline 2882665e25 Merge pull request #2008 from imurchie/isaac-gitignore
Ignore maven/surefire byproducts
2014-03-06 12:53:43 -05:00
Isaac Murchie c7910936fd Ignore maven/surefire byproducts 2014-03-06 09:48:45 -08:00
Dan Cuellar fd9a1b6ed8 Windows support is no longer beta 2014-03-06 09:38:32 -08:00
Dan Cuellar f95a6cbfc7 Spelling alterations 2014-03-06 09:13:28 -08:00
bootstraponline 24c896a492 Merge pull request #2006 from testerhome/master
finish all docs translation work except style guide doc
2014-03-06 10:14:33 -05:00
lihuazhang 5c7f8ea32a commit docs only 2014-03-06 22:56:39 +08:00
Payman Delshad 29f393452d Added support for --udid to the reset scripts. 2014-03-05 15:46:17 +01:00
bootstraponline f01c9fed56 Merge pull request #1998 from danubiusdan/patch-1
added java example code for scrollTo action.
2014-03-05 09:16:31 -05:00
Dan Laslo-Faur 5675e3ff66 added java example code for scrollTo action. 2014-03-05 11:51:09 +02:00
Jonathan Lipps c4dd36d362 Merge pull request #1995 from jlipps/master
fix bad conflict resolution, include uiauto bootstrap when launching ins...
2014-03-04 18:24:13 -08:00
Jonathan Lipps dbca58ddbc fix bad conflict resolution, include uiauto bootstrap when launching instruments 2014-03-04 17:51:43 -08:00
Jonathan Lipps 9c57a77749 Merge pull request #1967 from dandoveralba/locservices
Update setLocale and reset
2014-03-04 13:34:37 -08:00
Dan Doveralba 980d7b764f Update setLocale and Reset
* launch and quit the sim if the sim dir doesn't exist
* remove only the locationd folder in caches since that was the original intent or removing Caches to begin with

Fix #1943
2014-03-04 13:05:09 -08:00
Jonathan Lipps 52a625388e add some negative tests for device extraction 2014-03-04 12:02:34 -08:00
Jonathan Lipps 01887294b0 Merge pull request #1987 from Jonahss/windowsTest
added windows equivalent of test.sh
2014-03-04 11:40:53 -08:00
Jonathan Lipps 0a542a371c Merge pull request #1985 from Jonahss/reset.bat
Fix installation on Windows
2014-03-04 11:40:39 -08:00
Jonahss 4faf346bbf windows equivalent of test.sh 2014-03-04 10:58:37 -08:00
Jonathan Lipps f76a8ee8f8 fix extraneous parens 2014-03-04 10:41:47 -08:00
Jonathan Lipps a8e11c2196 Merge pull request #1986 from jlipps/appium-js-refactor
Refactor appium.js
2014-03-04 10:18:38 -08:00
Jonathan Lipps 135044fa82 ensure device detection works in a case-insensitive manner 2014-03-04 10:17:19 -08:00
Jonathan Lipps 7adcac31a7 fix websocket bug and make sure named apps clobber device in caps 2014-03-03 16:41:46 -08:00
Jonathan Lipps e4e1936ad6 fix a few ios bugs and add list of things that our testsuite doesn't cover yet 2014-03-03 16:41:46 -08:00
Jonathan Lipps 7ac5c172f5 handle starting server with only --force-iphone or --force-ipad for device too 2014-03-03 16:41:46 -08:00
Jonathan Lipps 7c2593c183 add unit tests for device extraction logic 2014-03-03 16:41:46 -08:00
Jonathan Lipps e6e47887cd fix unit tests to mock IOS instead of using weird mock_ios device 2014-03-03 16:41:46 -08:00
Jonathan Lipps 86ad843bd8 continue to clean up appium.js to handle new architecture 2014-03-03 16:41:46 -08:00
Jonathan Lipps c9fc9c8d4e remove need for things other than safari.js to know about SafariLauncher 2014-03-03 16:41:46 -08:00
Jonathan Lipps f7011a5199 migrate firefoxos config 2014-03-03 16:40:17 -08:00
Jonathan Lipps 3cab56ecea migrate ios args in remaining files 2014-03-03 16:40:17 -08:00
Jonathan Lipps 42780f2655 port chrome config 2014-03-03 16:40:16 -08:00
Jonathan Lipps b058732ebb port android basic config 2014-03-03 16:40:16 -08:00
Jonathan Lipps b45f324701 finish porting ios args 2014-03-03 16:40:16 -08:00
Jonathan Lipps 0cd14dd8fd rearchitect configuration methods 2014-03-03 16:37:49 -08:00