Merge remote-tracking branch 'rtomac/master' into documentation-release

(Resolved) Conflicts:
	src/Selenium2Library/keywords/_element.py

Author: emanlove

.gitignore

@@ -1,5 +1,6 @@
 .project
 .pydevproject
+.idea
 test/results
 *.pyc
 *.orig

.travis.yml

@@ -14,9 +14,10 @@ before_script:
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
 script:
-  - "python test/run_tests.py python $BROWSER --noncritical ignore_${BROWSER}_error"
+  - "firefox --version"
+  - "python test/run_tests.py python $BROWSER --noncritical known_issue_-_travisci"
 env:
   matrix:
   - BROWSER=firefox
   #- BROWSER=ie # will be added when we have completed SauceLabs CI
-  #- BROWSER=safari # will be added after #247 merged
+  #- BROWSER=safari # will be added after #247 merged

BUILD.rst

@@ -37,6 +37,8 @@ tests with Robot Framework. This includes:
   `resources/testserver`
 - A collection of simple html files under 'resources/html' directory
 - Start-up scripts for executing the tests
+- A copy of statuschecker.py for checking logged messages after the
+  execution, which requires the tests to run with log level DEBUG
 
 To run unit and acceptance tests, run::
 

CHANGES.rst

@@ -1,6 +1,89 @@
 Release Notes
 =============
 
+1.7 (unreleased)
+----------------
+- Fixed ‘NoSuchWindowException' issue. Running keyword 'Select Window' after 'Close Window'
+  will trigger this issue if locator has prefix 'name=','title=' or 'url='. Also fixed same
+  issue for keywords 'Get Window Ids', 'Get Window Titles' and 'Get Window Names'.
+  [divfor]
+  
+- Corrected error message in new keyword 'Wait Until Element Is Not
+  Visible' to reflect element being visible instead of not visible.
+  [joepurdy]
+
+- Stop using private browsing with default Firefox profile.
+  [ombre42]
+
+- Added new keyword 'Wait Until Element Is Not Visible'.
+  [deiga]
+
+- Added new keyword 'Element Should Not Contain'.
+  [molsky]
+
+- Added new keyword 'Wait Until Page Does Not Contain Element'.
+  [molsky]
+
+- Added new locator strategy, scLocator, for finding SmartClient and SmartGWT elements.
+  [IlfirinPL]
+
+- Edited acceptance test scripts to automatically make known issues for the currently
+  known browser and python version noncritical. Also added a noncritical case to the
+  travis config for situations where testing is failing on travis for an unknown reason.
+- 'Capture Screenshot' now attempts to create its containing directory if the directory
+  specified in the filename does not exist.
+- 'Choose File' now fails if the file doesn't exist
+- Added new keywords 'Add Location Strategy' and 'Remove Location Strategy'
+  [zephraph]
+
+- Added 'Get Window Position' and 'Set Window Position' keywords matching the
+  Selenium functionality.
+  [ktarasz]
+
+1.6
+---
+- Added examples to 'Execute Javascript' and 'Execute Async Javascript'
+  keyword documentation.
+  [ombre42]
+
+- Added instructions to README.rst on how to manually install Selenium2Library.
+  [pekkaklarck]
+
+- Fixed issue where the browser failed to properly register if 'Open Browser'
+  did not complete.
+  [Mika Batsman][elizaleong][emanlove]
+
+- Added support for negative indices for rows and columns in table-related
+  keywords.
+  [eweitz]
+
+- Added strategy for locating elements by partial link text with locator
+  prefix 'partial link'.
+  [lina1]
+
+- Added new keyword 'Clear Element Text' for clearing the text of text entry
+  elements.
+  [emanlove]
+
+- Added new keyword 'Locator Should Match X Times' for validating number of
+  times a given locator appears.
+  [emanlove]
+
+- Fixed issue where 'Select Window’ with url strategy fails to locate window
+  [laulaz]
+
+- Fixed issue where a non-string assigned to window.id caused
+  'Select Window' and 'Get Window *' keywords to fail.
+  [ombre42]
+
+- Allow using key attributes (default strategy) when the locator contains
+  a '=' by using the prefix 'default='. Also make locator prefixes
+  space-insensitive.
+  [ombre42]
+
+A big thank you to [eweitz] and [HelioGuilherme66] for getting the
+continuous integration builds to go green by fixing internal tests.
+
 1.5
 ---
 - Copy Desired Capabilities before modifying to prevent affecting future
@@ -38,7 +121,7 @@ Release Notes
 - Raise exception in selecting non-existing item in list. Error handling varies
   between single-select and multi-select lists. See keyword documentation for
   more information.
-  [adwu73][emanlove] 
+  [adwu73][emanlove]
 
 - Added 'Get Window Size' and 'Set Window Size' keywords matching the
   Selenium functionality.
@@ -51,11 +134,11 @@ Release Notes
 
 - Beautified README.rst.
   [j1z0][emanlove]
-  
+
 - Changed press key test to use Line Feed (\10) instead of
   Carriage Return (\13).
   [emanlove]
- 
+
 - Added new keyword 'Click Element At Coordinates'.
   [aaltat][pierreroth64][ombre42][emanlove]
 
@@ -106,7 +189,7 @@ Release Notes
   [emanlove]
 
 - Use Selenium's Select class within Selenium2Library's "Select *" keywords.
