LukeIS: [python] adding phantomjs classes to be generated in the docs for next release, updating a few pydocs in phantomjs/service, updating changelog
git-svn-id: http://selenium.googlecode.com/svn/trunk/py@18156 07704840-8298-11de-bf8c-fd130f914ac9
diff --git a/CHANGES b/CHANGES
index 24d239d..465a768 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
+Selenium 2.27 (yet to be released)
+* Added support for phantomjs / ghostdriver
+
Selenium 2.26
* Added location_when_scrolled_into_view - Bug 4357
+* Added new expected_conditions support module to be used with WebDriverWait
Selenium 2.25
* Jython 2.7 Support - Bug 3988
diff --git a/docs/source/api.rst b/docs/source/api.rst
index 6ddb534..b41be5a 100644
--- a/docs/source/api.rst
+++ b/docs/source/api.rst
@@ -76,6 +76,16 @@
selenium.webdriver.ie.webdriver
+Webdriver.phantomjs
+-------------------
+
+.. currentmodule:: selenium.webdriver.phantomjs
+.. autosummary::
+ :toctree: webdriver_phantomjs
+
+ selenium.webdriver.phantomjs.service
+ selenium.webdriver.phantomjs.webdriver
+
Webdriver.remote
----------------
diff --git a/docs/source/webdriver_phantomjs/selenium.webdriver.phantomjs.service.rst b/docs/source/webdriver_phantomjs/selenium.webdriver.phantomjs.service.rst
new file mode 100644
index 0000000..8d6e5ff
--- /dev/null
+++ b/docs/source/webdriver_phantomjs/selenium.webdriver.phantomjs.service.rst
@@ -0,0 +1,4 @@
+selenium.webdriver.phantomjs.service
+====================================
+
+.. automodule:: selenium.webdriver.phantomjs.service
diff --git a/docs/source/webdriver_phantomjs/selenium.webdriver.phantomjs.webdriver.rst b/docs/source/webdriver_phantomjs/selenium.webdriver.phantomjs.webdriver.rst
new file mode 100644
index 0000000..5b3ab48
--- /dev/null
+++ b/docs/source/webdriver_phantomjs/selenium.webdriver.phantomjs.webdriver.rst
@@ -0,0 +1,4 @@
+selenium.webdriver.phantomjs.webdriver
+======================================
+
+.. automodule:: selenium.webdriver.phantomjs.webdriver
diff --git a/selenium/webdriver/phantomjs/service.py b/selenium/webdriver/phantomjs/service.py
index 31f66ef..3fc3c92 100644
--- a/selenium/webdriver/phantomjs/service.py
+++ b/selenium/webdriver/phantomjs/service.py
@@ -29,8 +29,11 @@
Creates a new instance of the Service
:Args:
- - executable_path : Path to the ChromeDriver
- - port : Port the service is running on """
+ - executable_path : Path to PhantomJS binary
+ - ghostdriver_path : Path to ghostdriver/src/main.js
+ - port : Port the service is running on
+ - service_args : A List of other command line options to pass to PhantomJS
+ """
self.port = port
self.path = executable_path
@@ -46,7 +49,7 @@
def start(self):
"""
- Starts the ChromeDriver Service.
+ Starts PhantomJS with GhostDriver.
:Exceptions:
- WebDriverException : Raised either when it can't start the service
