Commit Graph

12167 Commits

Author SHA1 Message Date
Jonathan Lipps 2757d20fb4 pull changes from appium.io 2013-04-12 13:36:52 -07:00
Jonathan Lipps aaefc9b12e use regex test instead of exec 2013-04-12 13:26:30 -07:00
Jonathan Lipps 56026a1554 wd now returns element objects after execute 2013-04-12 13:23:10 -07:00
Jonathan Lipps 2c697e616a remove commented out code 2013-04-12 13:20:50 -07:00
Jonathan Lipps f3e4968ce7 make sure not to proxy non-proxies 2013-04-12 11:27:24 -07:00
Sebastian Tiedtke d00ecbe217 Merge pull request #433 from jlipps/selendroid
Selendroid support and adb.js rewrite
2013-04-12 11:11:52 -07:00
Jonathan Lipps da346905ed we already have ncp, no need for copyFile 2013-04-12 10:37:58 -07:00
Jonathan Lipps b38cf659c6 better reset.sh behavior for selendroid 2013-04-12 10:33:26 -07:00
Jonathan Lipps d738739554 update selendroid to the real 0.3 i guess 2013-04-12 10:27:29 -07:00
Jonathan Lipps 50a2b8e667 make sure to rm selendroid targets in reset 2013-04-12 10:25:43 -07:00
Jonathan Lipps e1d7102499 update gitignore to track selendroid test 2013-04-12 10:15:36 -07:00
Jonathan Lipps 82ba0fe61f don't log long proxy responses 2013-04-12 10:11:08 -07:00
Jonathan Lipps 3bf9dc188b only rebuild/reinstall/remanifest selendroid in certain cases 2013-04-12 09:51:08 -07:00
Jonathan Lipps 85ae7fa419 add special proxy behavior for delete session 2013-04-12 09:27:27 -07:00
Jonathan Lipps 81f4573598 refactor selendroid for nicer async 2013-04-12 09:20:22 -07:00
Jonathan Lipps e21c32e391 better route proxy matching 2013-04-12 09:20:11 -07:00
Jonathan Lipps 76b194c887 reset.sh doesn't need demo selendroid build 2013-04-12 08:59:24 -07:00
Jonathan Lipps fc57b16211 check if modified selendroid server exists before rebuilding 2013-04-12 08:57:55 -07:00
Jonathan Lipps c479c156c5 proxy commands other than start/stop 2013-04-11 17:41:20 -07:00
Jonathan Lipps 28d5177d15 selendroid is alive! 2013-04-11 17:20:05 -07:00
Jonathan Lipps 41587f31b1 add mkdirp to deps 2013-04-11 16:23:37 -07:00
Jonathan Lipps 014d237fc3 update selendroid, factor out manifest stuff for selendroid 2013-04-11 15:55:35 -07:00
Jonathan Lipps 08a606485d follow callback conventions 2013-04-11 14:16:22 -07:00
Jonathan Lipps e81d060287 get selendroid cert signing going 2013-04-11 13:35:24 -07:00
Jonathan Lipps 7b8f257b1a don't run fast reset if not set, and selendroid error handling 2013-04-11 13:35:24 -07:00
Jonathan Lipps 6b9bf2886d more series refactoring 2013-04-11 13:35:24 -07:00
Jonathan Lipps d4ca0e8d46 oops forgot to call back here 2013-04-11 13:35:24 -07:00
Jonathan Lipps c3e5745d0c more refactoring of adb 2013-04-11 13:35:23 -07:00
Jonathan Lipps c735dd4289 moar series refactorz 2013-04-11 13:35:23 -07:00
Jonathan Lipps 09b268063a well looks like i can't get _too_ elegant 2013-04-11 13:35:23 -07:00
Jonathan Lipps 0a40716f34 man were we doing it wrong with async, this feels so good 2013-04-11 13:35:23 -07:00
Jonathan Lipps c7dbf2b09a add concept of different system vs device ports 2013-04-11 13:35:23 -07:00
Jonathan Lipps aad0c35e97 wow this is the way to do async series! 2013-04-11 13:35:23 -07:00
Jonathan Lipps 9c8eeb3488 make it even more compact 2013-04-11 13:35:23 -07:00
Jonathan Lipps 204580f221 more async compactification 2013-04-11 13:35:22 -07:00
Jonathan Lipps a0e20265ba fix callback return error and prettify async series cb 2013-04-11 13:35:22 -07:00
Jonathan Lipps 67ee6a79b8 factor out device preparation logic so it can be reused 2013-04-11 13:35:22 -07:00
Jonathan Lipps fcb310b81c rename adb.start to adb.startAppium because there will be other kinds 2013-04-11 13:35:22 -07:00
Jonathan Lipps eec4122525 use camel case 2013-04-11 13:35:22 -07:00
Jonathan Lipps e59e703c0a get selendroid server built and ready to install 2013-04-11 13:35:22 -07:00
Jonathan Lipps 536243ae68 getting some of the test setup going for selendroid 2013-04-11 13:35:22 -07:00
Jonathan Lipps 43e3cfebcf stub out selendroid.js 2013-04-11 13:35:22 -07:00
Jonathan Lipps 7631fb7f75 reset.sh for selendroid 2013-04-11 13:35:22 -07:00
Jonathan Lipps 649599a96c add selendroid submodule 2013-04-11 13:35:22 -07:00
Jonathan Lipps e580ddd873 Merge pull request #431 from bootstraponline/update_jar
Update verify.jar to work on Java 6
2013-04-11 13:32:42 -07:00
bootstraponline 01d072dfe3 Update verify.jar to work on Java 6 2013-04-11 16:31:26 -04:00
Jason Carr fe0ce92434 Merge pull request #428 from jlipps/master
beefify installAndroidApp
2013-04-10 16:37:01 -07:00
Jonathan Lipps 7045a05f41 update installAndroidApp to first uninstall app (fix #424) 2013-04-10 16:35:33 -07:00
Jason Carr 4d0fcd1648 Merge pull request #427 from jlipps/master
android getCurrentActivity
2013-04-10 16:13:30 -07:00
Jonathan Lipps e4ef293581 enable getting current android activity (fixes #358) 2013-04-10 15:16:14 -07:00