litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/theming

Browse source 
# Conflicts:
#	webapp/src/main/webapp/js/d3.min.js
This commit is contained in:
Graham Triggs 2017-04-30 19:31:41 +01:00
commit 5f0ef22ed1
606 changed files with 987 additions and 770 deletions
Download patch file Download diff file Expand all files Collapse all files

2
selenium/test-output/Command line suite/Command line test.html
View file

@ -188,4 +188,4 @@ Driver info: driver.version: unknown
<td>org.vivoweb.vivo.selenium.tests.RebuildSearchIndex@1cf56a1c</td></tr>
</table><p>
</body>
</html>
</html>

2
selenium/test-output/emailable-report.html
View file

@ -29,4 +29,4 @@ Driver info: driver.version: unknown
at &lt;anonymous class&gt;.DelayedCommand.prototype.executeInternal_/h(file:///var/folders/7d/pmw9wv8n4nz_x9t4ztp_6tgw0000gn/T/anonymous8499514178617750884webdriver-profile/extensions/fxdriver@googlecode.com/components/command-processor.js:12534)
at &lt;anonymous class&gt;.DelayedCommand.prototype.executeInternal_(file:///var/folders/7d/pmw9wv8n4nz_x9t4ztp_6tgw0000gn/T/anonymous8499514178617750884webdriver-profile/extensions/fxdriver@googlecode.com/components/command-processor.js:12539)
at &lt;anonymous class&gt;.DelayedCommand.prototype.execute/&lt;(file:///var/folders/7d/pmw9wv8n4nz_x9t4ztp_6tgw0000gn/T/anonymous8499514178617750884webdriver-profile/extensions/fxdriver@googlecode.com/components/command-processor.js:12481)
... Removed 46 stack frames</div></td></tr></table><p class="totop"><a href="#summary">back to summary</a></p></body></html>
... Removed 46 stack frames</div></td></tr></table><p class="totop"><a href="#summary">back to summary</a></p></body></html>

2
selenium/test-output/jquery-1.7.1.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
selenium/test-output/old/Command line suite/Command line test.properties
View file

@ -1 +1 @@
[SuiteResult context=Command line test]
[SuiteResult context=Command line test]

2
selenium/test-output/old/Command line suite/groups.html
View file

@ -1 +1 @@
<h2>Groups used for this test run</h2>
<h2>Groups used for this test run</h2>

2
selenium/test-output/old/Command line suite/methods-not-run.html
View file

@ -1,2 +1,2 @@
<h2>Methods that were not run</h2><table>
</table>
</table>

2
selenium/test-output/old/Command line suite/reporter-output.html
View file

@ -1 +1 @@
<h2>Reporter output</h2><table></table>
<h2>Reporter output</h2><table></table>

2
selenium/test-output/old/Command line suite/testng.xml.html
View file

@ -1 +1 @@
<html><head><title>testng.xml for Command line suite</title></head><body><tt>&lt;?xml&nbsp;version="1.0"&nbsp;encoding="UTF-8"?&gt;<br/>&lt;!DOCTYPE&nbsp;suite&nbsp;SYSTEM&nbsp;"http://testng.org/testng-1.0.dtd"&gt;<br/>&lt;suite&nbsp;name="Command&nbsp;line&nbsp;suite"&gt;<br/>&nbsp;&nbsp;&lt;test&nbsp;name="Command&nbsp;line&nbsp;test"&nbsp;preserve-order="false"&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&lt;classes&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;class&nbsp;name="org.vivoweb.vivo.selenium.tests.RebuildSearchIndex"/&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&lt;/classes&gt;<br/>&nbsp;&nbsp;&lt;/test&gt;&nbsp;&lt;!--&nbsp;Command&nbsp;line&nbsp;test&nbsp;--&gt;<br/>&nbsp;&nbsp;&lt;test&nbsp;name="Command&nbsp;line&nbsp;test(failed)"&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&lt;classes&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;class&nbsp;name="org.vivoweb.vivo.selenium.tests.RebuildSearchIndex"&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;methods&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;include&nbsp;name="cleanup"/&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;include&nbsp;name="rebuildSearchIndexTest"/&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;include&nbsp;name="vivoSetup"/&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;include&nbsp;name="setUp"/&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;include&nbsp;name="vivoTeardown"/&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;include&nbsp;name="setup"/&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;/methods&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;/class&gt;&nbsp;&lt;!--&nbsp;org.vivoweb.vivo.selenium.tests.RebuildSearchIndex&nbsp;--&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&lt;/classes&gt;<br/>&nbsp;&nbsp;&lt;/test&gt;&nbsp;&lt;!--&nbsp;Command&nbsp;line&nbsp;test(failed)&nbsp;--&gt;<br/>&lt;/suite&gt;&nbsp;&lt;!--&nbsp;Command&nbsp;line&nbsp;suite&nbsp;--&gt;<br/></tt></body></html>
<html><head><title>testng.xml for Command line suite</title></head><body><tt>&lt;?xml&nbsp;version="1.0"&nbsp;encoding="UTF-8"?&gt;<br/>&lt;!DOCTYPE&nbsp;suite&nbsp;SYSTEM&nbsp;"http://testng.org/testng-1.0.dtd"&gt;<br/>&lt;suite&nbsp;name="Command&nbsp;line&nbsp;suite"&gt;<br/>&nbsp;&nbsp;&lt;test&nbsp;name="Command&nbsp;line&nbsp;test"&nbsp;preserve-order="false"&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&lt;classes&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;class&nbsp;name="org.vivoweb.vivo.selenium.tests.RebuildSearchIndex"/&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&lt;/classes&gt;<br/>&nbsp;&nbsp;&lt;/test&gt;&nbsp;&lt;!--&nbsp;Command&nbsp;line&nbsp;test&nbsp;--&gt;<br/>&nbsp;&nbsp;&lt;test&nbsp;name="Command&nbsp;line&nbsp;test(failed)"&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&lt;classes&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;class&nbsp;name="org.vivoweb.vivo.selenium.tests.RebuildSearchIndex"&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;methods&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;include&nbsp;name="cleanup"/&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;include&nbsp;name="rebuildSearchIndexTest"/&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;include&nbsp;name="vivoSetup"/&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;include&nbsp;name="setUp"/&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;include&nbsp;name="vivoTeardown"/&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;include&nbsp;name="setup"/&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;/methods&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;/class&gt;&nbsp;&lt;!--&nbsp;org.vivoweb.vivo.selenium.tests.RebuildSearchIndex&nbsp;--&gt;<br/>&nbsp;&nbsp;&nbsp;&nbsp;&lt;/classes&gt;<br/>&nbsp;&nbsp;&lt;/test&gt;&nbsp;&lt;!--&nbsp;Command&nbsp;line&nbsp;test(failed)&nbsp;--&gt;<br/>&lt;/suite&gt;&nbsp;&lt;!--&nbsp;Command&nbsp;line&nbsp;suite&nbsp;--&gt;<br/></tt></body></html>

2
selenium/test-output/old/Command line suite/toc.html
View file

@ -27,4 +27,4 @@
</td></tr></table>
</td></tr><p/>
</table>
</body></html>
</body></html>