diff --git a/.travis.yml b/.travis.yml index 99793b3..bd4cbad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ matrix: include: - os: osx env: TEST_SUITE=ios - osx_image: xcode8.3 + osx_image: xcode9 language: generic before_install: - brew update @@ -99,7 +99,7 @@ matrix: - TEST_SUITE=pc-browser language: python sudo: false - python: "3.5" + python: 3.5 addons: apt: packages: diff --git a/README.md b/README.md index ef51079..fdf86c6 100644 --- a/README.md +++ b/README.md @@ -9,18 +9,32 @@ ## Install -```shell -$ npm install -g macaca-cli macaca-electron +``` bash +$ npm install -g macaca-cli macaca-electron macaca-ios macaca-android $ pip install -r requirements.txt ``` ## Run test -```shell -$ macaca server +``` bash +$ macaca server --verbose $ python tests/macaca-desktop-sample.test.py +$ python tests/macaca-ios-sample.test.py +$ python tests/macaca-android-sample.test.py ``` + + +## Contributors + +|[
ziczhu](https://github.com/ziczhu)
|[
xudafeng](https://github.com/xudafeng)
+| :---: | :---: | + + +This project follows the git-contributor [spec](https://github.com/xudafeng/git-contributor), auto upated at `Tue Apr 17 2018 00:49:24 GMT+0800`. + + + ## License The MIT License (MIT) diff --git a/tests/macaca-android-sample.test.py b/tests/macaca-android-sample.test.py index 3a5f1ac..0beec22 100644 --- a/tests/macaca-android-sample.test.py +++ b/tests/macaca-android-sample.test.py @@ -52,6 +52,7 @@ def test_01_login(self): .elements_by_class_name('android.widget.EditText')[1] \ .send_keys('111111') + time.sleep(1) # self.driver.keys(Keys.ENTER.value + Keys.ESCAPE.value) self.driver \ @@ -78,15 +79,21 @@ def test_03_gesture(self): time.sleep(5) self.driver \ - .accept_alert() \ + .accept_alert() + + time.sleep(3) + + self.driver \ .back() - time.sleep(5) + time.sleep(3) self.driver \ .wait_for_element_by_name('Gesture') \ .click() + time.sleep(3) + self.driver \ .touch('tap', { 'x': 100, diff --git a/tests/macaca-ios-sample.test.py b/tests/macaca-ios-sample.test.py index 57d71f2..ecf97e3 100644 --- a/tests/macaca-ios-sample.test.py +++ b/tests/macaca-ios-sample.test.py @@ -12,6 +12,7 @@ 'app': 'https://npmcdn.com/ios-app-bootstrap@latest/build/ios-app-bootstrap.zip', } + server_url = { 'hostname': 'localhost', 'port': 3456 @@ -52,9 +53,10 @@ def test_01_login(self): .element_by_xpath('//XCUIElementTypeSecureTextField[1]') \ .send_keys('111111') \ + time.sleep(1) + self.driver \ - .element_by_name('Done') \ - .click() + .send_keys('\n') self.driver \ .element_by_name('Login') \