Commit Graph
11339 Commits
Author SHA1 Message Date
bootstraponline a5a201f385 Merge pull request #1446 from boxiong/master
Made a change so that we can patch isVerbose to the mechanic project
2013-11-08 12:43:06 -08:00
Bo Xiong 6a39302db7 Updated so shat we can patch isVerbose to the mechanic project 2013-11-08 14:33:33 -06:00
Chi Thu Le f8e2909ed2 Moved getCurrentActivity to android-common.js 2013-11-08 20:39:37 +01:00
Jonathan Lipps 32bf686862 remove unnecessary debug log 2013-11-08 10:50:35 -08:00
Jonathan Lipps c62a44ee44 Merge pull request #1436 from boxiong/master
Added an option to suppress excessive logging from UIALogger.
2013-11-08 09:22:03 -08:00
Bo Xiong 6c622ed733 Added an option to suppress excessive logging from UIALogger (non-verbose by default). 2013-11-08 09:31:14 -06:00
Chi Thu Le 86060e7c5f Provide default system port for selendroid. Fixed selendroid keyevent crash and added getCurrentActivity for selendroid 2013-11-08 10:14:10 +01:00
Jonathan Lipps 70070153cf Merge pull request #1440 from jlipps/master
replace quotes with replace(), not weird string truncation
2013-11-07 14:44:53 -08:00
Jonathan Lipps 465ae14f4e replace quotes with replace(), not weird string truncation 2013-11-07 12:36:53 -08:00
Jonathan Lipps 4ba548bd67 Merge pull request #1439 from bootstraponline/ios7_alert_accept_fix
Fix acceptAlert for UICatalog on iOS 7
2013-11-07 12:11:04 -08:00
bootstraponline 3280949aca Fix acceptAlert for UICatalog on iOS 7 2013-11-07 14:59:26 -05:00
bootstraponline 7e4ceaf28e Merge pull request #1438 from bootstraponline/ios7_alert_dismiss_fix
Fix dismissAlert for UICatalog on iOS 7
2013-11-07 11:54:52 -08:00
bootstraponline d5046c1233 Fix dismissAlert for UICatalog on iOS 7 2013-11-07 14:24:23 -05:00
Jonathan Lipps 4a0cb4cc9e changelog and bump to 0.11.3 for publish v0.11.3 2013-11-06 11:44:52 -08:00
Jonathan Lipps 80d9241418 Merge pull request #1431 from jlipps/master
move logcat code so it doesn't break selendroid
2013-11-06 11:44:04 -08:00
Jonathan Lipps d29ea809ba move logcat code into android-common
so that selendroic an use it as well
2013-11-06 11:12:59 -08:00
Jonathan Lipps 9bd93ae1f4 update selendroid 2013-11-06 11:07:04 -08:00
bootstraponline e9a31b2b46 Merge pull request #1430 from snevesbarros/update_launcher
updated safari launcher to latest
2013-11-06 09:17:00 -08:00
Sergio Neves Barros 7956393ebe updated safari launcher with .gitignore changes 2013-11-06 09:15:00 +00:00
bootstraponline 5421e19d69 Merge pull request #1426 from jlipps/master
add more logging and error handling to authorize
2013-11-05 12:56:16 -08:00
Jonathan Lipps 8a73c4150f add more logging and error handling to authorize
fix #1409?
2013-11-05 12:41:14 -08:00
bootstraponline 1064531076 Merge pull request #1425 from jlipps/master
add tests for #1413, also fix jsonwp misinterpretation
2013-11-05 12:39:43 -08:00
Jonathan Lipps 199d7e40b9 add tests for #1413, also fix jsonwp misinterpretation
logTypes should return array of types, not array of objects
cc @ecomrobotics
2013-11-05 12:00:40 -08:00
Jonathan Lipps 6137e1325f increase launch timeout for slow android emus 2013-11-05 11:41:04 -08:00
Jonathan Lipps 89c260a246 Merge pull request #1424 from ecomrobotics/fix-updating-desired-capabilities
Bugfixes for desired_capabilities updating and for ios_logging
2013-11-05 10:12:27 -08:00
eComRobotics Team 93c313303f Bugfixes for desired_capabilities updating and for ios_logging 2013-11-05 20:30:37 +04: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
Jonathan Lipps 721c1b79d0 Merge pull request #1417 from feelobot/patch-3
Update hybrid.md
2013-11-04 13:52:09 -08:00
Felix Rodriguez d1f2217d5e Update hybrid.md 2013-11-04 13:50:17 -08:00
Jonathan Lipps 00cedf5e90 Merge pull request #1414 from snevesbarros/fix_1411_null_session
fix for 1411: added bundleId to sim build and did safariLauncher flag cleanup
2013-11-04 13:08:05 -08:00
Jonathan Lipps 428de3550b Merge pull request #1365 from testerhome/master
Translate Appium Docs to Chinese
2013-11-04 10:44:21 -08: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
unknown 79830372ff add chinese docs 2013-11-03 13:51:52 +08:00
bootstraponline 1ddc5f4e19 Merge pull request #1410 from jlipps/master
make sure command timeout is reset for proxied devices too (fix #1404)
2013-11-01 10:32:30 -07:00
Jonathan Lipps 1209d4b22a make sure command timeout is reset for proxied devices too (fix #1404) 2013-11-01 10:19:45 -07:00
bootstraponline ed16cd8f9e Merge pull request #1408 from snevesbarros/master
Updated with description on how to use SafariLauncher for real device.
2013-11-01 09:54:23 -07:00
bootstraponline b87451f215 Merge pull request #1407 from jlipps/master
android 4.4 needs new activity matching regex
2013-11-01 09:53:50 -07:00
Sergio Neves Barros 92274f9d32 Updated with description on how to use SafariLauncher for real device.
Added some description on how to run tests against Safari on a real device.
2013-11-01 16:51:09 +00:00
Jonathan Lipps e28273acad Merge pull request #1406 from snevesbarros/fix_dependencies_samplecode
Fix for 1047
2013-11-01 08:40:14 -07:00
Jonathan Lipps 135798fa49 update activity matching regex for android 4.4 2013-11-01 08:39:26 -07:00
bootstraponline 17670869fa Merge pull request #1405 from paymand/no_reset
(Android) Don't uninstall the app when --no-reset is used.
2013-11-01 06:16:09 -07:00
Sergio Neves Barros 68d9a5f314 Fix for 1047 as dependencies have moved for latest version of selenium into interactions package 2013-11-01 09:22:21 +00:00
Payman Delshad 2502ffdd0d (Android) Don't uninstall the app when --no-reset is used. 2013-11-01 09:25:38 +01:00
bootstraponline 608c87a44b Merge pull request #1403 from jlipps/master
make sure we don't shut uiautomator down if it's already gone
2013-10-31 15:39:24 -07:00
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