Permalink
Browse files

merged with upstream master

  • Loading branch information...
2 parents a7f5676 + 2ccf63c commit 612d8b9abc5f7de398e863998c73f62fc53e60dd Jari committed Sep 23, 2015
View
@@ -1,3 +1,4 @@
+__pycache__/
*.py[cod]
# C extensions
@@ -45,4 +46,4 @@ demo/test_doubandaily.txt
htmlcov/
run.sh
# for eclipse
-.settings
+.settings
View
@@ -1,5 +1,33 @@
History
=======
+1.3.4
+----------------
+- `hide_keyboard_set_selenium_final <https://github.com/jollychang/robotframework-appiumlibrary/pull/68>`
+1.3.3
+----------------
+- `'get element attribute' and 'element value should be' keywords added <https://github.com/jollychang/robotframework-appiumlibrary/pull/61>`
+- `Add Screen Orientation change <https://github.com/jollychang/robotframework-appiumlibrary/pull/60>`
+1.3.2
+----------------
+- `support css selector in web view <https://github.com/jollychang/robotframework-appiumlibrary/pull/59>`
+- `Selenium selector fix <https://github.com/jollychang/robotframework-appiumlibrary/pull/58>`
+1.3.1
+----------------
+- `Remove Application keyword added <https://github.com/jollychang/robotframework-appiumlibrary/pull/56>`
+1.3.0
+----------------
+- `Add iOS UI Automation and Android UI Automator locator strategies. <https://github.com/jollychang/robotframework-appiumlibrary/pull/55>`
+1.2.7
+----------------
+- `Update BuiltIn library reference for RF 2.9 compatibility <https://github.com/jollychang/robotframework-appiumlibrary/pull/52>`
+1.2.6
+----------------
+- limit version of robotframework
+- `Adding new wait keywords <https://github.com/jollychang/robotframework-appiumlibrary/pull/51>`
+1.2.5
+----------------
+- `Droid Utils: new file/folder handling methods <https://github.com/jollychang/robotframework-appiumlibrary/pull/31>`_
+- Hide Keyboard for Android
1.2.4
----------------
- fix sauceclient dependence
View
@@ -4,7 +4,7 @@ help:
@echo targes: version, generate_doc, pypi_upload, clean_pyc, andriod_demo, ios_demo, demo, unittest, test
generate_doc:
- VENV/bin/python -m robot.libdoc ./src/AppiumLibrary/ ./doc/AppimuLibrary.html
+ VENV/bin/python -m robot.libdoc ./src/AppiumLibrary/ ./doc/AppiumLibrary.html
update_github:
version=`python -c "import sys;sys.path.insert(0,'src');import AppiumLibrary;print AppiumLibrary.__version__"`
View
@@ -10,7 +10,10 @@ It uses `Appium <http://appium.io/>`_ (version 1.x) to communicate with Android
similar to how `Selenium WebDriver <http://seleniumhq.org/projects/webdriver/>`_ talks
to web browser.
-AppiumLibrary is modeled after (and forked from) `appiumandroidlibrary <https://github.com/frankbp/robotframework-appiumandroidlibrary>`_, but re-implemented to use appium 1.X technologies.
+AppiumLibrary is modeled after (and forked from) `appiumandroidlibrary <https://github.com/frankbp/robotframework-appiumandroidlibrary>`_, but re-implemented to use appium 1.X technologies.
+
+It support Python 2.x only.
+
Installation
------------
@@ -63,21 +66,28 @@ Documentation
-------------
The keyword documentation could be found at `Keyword Documentation
-<http://jollychang.github.io/robotframework-appiumlibrary/doc/AppimuLibrary.html>`_
+<http://jollychang.github.io/robotframework-appiumlibrary/doc/AppiumLibrary.html>`_
Contributing
-------------
Fork the project, make a change, and send a pull request!
+Project Contributors
+--------------------
+* `William Zhang <https://github.com/jollychang>`_
+* `Xie Lieping <https://github.com/frankbp>`_
+* `Jari Nurminen <https://github.com/yahman72>`_
+* `Serhat Bolsu <https://github.com/serhatbolsu>`_
+
-.. image:: https://pypip.in/v/robotframework-appiumlibrary/badge.png
+.. image:: https://img.shields.io/pypi/v/robotframework-appiumlibrary.svg
:target: https://pypi.python.org/pypi/robotframework-appiumlibrary/
:alt: Latest PyPI version
.. image:: https://travis-ci.org/jollychang/robotframework-appiumlibrary.svg?branch=master
:target: https://travis-ci.org/jollychang/robotframework-appiumlibrary
-.. image:: https://pypip.in/d/robotframework-appiumlibrary/badge.png
+.. image:: https://img.shields.io/pypi/dm/robotframework-appiumlibrary.svg
:target: https://pypi.python.org/pypi/robotframework-appiumlibrary/
:alt: Number of PyPI downloads
Binary file not shown.
@@ -6,12 +6,12 @@ ${REMOTE_URL} http://localhost:4723/wd/hub
${PLATFORM_NAME} Android
${PLATFORM_VERSION} 4.2.2
${DEVICE_NAME} Android Emulator
-${APP} /Users/jollychang/tmp/appium/sample-code/apps/ContactManager/ContactManager.apk
+${APP} ${CURDIR}/demoapp/ContactManager.apk
*** Keywords ***
add new contact
[Arguments] ${contact_name} ${contact_phone} ${contact_email}
- Open Application ${REMOTE_URL} platformName=platformVersion=4.2.2 deviceName=192.168.56.101:5555 app=${CURDIR}/demoapp/OrangeDemoApp.apk automationName=appium appPackage=com.netease.qa.orangedemo appActivity=MainActivity
+ Open Application ${REMOTE_URL} platformName=Android platformVersion=${PLATFORM_VERSION} deviceName=192.168.58.101:5555 app=${APP} automationName=appium appPackage=com.example.android.contactmanager
Click Element accessibility_id=Add Contact
Input Text id=com.example.android.contactmanager:id/contactNameEditText ${contact_name}
Input Text id=com.example.android.contactmanager:id/contactPhoneEditText ${contact_phone}
Oops, something went wrong.

0 comments on commit 612d8b9

Please sign in to comment.