Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update jasmine-html.js #29

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update jasmine-html.js #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 43 additions & 43 deletions test/lib/jasmine-2.3.4/jasmine-html.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ jasmineRequire.html = function(j$) {

jasmineRequire.HtmlReporter = function(j$) {

var noopTimer = {
let noopTimer = {
start: function() {},
elapsed: function() { return 0; }
};

function HtmlReporter(options) {
var env = options.env || {},
let env = options.env || {},
getContainer = options.getContainer,
createElement = options.createElement,
createTextNode = options.createTextNode,
Expand Down Expand Up @@ -69,15 +69,15 @@ jasmineRequire.HtmlReporter = function(j$) {
symbols = find('.symbol-summary');
};

var totalSpecsDefined;
let totalSpecsDefined;
this.jasmineStarted = function(options) {
totalSpecsDefined = options.totalSpecsDefined || 0;
timer.start();
};

var summary = createDom('div', {className: 'summary'});
let summary = createDom('div', {className: 'summary'});

var topResults = new j$.ResultsNode({}, '', null),
let topResults = new j$.ResultsNode({}, '', null),
currentParent = topResults;

this.suiteStarted = function(result) {
Expand All @@ -101,7 +101,7 @@ jasmineRequire.HtmlReporter = function(j$) {
currentParent.addChild(result, 'spec');
};

var failures = [];
let failures = [];
this.specDone = function(result) {
if(noExpectations(result) && typeof console !== 'undefined' && typeof console.error !== 'undefined') {
console.error('Spec \'' + result.fullName + '\' has no expectations.');
Expand All @@ -121,17 +121,17 @@ jasmineRequire.HtmlReporter = function(j$) {
if (result.status == 'failed') {
failureCount++;

var failure =
let failure =
createDom('div', {className: 'spec-detail failed'},
createDom('div', {className: 'description'},
createDom('a', {title: result.fullName, href: specHref(result)}, result.fullName)
),
createDom('div', {className: 'messages'})
);
var messages = failure.childNodes[1];
let messages = failure.childNodes[1];

for (var i = 0; i < result.failedExpectations.length; i++) {
var expectation = result.failedExpectations[i];
for (let i = 0; i < result.failedExpectations.length; i++) {
let expectation = result.failedExpectations[i];
messages.appendChild(createDom('div', {className: 'result-message'}, expectation.message));
messages.appendChild(createDom('div', {className: 'stack-trace'}, expectation.stack));
}
Expand All @@ -145,8 +145,8 @@ jasmineRequire.HtmlReporter = function(j$) {
};

this.jasmineDone = function() {
var banner = find('.banner');
var alert = find('.alert');
let banner = find('.banner');
let alert = find('.alert');
alert.appendChild(createDom('span', {className: 'duration'}, 'finished in ' + timer.elapsed() / 1000 + 's'));

banner.appendChild(
Expand All @@ -170,16 +170,16 @@ jasmineRequire.HtmlReporter = function(j$) {
)
));

var raiseCheckbox = find('#raise-exceptions');
let raiseCheckbox = find('#raise-exceptions');

raiseCheckbox.checked = !env.catchingExceptions();
raiseCheckbox.onclick = onRaiseExceptionsClick;

var throwCheckbox = find('#throw-failures');
let throwCheckbox = find('#throw-failures');
throwCheckbox.checked = env.throwingExpectationFailures();
throwCheckbox.onclick = onThrowExpectationsClick;

var optionsMenu = find('.run-options'),
let optionsMenu = find('.run-options'),
optionsTrigger = optionsMenu.querySelector('.trigger'),
optionsPayload = optionsMenu.querySelector('.payload'),
isOpen = /\bopen\b/;
Expand All @@ -193,15 +193,15 @@ jasmineRequire.HtmlReporter = function(j$) {
};

if (specsExecuted < totalSpecsDefined) {
var skippedMessage = 'Ran ' + specsExecuted + ' of ' + totalSpecsDefined + ' specs - run all';
let skippedMessage = 'Ran ' + specsExecuted + ' of ' + totalSpecsDefined + ' specs - run all';
alert.appendChild(
createDom('span', {className: 'bar skipped'},
createDom('a', {href: '?', title: 'Run all specs'}, skippedMessage)
)
);
}
var statusBarMessage = '';
var statusBarClassName = 'bar ';
let statusBarMessage = '';
let statusBarClassName = 'bar ';

if (totalSpecsDefined > 0) {
statusBarMessage += pluralize('spec', specsExecuted) + ', ' + pluralize('failure', failureCount);
Expand All @@ -215,25 +215,25 @@ jasmineRequire.HtmlReporter = function(j$) {
alert.appendChild(createDom('span', {className: statusBarClassName}, statusBarMessage));

for(i = 0; i < failedSuites.length; i++) {
var failedSuite = failedSuites[i];
for(var j = 0; j < failedSuite.failedExpectations.length; j++) {
var errorBarMessage = 'AfterAll ' + failedSuite.failedExpectations[j].message;
var errorBarClassName = 'bar errored';
let failedSuite = failedSuites[i];
for(let j = 0; j < failedSuite.failedExpectations.length; j++) {
let errorBarMessage = 'AfterAll ' + failedSuite.failedExpectations[j].message;
let errorBarClassName = 'bar errored';
alert.appendChild(createDom('span', {className: errorBarClassName}, errorBarMessage));
}
}

var results = find('.results');
let results = find('.results');
results.appendChild(summary);

summaryList(topResults, summary);

function summaryList(resultsTree, domParent) {
var specListNode;
for (var i = 0; i < resultsTree.children.length; i++) {
var resultNode = resultsTree.children[i];
let specListNode;
for (let i = 0; i < resultsTree.children.length; i++) {
let resultNode = resultsTree.children[i];
if (resultNode.type == 'suite') {
var suiteListNode = createDom('ul', {className: 'suite', id: 'suite-' + resultNode.result.id},
let suiteListNode = createDom('ul', {className: 'suite', id: 'suite-' + resultNode.result.id},
createDom('li', {className: 'suite-detail'},
createDom('a', {href: specHref(resultNode.result)}, resultNode.result.description)
)
Expand All @@ -247,7 +247,7 @@ jasmineRequire.HtmlReporter = function(j$) {
specListNode = createDom('ul', {className: 'specs'});
domParent.appendChild(specListNode);
}
var specDescription = resultNode.result.description;
let specDescription = resultNode.result.description;
if(noExpectations(resultNode.result)) {
specDescription = 'SPEC HAS NO EXPECTATIONS ' + specDescription;
}
Expand Down Expand Up @@ -300,18 +300,18 @@ jasmineRequire.HtmlReporter = function(j$) {

function clearPrior() {
// return the reporter
var oldReporter = find('');
let oldReporter = find('');

if(oldReporter) {
getContainer().removeChild(oldReporter);
}
}

function createDom(type, attrs, childrenVarArgs) {
var el = createElement(type);
let el = createElement(type);

for (var i = 2; i < arguments.length; i++) {
var child = arguments[i];
for (let i = 2; i < arguments.length; i++) {
let child = arguments[i];

if (typeof child === 'string') {
el.appendChild(createTextNode(child));
Expand All @@ -322,7 +322,7 @@ jasmineRequire.HtmlReporter = function(j$) {
}
}

for (var attr in attrs) {
for (let attr in attrs) {
if (attr == 'className') {
el[attr] = attrs[attr];
} else {
Expand All @@ -334,7 +334,7 @@ jasmineRequire.HtmlReporter = function(j$) {
}

function pluralize(singular, count) {
var word = (count == 1 ? singular : singular + 's');
let word = (count == 1 ? singular : singular + 's');

return '' + count + ' ' + word;
}
Expand Down Expand Up @@ -362,8 +362,8 @@ jasmineRequire.HtmlReporter = function(j$) {

jasmineRequire.HtmlSpecFilter = function() {
function HtmlSpecFilter(options) {
var filterString = options && options.filterString() && options.filterString().replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
var filterPattern = new RegExp(filterString);
let filterString = options && options.filterString() && options.filterString().replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
let filterPattern = new RegExp(filterString);

this.matches = function(specName) {
return filterPattern.test(specName);
Expand Down Expand Up @@ -401,7 +401,7 @@ jasmineRequire.QueryString = function() {
};

this.fullStringWithNewParam = function(key, value) {
var paramMap = queryStringToParamMap();
let paramMap = queryStringToParamMap();
paramMap[key] = value;
return toQueryString(paramMap);
};
Expand All @@ -413,23 +413,23 @@ jasmineRequire.QueryString = function() {
return this;

function toQueryString(paramMap) {
var qStrPairs = [];
for (var prop in paramMap) {
let qStrPairs = [];
for (let prop in paramMap) {
qStrPairs.push(encodeURIComponent(prop) + '=' + encodeURIComponent(paramMap[prop]));
}
return '?' + qStrPairs.join('&');
}

function queryStringToParamMap() {
var paramStr = options.getWindowLocation().search.substring(1),
let paramStr = options.getWindowLocation().search.substring(1),
params = [],
paramMap = {};

if (paramStr.length > 0) {
params = paramStr.split('&');
for (var i = 0; i < params.length; i++) {
var p = params[i].split('=');
var value = decodeURIComponent(p[1]);
for (let i = 0; i < params.length; i++) {
let p = params[i].split('=');
let value = decodeURIComponent(p[1]);
if (value === 'true' || value === 'false') {
value = JSON.parse(value);
}
Expand Down