5 new revisions:
Revision: e042dfca5584
Author: Jussi Malinen
Date: Wed Jun 15 12:29:41 2011
Log: link to log from report
http://code.google.com/p/robotframework/source/detail?r=e042dfca5584
Revision: 19f949cce356
Author: Jussi Malinen
Date: Wed Jun 15 12:29:51 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=19f949cce356
Revision: ca2c633612c8
Author: Jussi Malinen
Date: Wed Jun 15 12:47:14 2011
Log: replace for normalization did not work in safari and IE correctly.
http://code.google.com/p/robotframework/source/detail?r=ca2c633612c8
Revision: 9dda0cd2d289
Author: Jussi Malinen
Date: Wed Jun 15 13:18:16 2011
Log: fixed regular expression for matcher to work on safari and ie
http://code.google.com/p/robotframework/source/detail?r=9dda0cd2d289
Revision: 6b6b7cb195c3
Author: Jussi Malinen
Date: Wed Jun 15 13:19:33 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=6b6b7cb195c3
==============================================================================
Revision: e042dfca5584
Author: Jussi Malinen
Date: Wed Jun 15 12:29:41 2011
Log: link to log from report
http://code.google.com/p/robotframework/source/detail?r=e042dfca5584
Modified:
/src/robot/webcontent/report.html
=======================================
--- /src/robot/webcontent/report.html Wed Jun 15 05:36:56 2011
+++ /src/robot/webcontent/report.html Wed Jun 15 12:29:41 2011
@@ -70,7 +70,7 @@
});
function addSummary(topsuite) {
- $.tmpl(window.templates.summaryTable,
topsuite).insertAfter($('#header_div'));
+ $.tmpl(window.templates.summaryTable, topsuite,
{logURL:window.settings.logURL}).insertAfter($('#header_div'));
}
function showTotalsTab() {
@@ -335,6 +335,12 @@
<tr><th>Start Time:</th><td>${times.startTime}</td></tr>
<tr><th>End Time:</th><td>${times.endTime}</td></tr>
<tr><th>Elapsed Time:</th><td>${times.elapsedTime}</td></tr>
+ {{if $item.logURL}}
+ <tr>
+ <th></th>
+ <td><a href="${$item.logURL}">See log</a></td>
+ </tr>
+ {{/if}}
</table>
</script>
==============================================================================
Revision: 19f949cce356
Author: Jussi Malinen
Date: Wed Jun 15 12:29:51 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=19f949cce356
==============================================================================
Revision: ca2c633612c8
Author: Jussi Malinen
Date: Wed Jun 15 12:47:14 2011
Log: replace for normalization did not work in safari and IE correctly.
http://code.google.com/p/robotframework/source/detail?r=ca2c633612c8
Modified:
/src/robot/webcontent/util.js
=======================================
--- /src/robot/webcontent/util.js Fri Jun 10 00:56:00 2011
+++ /src/robot/webcontent/util.js Wed Jun 15 12:47:14 2011
@@ -42,7 +42,7 @@
}
function normalize(string) {
- return string.toLowerCase().replace(' ', '', 'g');
+ return string.toLowerCase().replace(/ /g, '');
}
function regexpEscape(string) {
==============================================================================
Revision: 9dda0cd2d289
Author: Jussi Malinen
Date: Wed Jun 15 13:18:16 2011
Log: fixed regular expression for matcher to work on safari and ie
http://code.google.com/p/robotframework/source/detail?r=9dda0cd2d289
Modified:
/src/robot/webcontent/log.html
/src/robot/webcontent/model.js
/src/robot/webcontent/report.html
/src/robot/webcontent/util.js
=======================================
--- /src/robot/webcontent/log.html Wed Jun 15 05:37:44 2011
+++ /src/robot/webcontent/log.html Wed Jun 15 13:18:16 2011
@@ -18,7 +18,7 @@
<script type="text/javascript" src="testdata.js"></script>
<script type="text/javascript" src="stats.js"></script>
-<title>[SUITE_NAME] Test Log</title>
+<title>SUITE_NAME Test Log</title>
</head>
<body>
<div class="header" id="header_div">
@@ -119,7 +119,7 @@
}
function setDocumentTitle(suite){
- document.title = document.title.replace("[SUITE_NAME]",
window.settings.title, "g");
+ document.title = document.title.replace("SUITE_NAME",
window.settings.title);
}
function initTemplates() {
=======================================
--- /src/robot/webcontent/model.js Mon Jun 13 01:30:29 2011
+++ /src/robot/webcontent/model.js Wed Jun 15 13:18:16 2011
@@ -133,7 +133,7 @@
var test = createModelObject(data);
test.fullname = data.parent.fullname + "." + test.name; // TODO:
is this used?, could be function also
test.parentName = function () {
- return data.parent.fullname.replace('.', ' . ', 'g') + ' . ';
// TODO: duplicate
+ return data.parent.fullname.replace(/./g, ' . ') + ' . '; //
TODO: duplicate
};
test.timeout = data.timeout;
test.populateKeywords = createIterablePopulator("Keyword");
=======================================
--- /src/robot/webcontent/report.html Wed Jun 15 12:29:41 2011
+++ /src/robot/webcontent/report.html Wed Jun 15 13:18:16 2011
@@ -17,7 +17,7 @@
<script type="text/javascript" src="testdata.js"></script>
<script type="text/javascript" src="stats.js"></script>
-<title>[SUITE_NAME] Test Report</title>
+<title>SUITE_NAME Test Report</title>
</head>
<body>
<div class="header" id="header_div">
@@ -246,7 +246,7 @@
}
function setDocumentTitle(suite){
- document.title = document.title.replace("[SUITE_NAME]",
window.settings.title, "g");
+ document.title = document.title.replace("SUITE_NAME",
window.settings.title);
}
// TODO: This is duplicated in log.html
=======================================
--- /src/robot/webcontent/util.js Wed Jun 15 12:47:14 2011
+++ /src/robot/webcontent/util.js Wed Jun 15 13:18:16 2011
@@ -51,7 +51,7 @@
function Matcher(pattern) {
pattern = normalize(regexpEscape(pattern));
- var rePattern = '^' +
pattern.replace('\\?', '.', 'g').replace('\\*', '.*', 'g') + '$'
+ var rePattern = '^' +
pattern.replace(/\\\?/g, ".").replace(/\\\*/gi, ".*") + '$';
var regexp = new RegExp(rePattern);
return {
matches: function (string) { return regexp.test(string); }
==============================================================================
Revision: 6b6b7cb195c3
Author: Jussi Malinen
Date: Wed Jun 15 13:19:33 2011
Log: Automated merge with https://robotframework.googlecode.com/hg/
http://code.google.com/p/robotframework/source/detail?r=6b6b7cb195c3
