Merge branch 'danielalexiuc-master'

- Fixes #924
- Fixes #917
This commit is contained in:
Gregg Van Hove
2015-09-24 12:57:46 -07:00
2 changed files with 8 additions and 4 deletions
+4 -2
View File
@@ -65,8 +65,6 @@ jasmineRequire.HtmlReporter = function(j$) {
) )
); );
getContainer().appendChild(htmlReporterMain); getContainer().appendChild(htmlReporterMain);
symbols = find('.jasmine-symbol-summary');
}; };
var totalSpecsDefined; var totalSpecsDefined;
@@ -111,6 +109,10 @@ jasmineRequire.HtmlReporter = function(j$) {
specsExecuted++; specsExecuted++;
} }
if (!symbols){
symbols = find('.jasmine-symbol-summary');
}
symbols.appendChild(createDom('li', { symbols.appendChild(createDom('li', {
className: noExpectations(result) ? 'jasmine-empty' : 'jasmine-' + result.status, className: noExpectations(result) ? 'jasmine-empty' : 'jasmine-' + result.status,
id: 'spec_' + result.id, id: 'spec_' + result.id,
+4 -2
View File
@@ -36,8 +36,6 @@ jasmineRequire.HtmlReporter = function(j$) {
) )
); );
getContainer().appendChild(htmlReporterMain); getContainer().appendChild(htmlReporterMain);
symbols = find('.jasmine-symbol-summary');
}; };
var totalSpecsDefined; var totalSpecsDefined;
@@ -82,6 +80,10 @@ jasmineRequire.HtmlReporter = function(j$) {
specsExecuted++; specsExecuted++;
} }
if (!symbols){
symbols = find('.jasmine-symbol-summary');
}
symbols.appendChild(createDom('li', { symbols.appendChild(createDom('li', {
className: noExpectations(result) ? 'jasmine-empty' : 'jasmine-' + result.status, className: noExpectations(result) ? 'jasmine-empty' : 'jasmine-' + result.status,
id: 'spec_' + result.id, id: 'spec_' + result.id,