-  Optimization of certain "Select *" keywords to increase performance. 
+  Optimization of certain "Select *" keywords to increase performance.
   [emanlove] [schminitz]
 
 - Replace maximize current browser window from JS to webdriver.

README.rst

@@ -11,25 +11,88 @@ Selenium 2 (WebDriver) library for Robot Framework
 Introduction
 ------------
 
-Selenium2Library is a web testing library for Robot Framework
+Selenium2Library is a web testing library for `Robot Framework`_
 that leverages the `Selenium 2 (WebDriver)`_ libraries from the
 Selenium_ project.
 
-It is modeled after (and forked from) the SeleniumLibrary_ library, 
+It is modeled after (and forked from) the SeleniumLibrary_ library,
 but re-implemented to use Selenium 2 and WebDriver technologies.
 
 - More information about this library can be found on the Wiki_ and in the `Keyword Documentation`_.
-- Installation information is found in the `INSTALL.rst` file.
-- Developer information is found in `BUILD.rst` file.
+- Installation information is found in the `INSTALL.rst`_ file.
+- Developer information is found in `BUILD.rst`_ file.
 
 
 Installation
 ------------
 
-You can install Selenium2Library using pip, with the following command
+Using ``pip``
+'''''''''''''
+
+The recommended installation method is using
+`pip <http://pip-installer.org>`__::
 
     pip install robotframework-selenium2library
 
+The main benefit of using ``pip`` is that it automatically installs all
+dependencies needed by the library. Other nice features are easy upgrading
+and support for un-installation::
+
+    pip install --upgrade robotframework-selenium2library
+    pip uninstall robotframework-selenium2library
+
+Notice that using ``--upgrade`` above updates both the library and all
+its dependencies to the latest version. If you want, you can also install
+a specific version or upgrade only the Selenium tool used by the library::
+
+    pip install robotframework-selenium2library==1.4.1
+    pip install --upgrade selenium
+    pip install selenium==2.34
+
+Proxy configuration
+'''''''''''''''''''
+
+If you are behind a proxy, you can use ``--proxy`` command line option
+or set ``http_proxy`` and/or ``https_proxy`` environment variables to
+configure ``pip`` to use it. If you are behind an authenticating NTLM proxy,
+you may want to consider installing `CNTML <http://cntlm.sourceforge.net>`__
+to handle communicating with it.
+
+For more information about ``--proxy`` option and using pip with proxies
+in general see:
+
+- http://pip-installer.org/en/latest/usage.html
+- http://stackoverflow.com/questions/9698557/how-to-use-pip-on-windows-behind-an-authenticating-proxy
+- http://stackoverflow.com/questions/14149422/using-pip-behind-a-proxy
+
+Manual installation
+'''''''''''''''''''
+
+If you do not have network connection or cannot make proxy to work, you need
+to resort to manual installation. This requires installing both the library
+and its dependencies yourself.
+
+1) Make sure you have `Robot Framework installed
+   <http://code.google.com/p/robotframework/wiki/Installation>`__.
+
+2) Download source distributions (``*.tar.gz``) for the library and its
+   dependencies:
+
+   - https://pypi.python.org/pypi/robotframework-selenium2library
+   - https://pypi.python.org/pypi/selenium
+   - https://pypi.python.org/pypi/decorator
+
+3) Extract each source distribution to a temporary location.
+
+4) Go each created directory from the command line and install each project
+   using::
+
+       python setup.py install
+
+If you are on Windows, and there are Windows installers available for
+certain projects, you can use them instead of source distributions.
+Just download 32bit or 64bit installer depending on your system,
+double-click it, and follow the instructions.
 
 Directory Layout
 ----------------
@@ -47,7 +110,7 @@ src/
 Usage
 -----
 
-To write tests with Robot Framework and Selenium2Library, 
+To write tests with Robot Framework and Selenium2Library,
 Selenium2Library must be imported into your Robot test suite.
 See `Robot Framework User Guide`_ for more information.
 
@@ -63,7 +126,7 @@ using Selenium2Library. To run the demo, run::
 E.g.::
 
 	python demo/rundemo.py demo/login_tests
-	
+
 Getting Help
 ------------
 The `user group for Robot Framework`_ is the best place to get help. Consider including in the post:
@@ -72,10 +135,13 @@ The `user group for Robot Framework`_ is the best place to get help. Consider in
 - Version number of Selenium2Library, Robot Framework, and Selenium
 - Traceback or other debug output containing error information
 
+.. _Robot Framework: http://robotframework.org
 .. _Selenium: http://selenium.openqa.org
 .. _Selenium 2 (WebDriver): http://seleniumhq.org/docs/03_webdriver.html
 .. _SeleniumLibrary: http://code.google.com/p/robotframework-seleniumlibrary/
 .. _Wiki: https://github.com/rtomac/robotframework-selenium2library/wiki
 .. _Keyword Documentation: http://rtomac.github.com/robotframework-selenium2library/doc/Selenium2Library.html
+.. _INSTALL.rst: https://github.com/rtomac/robotframework-selenium2library/blob/master/INSTALL.rst
+.. _BUILD.rst: https://github.com/rtomac/robotframework-selenium2library/blob/master/BUILD.rst
 .. _Robot Framework User Guide: http://code.google.com/p/robotframework/wiki/UserGuide
 .. _user group for Robot Framework: http://groups.google.com/group/robotframework-users