Skip to content

Commit

Permalink
updating changelog / py docs and bumping version numbers for 2.40
Browse files Browse the repository at this point in the history
  • Loading branch information
lukeis committed Feb 19, 2014
1 parent 4818887 commit 1a17c9e
Show file tree
Hide file tree
Showing 23 changed files with 169 additions and 122 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ <h1>Source code for selenium.webdriver.chrome.webdriver</h1><div class="highligh
<span class="k">try</span><span class="p">:</span>
<span class="n">RemoteWebDriver</span><span class="o">.</span><span class="n">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span>
<span class="n">command_executor</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">service</span><span class="o">.</span><span class="n">service_url</span><span class="p">,</span>
<span class="n">desired_capabilities</span><span class="o">=</span><span class="n">desired_capabilities</span><span class="p">)</span>
<span class="n">desired_capabilities</span><span class="o">=</span><span class="n">desired_capabilities</span><span class="p">,</span>
<span class="n">keep_alive</span><span class="o">=</span><span class="bp">True</span><span class="p">)</span>
<span class="k">except</span><span class="p">:</span>
<span class="bp">self</span><span class="o">.</span><span class="n">quit</span><span class="p">()</span>
<span class="k">raise</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ <h1>Source code for selenium.webdriver.common.desired_capabilities</h1><div clas

<div class="viewcode-block" id="DesiredCapabilities"><a class="viewcode-back" href="../../../../webdriver/selenium.webdriver.common.desired_capabilities.html#selenium.webdriver.common.desired_capabilities.DesiredCapabilities">[docs]</a><span class="k">class</span> <span class="nc">DesiredCapabilities</span><span class="p">(</span><span class="nb">object</span><span class="p">):</span>
<span class="sd">&quot;&quot;&quot;</span>
<span class="sd"> Set of supported desired capabilities.</span>
<span class="sd"> </span>
<span class="sd"> Set of default supported desired capabilities.</span>

<span class="sd"> Use this as a starting point for creating a desired capabilities object for </span>
<span class="sd"> requesting remote webdrivers from selenium server or selenium grid.</span>
<span class="sd"> requesting remote webdrivers for connecting to selenium server or selenium grid.</span>


<span class="sd"> Usage Example:</span>
Expand All @@ -81,14 +81,16 @@ <h1>Source code for selenium.webdriver.common.desired_capabilities</h1><div clas
<span class="sd"> selenium_grid_url = &quot;http://198.0.0.1:4444/wd/hub&quot;</span>

<span class="sd"> # Create a desired capabilities object as a starting point.</span>
<span class="sd"> capabilities = DesiredCapabilities.FIREFOX </span>
<span class="sd"> capabilities = DesiredCapabilities.FIREFOX.copy()</span>
<span class="sd"> capabilities[&#39;platform&#39;] = &quot;WINDOWS&quot;</span>
<span class="sd"> capabilities[&#39;version&#39;] = &quot;10&quot;</span>

<span class="sd"> # Instantiate an instance of Remote WebDriver with the desired capabilities.</span>
<span class="sd"> driver = webdriver.Remote(desired_capabilities=capabilities, </span>
<span class="sd"> command_executor=selenium_grid_url) </span>
<span class="sd"> command_executor=selenium_grid_url)</span>

<span class="sd"> Note: Always use &#39;.copy()&#39; on the DesiredCapabilities object to avoid the side</span>
<span class="sd"> effects of altering the Global class instance.</span>

<span class="sd"> &quot;&quot;&quot;</span>

Expand Down Expand Up @@ -160,7 +162,7 @@ <h1>Source code for selenium.webdriver.common.desired_capabilities</h1><div clas
<span class="s">&quot;platform&quot;</span><span class="p">:</span> <span class="s">&quot;ANDROID&quot;</span><span class="p">,</span>
<span class="s">&quot;javascriptEnabled&quot;</span><span class="p">:</span> <span class="bp">True</span><span class="p">,</span>
<span class="p">}</span>

