2 new revisions:
Revision: 2f8615778574
Author: Pekka Klärck
Date: Mon Jun 20 10:10:29 2011
Log: fixed sorting failed first
http://code.google.com/p/robotframework/source/detail?r=2f8615778574
Revision: 886eb7a1267c
Author: Pekka Klärck
Date: Mon Jun 20 10:32:45 2011
Log: report: consistent indentation and style cleanup
http://code.google.com/p/robotframework/source/detail?r=886eb7a1267c
==============================================================================
Revision: 2f8615778574
Author: Pekka Klärck
Date: Mon Jun 20 10:10:29 2011
Log: fixed sorting failed first
http://code.google.com/p/robotframework/source/detail?r=2f8615778574
Modified:
/src/robot/webcontent/report.html
=======================================
--- /src/robot/webcontent/report.html Mon Jun 20 04:33:57 2011
+++ /src/robot/webcontent/report.html Mon Jun 20 10:10:29 2011
@@ -200,7 +200,7 @@
function sort_failures_first(t1, t2) {
if (t1.status != t2.status)
- return t1.status == 'fail' ? -1 : 1;
+ return t1.status == 'FAIL' ? -1 : 1;
if (t1.isCritical != t2.isCritical)
return t1.isCritical ? -1 : 1;
return t1.fullname < t2.fullname ? -1 : 1;
==============================================================================
Revision: 886eb7a1267c
Author: Pekka Klärck
Date: Mon Jun 20 10:32:45 2011
Log: report: consistent indentation and style cleanup
http://code.google.com/p/robotframework/source/detail?r=886eb7a1267c
Modified:
/src/robot/webcontent/report.css
/src/robot/webcontent/report.html
=======================================
--- /src/robot/webcontent/report.css Wed Jun 15 03:44:59 2011
+++ /src/robot/webcontent/report.css Mon Jun 20 10:32:45 2011
@@ -1,4 +1,12 @@
-/* Generic Table Styles */
+/* Summary links */
+a.summary_fail {
+ color: red;
+ font-weight: bold;
+}
+a.summary_pass {
+ color: #009900;
+}
+/* Generic table styles */
table {
background: white;
border: 1px solid black;
@@ -6,69 +14,20 @@
empty-cells: show;
margin: 0px 1px;
}
-
th, td {
border: 1px solid black;
padding: 1px 5px;
}
-
th {
background: #C6C6C6;
color: black;
}
-
-/* Test detail tables */
-table#tests_by_suite, table#tests_detail_table {
- width: 100%;
-}
-
-.col_name {
- min-width: 13em;
- font-weight: bold;
- white-space: pre-wrap;
-}
-
-.col_doc {
- min-width: 13em;
- white-space: pre-wrap;
-}
-
-.col_tags {
- min-width: 10em;
- white-space: pre-wrap;
-}
-
-.col_crit {
- width: 2em;
- text-align: center;
-}
-
-.col_status {
- width: 3.5em;
- text-align: center;
-}
-
-.col_msg {
- min-width: 13em;
- white-space: pre-wrap;
-}
-
-.col_times {
- width: 9em;
- white-space: nowrap;
-}
-
-td.col_times {
- text-align: right;
-}
-
-/* Details Table */
+/* Summary and total/tag/suite details */
table.details {
clear: both;
width: 58em;
margin-bottom: 1em;
}
-
table.details th {
background: white;
width: 8em;
@@ -79,30 +38,25 @@
border: none;
padding: 2px 4px;
}
-
table.details td {
vertical-align: top;
border: none;
padding: 2px 4px;
white-space: pre-wrap;
}
-
-table.details .normal_whitespace {
- white-space: normal;
-}
-
-table.details #selector th, table.details #selector td {
+#selector th, #selector td {
padding-top: 0.5em;
padding-bottom: 1em;
}
-
+.normal_whitespace {
+ white-space: normal;
+}
/* Tabs - adapted from http://www.htmldog.com/articles/tabs */
#detail_tabs {
list-style: none;
padding: 0;
margin: 0px 1em;
}
-
#detail_tabs li {
float: left;
background: #C6C6C6;
@@ -112,33 +66,56 @@
padding-top: 0.1em;
border-radius: 3px 3px 0 0;
}
-
#detail_tabs li:hover {
background: yellow;
}
-
#detail_tabs li a {
color: black;
text-decoration: none;
font-weight: bold;
padding: 0 1em;
}
-
#detail_tabs li.tab_selected {
position: relative;
top: 1px;
background: white;
}
-
#detail_tabs li.tab_selected:hover {
background: white;
}
-
-a.status_fail {
- color: red;
+/* Test details table */
+table#test_details {
+ width: 100%;
+}
+.col_name {
+ min-width: 13em;
font-weight: bold;
-}
-
-a.status_pass {
- color: #009900;
-}
+ white-space: pre-wrap;
+}
+.col_doc {
+ min-width: 13em;
+ white-space: pre-wrap;
+}
+.col_tags {
+ min-width: 10em;
+ white-space: pre-wrap;
+}
+.col_crit {
+ width: 2em;
+ text-align: center;
+}
+.col_status {
+ width: 3.5em;
+ text-align: center;
+}
+.col_msg {
+ min-width: 13em;
+ white-space: pre-wrap;
+}
+.col_times {
+ width: 9em;
+ white-space: nowrap;
+}
+td.col_times {
+ text-align: right;
+}
=======================================
--- /src/robot/webcontent/report.html Mon Jun 20 10:10:29 2011
+++ /src/robot/webcontent/report.html Mon Jun 20 10:32:45 2011
@@ -240,7 +240,7 @@
return;
}
var elements = pop_upto(window.tasks, 50);
- $.tmpl('testDetailsTableRowTemplate', elements, {logURL:
window.settings.logURL}).appendTo('#tests_detail_table');
+ $.tmpl('testDetailsTableRowTemplate', elements, {logURL:
window.settings.logURL}).appendTo('#test_details');
if(window.tasks.length > 0)
setTimeout("iterateDetails()", 0);
}
@@ -258,29 +258,44 @@
<table class="details">
<tr>
<th>Status:</th>
- {{if criticalFailed}}
- <td><a class="status_fail" href="#total_Critical Tests"
onClick="totalDetailSelected('Critical Tests')">${criticalFailed} critical
test{{if criticalFailed != 1}}s{{/if}} failed</a></td>
- {{else}}
- <td><a class="status_pass" href="#total_Critical Tests"
onClick="totalDetailSelected('Critical Tests')">All critical tests
passed</a></td>
- {{/if}}
+ {{if criticalFailed}}
+ <td><a class="summary_fail" href="#total_Critical Tests"
onClick="totalDetailSelected('Critical Tests')">${criticalFailed} critical
test{{if criticalFailed != 1}}s{{/if}} failed</a></td>
+ {{else}}
+ <td><a class="summary_pass" href="#total_Critical Tests"
onClick="totalDetailSelected('Critical Tests')">All critical tests
passed</a></td>
+ {{/if}}
</tr>
{{if documentation}}
- <tr><th>Documentation:</th><td>{{html documentation}}</td></tr>
+ <tr>
+ <th>Documentation:</th>
+ <td>{{html documentation}}</td>
+ </tr>
{{/if}}
{{each metadata}}
- <tr><th>${$index}:</th><td>{{html $value}}</td></tr>
+ <tr>
+ <th>${$index}:</th>
+ <td>{{html $value}}</td>
+ </tr>
{{/each}}
{{if times.startTime() != 'N/A'}}
- <tr><th>Start Time:</th><td>${times.startTime}</td></tr>
+ <tr>
+ <th>Start Time:</th>
+ <td>${times.startTime}</td>
+ </tr>
{{/if}}
{{if times.endTime() != 'N/A'}}
- <tr><th>End Time:</th><td>${times.endTime}</td></tr>
+ <tr>
+ <th>End Time:</th>
+ <td>${times.endTime}</td>
+ </tr>
{{/if}}
- <tr><th>Elapsed Time:</th><td>${times.elapsedTime}</td></tr>
+ <tr>
+ <th>Elapsed Time:</th>
+ <td>${times.elapsedTime}</td>
+ </tr>
{{if $item.logURL}}
<tr>
- <th>Log File:</th>
- <td><a href="${$item.logURL}">${$item.logURL}</a></td>
+ <th>Log File:</th>
+ <td><a href="${$item.logURL}">${$item.logURL}</a></td>
</tr>
{{/if}}
</table>
@@ -382,72 +397,72 @@
</script>
<script type="text/x-jquery-tmpl" id="tagOrTotalDetailsTemplate">
- {{if doc}}
- <tr>
- <th>Documentation:</th>
- <td>{{html doc}}</td>
- </tr>
- {{/if}}
- {{if combined}}
- <tr>
- <th>Pattern:</th>
- <td>${combined}</td>
- </tr>
- {{/if}}
- {{if links}}{{if links.length}}
- <tr>
- <th>Links:</th>
- <td>{{each links}}<a href="${$value.url}"
title="${$value.url}">${$value.title}</a>{{/each}} </td>
- </tr>
- {{/if}}{{/if}}
- <tr>
- <th>Status:</th>
- <td>${total} total, ${pass} passed, {{if fail}}<span
class="fail">${fail} failed</span>{{else}}<span class="pass">0
failed</span>{{/if}}</td>
- </tr>
- <tr>
- <th>Total Time:</th>
- <td>${totalTime}</td>
- </tr>
+ {{if doc}}
+ <tr>
+ <th>Documentation:</th>
+ <td>{{html doc}}</td>
+ </tr>
+ {{/if}}
+ {{if combined}}
+ <tr>
+ <th>Pattern:</th>
+ <td>${combined}</td>
+ </tr>
+ {{/if}}
+ {{if links}}{{if links.length}}
+ <tr>
+ <th>Links:</th>
+ <td>{{each links}}<a href="${$value.url}"
title="${$value.url}">${$value.title}</a>{{/each}} </td>
+ </tr>
+ {{/if}}{{/if}}
+ <tr>
+ <th>Status:</th>
+ <td>${total} total, ${pass} passed, {{if fail}}<span
class="fail">${fail} failed</span>{{else}}<span class="pass">0
failed</span>{{/if}}</td>
+ </tr>
+ <tr>
+ <th>Total Time:</th>
+ <td>${totalTime}</td>
+ </tr>
</script>
<script type="text/x-jquery-tmpl" id="suiteDetailsTemplate">
- {{if $item.logURL}}
- <tr>
- <th>Log Link:</th>
- <td><a href="${$item.logURL}#suite_${fullname}"
title="${fullname}">${$item.logURL}#suite_${fullname} </a></td>
- </tr>
- {{/if}}
- {{if documentation}}
- <tr>
- <th>Documentation:</th>
- <td>{{html documentation}}</td>
- </tr>
- {{/if}}
- {{each metadata}}
- <tr><th>${$index}:</th><td>{{html $value}}</td></tr>
- {{/each}}
- <tr>
- <th>Status:</th>
- <td>{{tmpl($data) 'suiteStatusMessageTemplate'}}</td>
- </tr>
- {{if message}}
- <tr>
- <th>Message:</th>
- <td>${message}</td>
- </tr>
- {{/if}}
- <tr>
- <th>Start / End:</th>
- <td>${times.startTime} / ${times.endTime}</td>
- </tr>
- <tr>
- <th>Elapsed:</th>
- <td>${times.elapsedTime}</td>
- </tr>
+ {{if $item.logURL}}
+ <tr>
+ <th>Log Link:</th>
+ <td><a href="${$item.logURL}#suite_${fullname}"
title="${fullname}">${$item.logURL}#suite_${fullname} </a></td>
+ </tr>
+ {{/if}}
+ {{if documentation}}
+ <tr>
+ <th>Documentation:</th>
+ <td>{{html documentation}}</td>
+ </tr>
+ {{/if}}
+ {{each metadata}}
+ <tr><th>${$index}:</th><td>{{html $value}}</td></tr>
+ {{/each}}
+ <tr>
+ <th>Status:</th>
+ <td>{{tmpl($data) 'suiteStatusMessageTemplate'}}</td>
+ </tr>
+ {{if message}}
+ <tr>
+ <th>Message:</th>
+ <td>${message}</td>
+ </tr>
+ {{/if}}
+ <tr>
+ <th>Start / End:</th>
+ <td>${times.startTime} / ${times.endTime}</td>
+ </tr>
+ <tr>
+ <th>Elapsed:</th>
+ <td>${times.elapsedTime}</td>
+ </tr>
</script>
<script type="text/x-jquery-tmpl" id="testDetailsTableTemplate">
- <table id="tests_detail_table">
+ <table id="test_details">
<tr>
<th class="col_name">Name</th>
<th class="col_doc">Documentation</th>
