Commit Graph

12167 Commits

Author SHA1 Message Date
bootstraponline 34fabfaa72 Add wait for activity.
Fix #332
2013-03-26 17:31:10 -04:00
Adam Christian 30e655d571 Merge pull request #333 from jlipps/master
webview frame switching and better alert handling
2013-03-26 13:49:38 -07:00
Jonathan Lipps 91c4d61094 update example to use new hybrid exit strategy 2013-03-26 13:46:07 -07:00
Jonathan Lipps ccb530ee09 don't let whackamole start for a while 2013-03-26 13:44:15 -07:00
Jonathan Lipps 5f3628511d catch alerts that pop up before test commands and close them 2013-03-26 13:23:22 -07:00
Jonathan Lipps dbb9b44691 allow finding frames within frames 2013-03-26 12:51:22 -07:00
Jonathan Lipps 5abfaec2ec add ability to switch to frame by element 2013-03-26 11:50:30 -07:00
Jonathan Lipps 7b595f3975 better error handling and clear out webframe on new url 2013-03-26 11:34:36 -07:00
Jonathan Lipps 4027666305 add tests for iframe switching too 2013-03-26 11:06:43 -07:00
Jonathan Lipps c3be26d103 allow switching back to default frame 2013-03-26 11:01:24 -07:00
Jonathan Lipps 6f8d6d8975 basic web frame setting and tests 2013-03-26 10:37:17 -07:00
Jonathan Lipps 4d5c74f812 don't use frame(null) for clearing webview, use mobile: leaveWebView 2013-03-26 09:48:10 -07:00
Jonathan Lipps 583228959b scope all atom commands to some window object 2013-03-26 09:33:58 -07:00
Jonathan Lipps ef294e003d bump safari default version to 6.1 2013-03-26 09:33:58 -07:00
Jonathan Lipps f365e46277 make sure server quits if it's pre-launch and doesn't work 2013-03-26 09:33:58 -07:00
Jonathan Lipps 49c7297212 allow pre-launching local zips/apps/safari from command line 2013-03-26 09:33:58 -07:00
Jonathan Lipps bde3eabc7d add frame guineas and ability of executeAtom to run in frame context 2013-03-26 09:33:58 -07:00
Adam Christian 6f700b2875 Merge pull request #329 from jlipps/master
even moar alert awesomeness
2013-03-25 17:27:07 -07:00
Jonathan Lipps 7b6a9c5baf betterify alert closing wait logic 2013-03-25 17:25:00 -07:00
Jonathan Lipps 14f2960677 make sure you can't get text of a dismissed alert 2013-03-25 16:48:53 -07:00
Jonathan Lipps 8995c602d8 make sure setAlertText fails on non-prompts 2013-03-25 16:22:41 -07:00
Jonathan Lipps 7043e743a8 allow setting of alert text 2013-03-25 16:08:46 -07:00
Jonathan Lipps 7f7d1cd9cf allow dismissing of alerts that only have OK buttons 2013-03-25 16:08:46 -07:00
Jonathan Lipps a6ca4051d7 enable getting of text in webview alert 2013-03-25 16:08:45 -07:00
Jonathan Lipps 6fcd290387 Merge pull request #328 from maudineormsby/master
Find Element from Element in webviews + test
2013-03-25 16:07:17 -07:00
Jason Carr 66ec129b61 Find Element from element in webviews. 2013-03-25 14:48:39 -07:00
Sebastian Tiedtke 5cd449dd0c Merge pull request #327 from jlipps/master
handle webview alerts somewhat
2013-03-25 14:05:39 -07:00
Jonathan Lipps 685f5e41d5 Merge pull request #326 from bootstraponline/fix_button
[Android] Fix button finding
2013-03-25 14:03:44 -07:00
Jonathan Lipps a9f9422098 Merge pull request #323 from bootstraponline/fix_dot
[Android] Fix selectors with dots
2013-03-25 14:02:56 -07:00
Jonathan Lipps c40321f93e wrap executeAtom so it is aware of blocking alerts; some other rearch 2013-03-25 14:00:53 -07:00
bootstraponline e09c917328 Fix button finding
Fix #325
2013-03-25 16:53:22 -04:00
bootstraponline 618b992fe2 Fix selectors with dots
Fix #318
2013-03-25 15:26:26 -04:00
Jonathan Lipps 59b606b38e Merge pull request #321 from bootstraponline/overflow_button
[Android] Match overflow menu button
2013-03-25 11:16:59 -07:00
Jonathan Lipps b8e9e65ffb Merge pull request #320 from bootstraponline/act_not_found
[Android] Improve activity not found error
2013-03-25 11:15:03 -07:00
Jonathan Lipps 55b3b9378d Merge pull request #316 from bootstraponline/rm_skip_install
[Android] Remove skipInstall
2013-03-25 11:13:45 -07:00
bootstraponline a0ff24b6b1 Add custom class name matches 2013-03-25 14:09:49 -04:00
bootstraponline 23834dca81 Match overflow menu button and button 2013-03-25 13:49:59 -04:00
bootstraponline 9bf25924af Improve activity not found error
Fix #319
2013-03-25 10:35:58 -04:00
bootstraponline 4193338236 Remove skipInstall
Install is now able to detect if the APK exists on device or not.
This removes the need for a skipInstall flag.

Fix #313
2013-03-23 14:01:52 -04:00
Jonathan Lipps a5dcc9e370 Merge pull request #312 from bootstraponline/skip_on_reset
Skip uninstall on fastReset
2013-03-23 10:29:34 -07:00
bootstraponline 6cfaf309d3 Skip uninstall on fastReset 2013-03-23 13:18:51 -04:00
Jonathan Lipps fbe266d767 Merge pull request #314 from bootstraponline/adb_cmd
Move keyevent to adb.js
2013-03-23 10:15:55 -07:00
Jonathan Lipps 181145bb2b Merge pull request #308 from bootstraponline/text_contains
Add text contains
2013-03-23 10:11:58 -07:00
bootstraponline e135c9f154 Move to adb.js 2013-03-23 13:11:01 -04:00
bootstraponline dbbd559bb0 Add * XPath unit test 2013-03-23 13:08:14 -04:00
Jonathan Lipps 7fefd941c6 Merge pull request #309 from bootstraponline/android_back
Add back button for Android
2013-03-23 10:07:48 -07:00
bootstraponline ec21895d56 Add text contains
Fix #301
2013-03-23 12:55:12 -04:00
bootstraponline ff463c7dc6 Add back button for Android 2013-03-23 12:41:09 -04:00
Adam Christian 0c1a7ca444 Merge pull request #311 from jlipps/master
window close() and various fixes
2013-03-22 17:22:11 -07:00
Jonathan Lipps 0d6818d8a4 fixing weird multi-callback and object cleanup issues 2013-03-22 17:19:35 -07:00