mirror/appium
1
0
Fork 0
mirror of https://github.com/appium/appium.git synced 2026-02-14 05:50:00 -06:00
Code Issues Packages Projects Releases Wiki Activity
2,620 Commits 10 Branches 2,017 Tags
f92cfd73f56562b6c0a44e98cbdf8ccd3d6f49ce
Commit Graph

2620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Lipps
f92cfd73f5 fix pinchopen/close regression on ios from android changes 2013-10-11 15:49:10 -07:00
filmaj
b5e3c1de72 Fixed links in README.md & CONTRIBUTING.md 2013-10-11 15:37:11 -07:00
bootstraponline
bc5d5142df Merge pull request #1287 from filmaj/docs-rehash 
README review
 2013-10-11 15:09:36 -07:00
filmaj
e63144f750 README rehash. put platform requirements together in readme. split out contribution / hacking documentation into its own CONTRIBUTING.md. Used absolute URLs for links (as they may be linked from npmjs.org). changed contribution section regarding running tests to highlight use of test.sh instead of grunt. 2013-10-11 14:51:20 -07:00
Jonathan Lipps
cb6a58f964 Merge pull request #1297 from bootstraponline/new_android_reset 
Android mobile :reset now uses adb uninstall/pm install
 2013-10-10 18:02:55 -07:00
bootstraponline
554967bc9f Merge pull request #1300 from dandover/waitForAlertToClose-bug 
refresh the value of alert so we don't always delay
 2013-10-09 19:05:22 -07:00
Dan Dover
4eb8f20554 fix a bug where we always wait for the delay because we never refresh the value of alert 2013-10-09 18:17:51 -07:00
bootstraponline
5965ef39fd Android mobile :reset now uses adb uninstall/pm install 
The old clean.apk approach to resetting state doesn't work well. Using
instrumentation means the app is running when the data is deleted. It's better
to use the standard adb install/uninstall commands.

To make this faster, the apk is pushed to the device once (/data/local/tmp/) and
then installed from that location on each reset. Using the regular adb install
command is slow due to the file transfer speed.

Before uninstalling the app, it's stopped to prevent crashes. Some apps don't
like to be uninstalled while running.
 2013-10-09 15:21:21 -04:00
bootstraponline
360f2e48e0 Merge pull request #1290 from jlipps/master 
enable authorize on mavericks
 2013-10-08 20:57:31 -07:00
Jonathan Lipps
580f56279c enable authorize on mavericks 2013-10-08 18:10:49 -07:00
Jonathan Lipps
2be3dd53fc Merge pull request #1286 from jlipps/master 
don't unfreezerotation, it actually cancels the rotation (fix #1280)
 2013-10-08 18:09:59 -07:00
Jonathan Lipps
ed093faa57 don't unfreezerotation, it actually cancels the rotation (fix #1280) 2013-10-08 16:23:02 -07:00
bootstraponline
dbbef1578f Merge pull request #1284 from filmaj/unlock_apk-update 
Updated unlock_apk submodule
 2013-10-08 11:39:33 -07:00
filmaj
bd57f112bc Updated unlock_apk submodule ref: now supports Samsung S3 and Samsung Galaxy Note2. Tested as well on Nexus 4 devices as well as 2.3.3, 4.0.3, 4.1.2, 4.2.2 and 4.3 emulators. 2013-10-08 11:03:08 -07:00
bootstraponline
128e114fad Merge pull request #1282 from jlipps/master 
turn on debug transactions for instruments
 2013-10-08 10:34:14 -07:00
