Skip to content
This repository was archived by the owner on Aug 20, 2024. It is now read-only.

Commit e1d01fe

Browse files
yanneyanne
committed
Updated to version 2.5
1 parent a3b1499 commit e1d01fe

File tree

2 files changed

+13
-29
lines changed

2 files changed

+13
-29
lines changed

‎doc/SeleniumLibrary.html

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
</head>
8787
<body>
8888
<h1>SeleniumLibrary</h1>
89-
<b>Version:</b> 2.5-SNAPSHOT<br>
89+
<b>Version:</b> 2.5<br>
9090
<b>Scope:</b> global<br>
9191
<b>Named arguments: </b>
9292
supported
@@ -209,7 +209,7 @@ <h2 id="importing">Importing</h2>
209209
<br />
210210
<span class="name">jar_path</span> is the absolute path to the selenium-server.jar file to be used by the library. If set, a custom, modified version can be started instead of the default one distributed with the library.<br />
211211
<br />
212-
<span class="name">run_on_failure</span> specifies the name of a SeleniumLibrary keyword to execute when another SeleniumLibrary keyword fails. By default <a href="#Capture Screenshot" class="name">Capture Screenshot</a> will be used to take a screenshot of the situation. Using any value that is not a keyword name will disable this feature altogether. See <a href="#Run On Failure" class="name">Run On Failure</a> keyword for more information about this functionality that was added in SeleniumLibrary 2.5.<br />
212+
<span class="name">run_on_failure</span> specifies the name of a SeleniumLibrary keyword to execute when another SeleniumLibrary keyword fails. By default <a href="#Capture Screenshot" class="name">Capture Screenshot</a> will be used to take a screenshot of the situation. Using any value that is not a keyword name will disable this feature altogether. See <a href="#Register Keyword To Run On Failure" class="name">Register Keyword To Run On Failure</a> keyword for more information about this functionality that was added in SeleniumLibrary 2.5.<br />
213213
<br />
214214
Because there are many optional arguments, it is often a good idea to use the handy named-arguments syntax supported by Robot Framework 2.5 and later. This is demonstrated by the last example below.<br />
215215
<br />
@@ -422,7 +422,7 @@ <h2>Shortcuts</h2>
422422
&nbsp;&middot;&nbsp;
423423
<a href="#Radio Button Should Not Be Selected" title="Verifies radio button group identified by `group_name` has no selection.">Radio&nbsp;Button&nbsp;Should&nbsp;Not&nbsp;Be&nbsp;Selected</a>
424424
&nbsp;&middot;&nbsp;
425-
<a href="#Run On Failure" title="Sets the keyword to execute when a SeleniumLibrary keyword fails.">Run&nbsp;On&nbsp;Failure</a>
425+
<a href="#Register Keyword To Run On Failure" title="Sets the keyword to execute when a SeleniumLibrary keyword fails.">Register&nbsp;Keyword&nbsp;To&nbsp;Run&nbsp;On&nbsp;Failure</a>
426426
&nbsp;&middot;&nbsp;
427427
<a href="#Select All From List" title="Selects all values from multi-select list identified by `id`.">Select&nbsp;All&nbsp;From&nbsp;List</a>
428428
&nbsp;&middot;&nbsp;
@@ -1431,11 +1431,11 @@ <h2>Keywords</h2>
14311431
<td class="doc">Verifies radio button group identified by <span class="name">group_name</span> has no selection.</td>
14321432
</tr>
14331433
<tr>
1434-
<td class="kw"><a name="Run On Failure"></a>Run On Failure</td>
1434+
<td class="kw"><a name="Register Keyword To Run On Failure"></a>Register Keyword To Run On Failure</td>
14351435
<td class="arg">keyword_name</td>
14361436
<td class="doc">Sets the keyword to execute when a SeleniumLibrary keyword fails.<br />
14371437
<br />
1438-
<span class="name">keyword_name</span> is the name of a SeleniumLibrary keyword that will be executed if another SeleniumLibrary keyword fails. The name is case but not space sensitive. &nbsp;If the name does not match any keyword, this functionality is disabled and nothing extra will be done in case of a failure.<br />
1438+
<span class="name">keyword_name</span> is the name of a SeleniumLibrary keyword that will be executed if another SeleniumLibrary keyword fails. It is not possible to use a keyword that requires arguments. The name is case but not space sensitive. If the name does not match any keyword, this functionality is disabled and nothing extra will be done in case of a failure.<br />
14391439
<br />
14401440
The initial keyword to use is set in <a href="#importing" class="name">importing</a>, and the keyword that is used by default is <a href="#Capture Screenshot" class="name">Capture Screenshot</a>. Taking a screenshot when something failed is a very useful feature, but notice that it can slow down the execution.<br />
14411441
<br />
@@ -1444,26 +1444,26 @@ <h2>Keywords</h2>
14441444
Examples:<br />
14451445
<table border="1" class="doc">
14461446
<tr>
1447-
<td>Run On Failure</td>
1447+
<td>Register Keyword To Run On Failure</td>
14481448
<td>Log Source</td>
14491449
<td># Run <a href="#Log Source" class="name">Log Source</a> on failure.</td>
14501450
<td></td>
14511451
</tr>
14521452
<tr>
14531453
<td>${previous kw}=</td>
1454-
<td>Run On Failure</td>
1454+
<td>Register Keyword To Run On Failure</td>
14551455
<td>Nothing</td>
1456-
<td># Disables run-on-failure functionalityi and store the previous kw name in a variable.</td>
1456+
<td># Disables run-on-failure functionality and stores the previous kw name in a variable.</td>
14571457
</tr>
14581458
<tr>
1459-
<td>Run On Failure</td>
1459+
<td>Register Keyword To Run On Failure</td>
14601460
<td>${previous kw}</td>
14611461
<td># Restore to the previous keyword.</td>
14621462
<td></td>
14631463
</tr>
14641464
</table>
14651465
<br />
1466-
The whole run-on-failure functionality is new in SeleniumLibrary 2.5.</td>
1466+
The whole run-on-failure functionality is new in SeleniumLibrary 2.5. It only works when running tests on Python/Jython 2.4 or newer and it does not work on IronPython at all.</td>
14671467
</tr>
14681468
<tr>
14691469
<td class="kw"><a name="Select All From List"></a>Select All From List</td>
@@ -1872,7 +1872,7 @@ <h2>Keywords</h2>
18721872
<br />
18731873
<span class="name">timeout</span> must given using Robot Framework time syntax, see <a href="http://robotframework.googlecode.com/svn/trunk/doc/userguide/RobotFrameworkUserGuide.html#time-format">http://robotframework.googlecode.com/svn/trunk/doc/userguide/RobotFrameworkUserGuide.html#time-format</a>.<br />
18741874
<br />
1875-
<span class="name">error</span> can be used to override the default error message. New in version 2.2.3.<br />
1875+
<span class="name">error</span> can be used to override the default error message.<br />
18761876
<br />
18771877
Robot Framework built-in keyword <span class="name">Wait Until Keyword Succeeds</span> can be used to get this kind of functionality for any Selenium keyword.</td>
18781878
</tr>
@@ -1885,8 +1885,6 @@ <h2>Keywords</h2>
18851885
<br />
18861886
<span class="name">error</span> can be used to override the default error message.<br />
18871887
<br />
1888-
This keyword was added in SeleniumLibrary 2.2.3.<br />
1889-
<br />
18901888
Robot Framework built-in keyword <span class="name">Wait Until Keyword Succeeds</span> can be used to get this kind of functionality for any Selenium keyword.</td>
18911889
</tr>
18921890
<tr>
@@ -1915,7 +1913,7 @@ <h2>Keywords</h2>
19151913
<p id="footer">
19161914
Altogether 119 keywords.<br />
19171915
Generated by <a href="http://code.google.com/p/robotframework/wiki/LibraryDocumentationTool">libdoc.py</a>
1918-
on 2010-11-16 12:11:15.
1916+
on 2010-11-16 15:15:33.
19191917
</p>
19201918
</body>
19211919
</html>

‎src/SeleniumLibrary/version.py

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1 @@
1-
# Copyright 2008-2010 Nokia Siemens Networks Oyj
2-
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
14-
15-
VERSION = '2.5-SNAPSHOT'
1+
VERSION = '2.5'

0 commit comments

Comments
 (0)