Commit Graph

98 Commits

Author SHA1 Message Date
Jonathan Lipps 7e5ca293a6 if we're not in a git repo. don't link commit hooks (fix #2141) 2014-03-24 09:59:14 -07:00
Jonathan Lipps 3b357841a5 using npmlink -m in reset.sh sometimes puts submodules at an earlier commit than the one we want 2014-03-14 12:35:47 -07:00
sebv 094564270d UICatalog fix for 7.1 2014-03-14 21:43:46 +08:00
Jonathan Lipps 6e0ecb3b5d don't ever use sudo to reinstall npm modules 2014-03-11 12:03:29 -07:00
Jonathan Lipps bcc2649d1f use actual ios sdk for reset.sh instead of hard-coding it 2014-03-10 14:18:37 -07:00
sebv f2d9025557 adding npm submodules and scripts 2014-03-10 20:30:57 +08:00
Payman Delshad 29f393452d Added support for --udid to the reset scripts. 2014-03-05 15:46:17 +01:00
sebv 2db67fb872 Extracted appium-uiauto package 2014-03-02 16:07:57 +08:00
sebv 221ca385e5 Converted code to use npm appium-instruments package 2014-02-28 11:22:34 +08:00
jonahss cd411874a4 changed .appiumconfig to .apapiumconfig.json so we can load it with require() and have it cached 2014-02-25 15:53:55 -08:00
Jonathan Lipps fe325c5cda add pre-commit hook in reset.sh 2014-02-25 12:02:56 -08:00
Jonathan Lipps ccfe1b7ab5 remove old chromedriver binaries (cc @imurchie) 2014-02-14 15:46:13 -08:00
Isaac Murchie d266d4b7fa Bundle all ChromeDrivers when publishing 2014-02-14 09:50:48 -08:00
Jonathan Lipps 0de0452b75 ensure selendroid test app doesn't need to have its version updated when we update selendroid 2014-02-13 15:25:56 -08:00
Isaac Murchie 9ee3e319af Bundle ChromeDriver into build, for Mac and Linux 2014-02-11 11:47:25 -08:00
Ruben Gonzalez Alonso fafc389109 Allow to use reset.sh from git-bash in Windows 2014-02-11 16:23:48 +01:00
Jonathan Lipps 374b13e8d6 clear out selendroid build cruft so it doesn't accidentally get committed into our codebase 2014-02-06 11:22:20 -08:00
Jonathan Lipps 8ce088c11a make toggle test ready for appium test
- build it in reset.sh
- move test files to an appropriate dir
- add to test.sh
cc @mobiware
2014-01-21 16:31:20 -08:00
sebv 727e1d0686 making reset.sh xcode 4.6 friendly 2014-01-07 02:24:37 +08:00
Jonathan Lipps 9741c332d7 show a warning in reset.sh if you're not on ios7 2013-12-19 14:28:30 -08:00
Jonathan Lipps a4f82c31cd remove safari launcher as strategy for safari + sim 2013-12-18 14:03:30 -08:00
Jonathan Lipps 9fe8358cb4 don't reset build/ if we're not using --hardcore, and some other fixes 2013-12-17 11:10:48 -08:00
Jonathan Lipps 52bb752773 add --show-config flag to show appium config, and include server build time 2013-12-09 14:13:42 -08:00
bootstraponline eaa6cb3d18 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.
2013-12-03 14:07:38 -05:00
Jonathan Lipps 8f16e64c1b new webviewapp works for both ios6.1 and ios7.0 2013-11-15 12:22:47 -08:00
Jonathan Lipps c106c17c7f promote WebViewApp to build/ since it will be used for web tests in ios7 2013-11-15 11:12:30 -08:00
Dan Cuellar 7b1e1badce Set iOS Simulator Language using ios-sim-locale from https://code.google.com/p/ios-sim-locale/ 2013-11-11 13:01:10 -08:00
Jonathan Lipps 099d564ebc Merge pull request #1413 from ecomrobotics/ios-logs
Support for iOS logs for devices and simulators
2013-11-04 15:44:31 -08:00
eComRobotics Team caf7d789e9 Support for iOS logs for devices and simulators
Fix after comments by @jlipps

Fix require section
2013-11-05 03:16:44 +04:00
Sergio Neves Barros 4b362df4d0 Added bundleId for simulator build and did a cleanup for isSafariLauncherApp flag 2013-11-04 18:28:22 +00:00
Jonathan Lipps 6aa838e474 fix check in reset.sh
cc @snevesbarros
2013-10-31 13:55:37 -07:00
Sergio Neves Barros 010a1df79f Shifting twice when the second argument doesn't start with -- 2013-10-31 17:19:26 +00:00
Sergio Neves Barros c9e74d6340 Added ability to select code signing identity (and if required profile). 2013-10-31 16:29:52 +00:00
Jonathan Lipps d31a3729b1 changelog and update reset.sh to fix --real-safari bug 2013-10-29 14:49:14 -07:00
Jonathan Lipps def9c4a7c7 copy status and xpath to uiauto instead of linking
so they get picked up appropriately by npm
2013-10-25 09:37:14 -07:00
Jonathan Lipps 91e21ac13b replicate @snevesbarros reset fix for building safari 2013-10-24 13:45:55 -07:00
Jonathan Lipps 592c6af31a remove .appiumconfig on reset
so we don't run into situations like reset.sh --[device] and then
appium won't start because other devices were configured at
a previous version
2013-10-24 10:49:33 -07:00
Jonathan Lipps 5ad5df488b move all android-related files together into devices/android 2013-10-17 12:33:49 -07:00
Jonathan Lipps 059a7dc339 move all firefoxos-related functionality together
and add firefox os resetting to reset.sh so it's functional
2013-10-17 12:33:48 -07:00
Jonathan Lipps 64f5619331 move uiauto stuff into ios/ and extract status and xpath libs 2013-10-17 12:33:48 -07:00
Jonathan Lipps 8f4c01af2c update safarilauncher steps in reset.sh
cc @snevesbarros
2013-10-17 10:30:09 -07:00
Sergio Neves Barros 36f296a908 Added SafariLauncher as a submodule and as part of the build. App is then zipped and copied to the build folder. 2013-10-16 17:26:59 +01:00
Jonathan Lipps 259a6c8d69 remove npm deps on hardcore reset 2013-10-08 10:29:29 -07:00
Jonathan Lipps bd77c9ee36 put unlock_apk in build so it gets packaged up 2013-09-27 14:33:02 +01:00
Jonathan Lipps dae201a385 use xcode version to determine ios sdk
so we can get rid of --ios-sdk flag in reset.sh
2013-09-25 13:17:55 +01:00
Jonathan Lipps fa3bb6409a make 7.0 the default ios version
and add docs on how to work with multiple versions
2013-09-25 13:09:36 +01:00
Jonathan Lipps 829796586c using && in reset.sh needs run_cmd 2013-09-24 17:06:00 +01:00
Dan Cuellar cd8b4a11f5 Use different versions of instruments without delay depending on Xcode version 2013-09-23 09:09:44 -07:00
filmaj 0d3950994a Robust, device-friendly unlock. Added gitsubmodule for unlock_apk.
reset.sh now builds the apk. adbs unlockScreen method now invokes
unlock.apk. added a new small, focused module called device_state to handle determining state of emulators/devices. currently has a "isScreenLocked" function. unlockScreen in adb.js now 1) checks if screen is locked or not first before doing anything and 2) uses unlock.apk to do the unlocking.
2013-09-19 14:09:45 -07:00
Dan Cuellar 98488b8767 Adding automatic udid detection to iOS 2013-09-14 17:02:26 -07:00