Jonathan Lipps
2cf43b76aa make sure debug transactions is on (fix #1281) 2013-10-08 10:33:27 -07:00
Jonathan Lipps
259a6c8d69 remove npm deps on hardcore reset 2013-10-08 10:29:29 -07:00
bootstraponline
1f38724159 Merge pull request #1265 from paymand/android_pinch 
Implemented pinch in/out on Android.
 2013-10-08 07:23:27 -07:00
Payman Delshad
1d5f0868b6 Implemented pinch in/out on Android. 2013-10-08 16:14:20 +02:00
Jonathan Lipps
888bf2ec69 Merge pull request #1276 from bootstraponline/master 
Remove checkMissingParams when defaults are set
 2013-10-07 11:19:10 -07:00
bootstraponline
70817c098b Remove checkMissingParams when defaults are set 2013-10-07 13:30:01 -04:00
bootstraponline
06bb7ae94a iOs -> iOS 2013-10-07 13:00:49 -04:00
bootstraponline
1948364d11 Merge pull request #1274 from appium/ios7_accept_alert 
Fix spacing
 2013-10-07 08:13:03 -07:00
bootstraponline
a6ffe3f268 Fix spacing 2013-10-07 11:11:48 -04:00
Dan Cuellar
1327b4d8bf Merge pull request #1273 from bootstraponline/ios7_accept_alert 
Fix acceptAlert on iOS 7
 2013-10-07 08:01:52 -07:00
bootstraponline
a6b136ac2d Merge pull request #1270 from bootstraponline/screencap_bin 
Use screencap bin
 2013-10-07 07:56:41 -07:00
bootstraponline
77c2e222a7 Fix acceptAlert on iOS 7 2013-10-07 10:56:25 -04:00
bootstraponline
000831be84 Use screencap bin 
Use Host GPU must not be checked or the screenshot will be grey.
 2013-10-04 15:51:42 -04:00
Jonathan Lipps
5ddc2e5099 Merge pull request #1268 from bootstraponline/ios_reset 
iOS mobile reset stops the emulator and removes all apps
 2013-10-04 11:16:49 -07:00
bootstraponline
c1572f2718 iOS mobile reset stops the emulator and removes all apps 
Fix #1247
 2013-10-04 14:10:50 -04:00
bootstraponline
afc7a753ef Merge pull request #1266 from bootstraponline/screenshot 
Fix screenshot
 2013-10-04 10:23:20 -07:00
bootstraponline
a5da221ef4 Fix screenshot 
Use Host GPU must be checked.
http://stackoverflow.com/questions/13800437/why-android-uiautomators-uidevicetakescreenshot-always-return-false-on-emulato
 2013-10-04 13:22:30 -04:00
Dan Cuellar
a12b930099 Merge pull request #1263 from penguinho/master 
Checking in graphics resource
 2013-10-03 16:46:03 -07:00
Dan Cuellar
27dbdf9a2e Checking in graphics resource 2013-10-03 16:45:46 -07:00
Jonathan Lipps
1c425c0979 Merge pull request #1260 from paymand/orientation_refactor 
Refactored setOrientation() for Android.
 2013-10-03 06:53:31 -07:00
Payman Delshad
bf14801493 Refactored setOrientation() for Android. 
Appium throws "Set the orientation, but app refused to rotate." when
setting the orientation to landscape on Android, which was fixed by
calling the correct function. Also, made the code simpler by defining
portrait=(0 degree rotation) and landscape=(270 degree rotation)
regardless of current display rotation. Moreover, unfreeze device
rotation at the end.
 2013-10-03 14:26:54 +02:00
Jonathan Lipps
f6b14c0761 Merge pull request #1257 from ritika-mish/patch-1 
Update gestures.md
 2013-10-03 01:52:31 -07:00
ritika-mish
59ff829584 Update gestures.md 2013-10-03 11:04:41 +05:30
Jonathan Lipps
66aab04727 Merge pull request #1254 from bootstraponline/accept_alert 
Don't accept the alert when we're trying to dismiss it
 2013-10-02 09:39:19 -07:00
bootstraponline
1904d1fe9c Don't accept the alert when we're trying to dismiss it 
If cancelButton().isNil() that doesn't mean there isn't a cancel button.
The cancel button is always button[0]. Press the dismiss button when requested
instead of calling acceptAlert().

Fix #1253
 2013-10-02 12:07:35 -04:00
bootstraponline
4e85af6ca0 Merge pull request #1251 from bootstraponline/master 
Update Clean.apk
 2013-10-02 07:35:47 -07:00
bootstraponline
96e6a76de5 Update Clean.apk 
The lib/ folder contains native libs so it must never be deleted.

af006af44b

adb logcat -s "clean.apk" will display the debug log of clean.apk. This makes it
easy to find out if it's running successfully and what files are removed.

0445f7d0d1
 2013-10-01 12:11:34 -04:00
Dan Cuellar
e7e63652aa Merge pull request #1241 from penguinho/gruntpaths 
Cleaning up styles for paths in grunt-helpers and making all paths Windows-friendly
 2013-10-01 04:38:51 -07:00
Jonathan Lipps
4db29bdf6f Merge pull request #1237 from mgmanikandan87/patch-6 
Updated : Java code snippet for Slider
 2013-09-30 01:26:49 -07:00
Dan Cuellar
32018ba6b0 making paths windows friendly 2013-09-29 09:17:06 -07:00
Dan Cuellar
39773cfc7a Merge pull request #1240 from penguinho/master 
Update windows docs with cleanup and links to dependencies
 2013-09-29 09:07:01 -07:00
Dan Cuellar
e5a2285c54 Update windows docs 2013-09-29 09:06:29 -07:00
Dan Cuellar
a93ee10cfc Merge pull request #1239 from penguinho/master 
Adding Selendroid (Dev) and Gappium support to reset.bat
 2013-09-29 08:47:33 -07:00
Dan Cuellar
7e8350f236 Adding Selendroid (Dev) and Gappium support 2013-09-29 08:46:52 -07:00
Dan Cuellar
d960bab3bd Merge pull request #1238 from penguinho/master 
Even Better reset.bat
 2013-09-29 08:04:38 -07:00