<span class="n">PHANTOMJS</span> <span class="o">=</span> <span class="p">{</span>
<span class="s">&quot;browserName&quot;</span><span class="p">:</span><span class="s">&quot;phantomjs&quot;</span><span class="p">,</span>
<span class="s">&quot;version&quot;</span><span class="p">:</span> <span class="s">&quot;&quot;</span><span class="p">,</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ <h1>Source code for selenium.webdriver.firefox.extension_connection</h1><div cla
<span class="bp">self</span><span class="o">.</span><span class="n">binary</span><span class="o">.</span><span class="n">launch_browser</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">profile</span><span class="p">)</span>
<span class="n">_URL</span> <span class="o">=</span> <span class="s">&quot;http://</span><span class="si">%s</span><span class="s">:</span><span class="si">%d</span><span class="s">/hub&quot;</span> <span class="o">%</span> <span class="p">(</span><span class="n">HOST</span><span class="p">,</span> <span class="n">PORT</span><span class="p">)</span>
<span class="n">RemoteConnection</span><span class="o">.</span><span class="n">__init__</span><span class="p">(</span>
<span class="bp">self</span><span class="p">,</span> <span class="n">_URL</span><span class="p">)</span>
<span class="bp">self</span><span class="p">,</span> <span class="n">_URL</span><span class="p">,</span> <span class="n">keep_alive</span><span class="o">=</span><span class="bp">True</span><span class="p">)</span>

<div class="viewcode-block" id="ExtensionConnection.quit"><a class="viewcode-back" href="../../../../webdriver_firefox/selenium.webdriver.firefox.extension_connection.html#selenium.webdriver.firefox.extension_connection.ExtensionConnection.quit">[docs]</a> <span class="k">def</span> <span class="nf">quit</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">sessionId</span><span class="o">=</span><span class="bp">None</span><span class="p">):</span>
<span class="bp">self</span><span class="o">.</span><span class="n">execute</span><span class="p">(</span><span class="n">Command</span><span class="o">.</span><span class="n">QUIT</span><span class="p">,</span> <span class="p">{</span><span class="s">&#39;sessionId&#39;</span><span class="p">:</span><span class="n">sessionId</span><span class="p">})</span>
Expand All @@ -106,7 +106,8 @@ <h1>Source code for selenium.webdriver.firefox.extension_connection</h1><div cla
</div>
<div class="viewcode-block" id="ExtensionConnection.connect"><a class="viewcode-back" href="../../../../webdriver_firefox/selenium.webdriver.firefox.extension_connection.html#selenium.webdriver.firefox.extension_connection.ExtensionConnection.connect">[docs]</a> <span class="k">def</span> <span class="nf">connect</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
<span class="sd">&quot;&quot;&quot;Connects to the extension and retrieves the session id.&quot;&quot;&quot;</span>
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">execute</span><span class="p">(</span><span class="n">Command</span><span class="o">.</span><span class="n">NEW_SESSION</span><span class="p">,</span> <span class="p">{</span><span class="s">&#39;desiredCapabilities&#39;</span><span class="p">:</span> <span class="n">DesiredCapabilities</span><span class="o">.</span><span class="n">FIREFOX</span><span class="p">})</span>
<span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">execute</span><span class="p">(</span><span class="n">Command</span><span class="o">.</span><span class="n">NEW_SESSION</span><span class="p">,</span>
<span class="p">{</span><span class="s">&#39;desiredCapabilities&#39;</span><span class="p">:</span> <span class="n">DesiredCapabilities</span><span class="o">.</span><span class="n">FIREFOX</span><span class="p">})</span>
</div>
<span class="nd">@classmethod</span>
<div class="viewcode-block" id="ExtensionConnection.connect_and_quit"><a class="viewcode-back" href="../../../../webdriver_firefox/selenium.webdriver.firefox.extension_connection.html#selenium.webdriver.firefox.extension_connection.ExtensionConnection.connect_and_quit">[docs]</a> <span class="k">def</span> <span class="nf">connect_and_quit</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
Expand Down
Loading

0 comments on commit 1a17c9e

Please sign in to comment.