From 31d71ac22fd3e7e994e014229f83b96b81c9f8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20Bo=CC=88hm?= Date: Sun, 16 Feb 2014 23:28:20 +0100 Subject: [PATCH] add single quote check to jshint and fix src files for that [fixes #522] --- .jshintrc | 3 +- lib/console/console.js | 34 ++-- lib/jasmine-core/jasmine-html.js | 140 +++++++-------- lib/jasmine-core/jasmine.js | 208 +++++++++++----------- src/console/ConsoleReporter.js | 32 ++-- src/console/requireConsole.js | 2 +- src/core/Clock.js | 6 +- src/core/Env.js | 16 +- src/core/ExceptionFormatter.js | 4 +- src/core/Expectation.js | 4 +- src/core/ExpectationResult.js | 6 +- src/core/JsApiReporter.js | 2 +- src/core/ObjectContaining.js | 8 +- src/core/PrettyPrinter.js | 8 +- src/core/Spec.js | 10 +- src/core/SpyStrategy.js | 2 +- src/core/Suite.js | 2 +- src/core/base.js | 14 +- src/core/matchers/matchersUtil.js | 12 +- src/core/matchers/requireMatchers.js | 34 ++-- src/core/matchers/toBeNaN.js | 4 +- src/core/matchers/toHaveBeenCalled.js | 4 +- src/core/matchers/toHaveBeenCalledWith.js | 6 +- src/core/matchers/toThrow.js | 12 +- src/core/matchers/toThrowError.js | 50 +++--- src/core/requireCore.js | 2 +- src/html/HtmlReporter.js | 132 +++++++------- src/html/HtmlSpecFilter.js | 2 +- src/html/QueryString.js | 6 +- src/version.js | 2 +- 30 files changed, 384 insertions(+), 383 deletions(-) diff --git a/.jshintrc b/.jshintrc index 34974a4e..d540bf3d 100644 --- a/.jshintrc +++ b/.jshintrc @@ -4,5 +4,6 @@ "immed": true, "newcap": true, "trailing": true, - "loopfunc": true + "loopfunc": true, + "quotmark": "single" } \ No newline at end of file diff --git a/lib/console/console.js b/lib/console/console.js index 0a7dabf6..97821451 100644 --- a/lib/console/console.js +++ b/lib/console/console.js @@ -21,7 +21,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ function getJasmineRequireObj() { - if (typeof module !== "undefined" && module.exports) { + if (typeof module !== 'undefined' && module.exports) { return exports; } else { window.jasmineRequire = window.jasmineRequire || {}; @@ -60,7 +60,7 @@ getJasmineRequireObj().ConsoleReporter = function() { specCount = 0; failureCount = 0; pendingCount = 0; - print("Started"); + print('Started'); printNewline(); timer.start(); }; @@ -72,18 +72,18 @@ getJasmineRequireObj().ConsoleReporter = function() { } printNewline(); - var specCounts = specCount + " " + plural("spec", specCount) + ", " + - failureCount + " " + plural("failure", failureCount); + var specCounts = specCount + ' ' + plural('spec', specCount) + ', ' + + failureCount + ' ' + plural('failure', failureCount); if (pendingCount) { - specCounts += ", " + pendingCount + " pending " + plural("spec", pendingCount); + specCounts += ', ' + pendingCount + ' pending ' + plural('spec', pendingCount); } print(specCounts); printNewline(); var seconds = timer.elapsed() / 1000; - print("Finished in " + seconds + " " + plural("second", seconds)); + print('Finished in ' + seconds + ' ' + plural('second', seconds)); printNewline(); @@ -93,28 +93,28 @@ getJasmineRequireObj().ConsoleReporter = function() { this.specDone = function(result) { specCount++; - if (result.status == "pending") { + if (result.status == 'pending') { pendingCount++; - print(colored("yellow", "*")); + print(colored('yellow', '*')); return; } - if (result.status == "passed") { - print(colored("green", '.')); + if (result.status == 'passed') { + print(colored('green', '.')); return; } - if (result.status == "failed") { + if (result.status == 'failed') { failureCount++; failedSpecs.push(result); - print(colored("red", 'F')); + print(colored('red', 'F')); } }; return this; function printNewline() { - print("\n"); + print('\n'); } function colored(color, str) { @@ -122,7 +122,7 @@ getJasmineRequireObj().ConsoleReporter = function() { } function plural(str, count) { - return count == 1 ? str : str + "s"; + return count == 1 ? str : str + 's'; } function repeat(thing, times) { @@ -134,12 +134,12 @@ getJasmineRequireObj().ConsoleReporter = function() { } function indent(str, spaces) { - var lines = (str || '').split("\n"); + var lines = (str || '').split('\n'); var newArr = []; for (var i = 0; i < lines.length; i++) { - newArr.push(repeat(" ", spaces).join("") + lines[i]); + newArr.push(repeat(' ', spaces).join('') + lines[i]); } - return newArr.join("\n"); + return newArr.join('\n'); } function specFailureDetails(result) { diff --git a/lib/jasmine-core/jasmine-html.js b/lib/jasmine-core/jasmine-html.js index ae63fea7..74952879 100644 --- a/lib/jasmine-core/jasmine-html.js +++ b/lib/jasmine-core/jasmine-html.js @@ -49,20 +49,20 @@ jasmineRequire.HtmlReporter = function(j$) { symbols; this.initialize = function() { - htmlReporterMain = createDom("div", {className: "html-reporter"}, - createDom("div", {className: "banner"}, - createDom("span", {className: "title"}, "Jasmine"), - createDom("span", {className: "version"}, j$.version) + htmlReporterMain = createDom('div', {className: 'html-reporter'}, + createDom('div', {className: 'banner'}, + createDom('span', {className: 'title'}, 'Jasmine'), + createDom('span', {className: 'version'}, j$.version) ), - createDom("ul", {className: "symbol-summary"}), - createDom("div", {className: "alert"}), - createDom("div", {className: "results"}, - createDom("div", {className: "failures"}) + createDom('ul', {className: 'symbol-summary'}), + createDom('div', {className: 'alert'}), + createDom('div', {className: 'results'}, + createDom('div', {className: 'failures'}) ) ); getContainer().appendChild(htmlReporterMain); - symbols = find(".symbol-summary"); + symbols = find('.symbol-summary'); }; var totalSpecsDefined; @@ -71,13 +71,13 @@ jasmineRequire.HtmlReporter = function(j$) { timer.start(); }; - var summary = createDom("div", {className: "summary"}); + var summary = createDom('div', {className: 'summary'}); - var topResults = new j$.ResultsNode({}, "", null), + var topResults = new j$.ResultsNode({}, '', null), currentParent = topResults; this.suiteStarted = function(result) { - currentParent.addChild(result, "suite"); + currentParent.addChild(result, 'suite'); currentParent = currentParent.last(); }; @@ -90,82 +90,82 @@ jasmineRequire.HtmlReporter = function(j$) { }; this.specStarted = function(result) { - currentParent.addChild(result, "spec"); + currentParent.addChild(result, 'spec'); }; var failures = []; this.specDone = function(result) { - if (result.status != "disabled") { + if (result.status != 'disabled') { specsExecuted++; } - symbols.appendChild(createDom("li", { + symbols.appendChild(createDom('li', { className: result.status, - id: "spec_" + result.id, + id: 'spec_' + result.id, title: result.fullName } )); - if (result.status == "failed") { + if (result.status == 'failed') { failureCount++; var failure = - createDom("div", {className: "spec-detail failed"}, - createDom("div", {className: "description"}, - createDom("a", {title: result.fullName, href: specHref(result)}, result.fullName) + createDom('div', {className: 'spec-detail failed'}, + createDom('div', {className: 'description'}, + createDom('a', {title: result.fullName, href: specHref(result)}, result.fullName) ), - createDom("div", {className: "messages"}) + createDom('div', {className: 'messages'}) ); var messages = failure.childNodes[1]; for (var i = 0; i < result.failedExpectations.length; i++) { var expectation = result.failedExpectations[i]; - messages.appendChild(createDom("div", {className: "result-message"}, expectation.message)); - messages.appendChild(createDom("div", {className: "stack-trace"}, expectation.stack)); + messages.appendChild(createDom('div', {className: 'result-message'}, expectation.message)); + messages.appendChild(createDom('div', {className: 'stack-trace'}, expectation.stack)); } failures.push(failure); } - if (result.status == "pending") { + if (result.status == 'pending') { pendingSpecCount++; } }; this.jasmineDone = function() { - var banner = find(".banner"); - banner.appendChild(createDom("span", {className: "duration"}, "finished in " + timer.elapsed() / 1000 + "s")); + var banner = find('.banner'); + banner.appendChild(createDom('span', {className: 'duration'}, 'finished in ' + timer.elapsed() / 1000 + 's')); - var alert = find(".alert"); + var alert = find('.alert'); - alert.appendChild(createDom("span", { className: "exceptions" }, - createDom("label", { className: "label", 'for': "raise-exceptions" }, "raise exceptions"), - createDom("input", { - className: "raise", - id: "raise-exceptions", - type: "checkbox" + alert.appendChild(createDom('span', { className: 'exceptions' }, + createDom('label', { className: 'label', 'for': 'raise-exceptions' }, 'raise exceptions'), + createDom('input', { + className: 'raise', + id: 'raise-exceptions', + type: 'checkbox' }) )); - var checkbox = find("input"); + var checkbox = find('input'); checkbox.checked = !env.catchingExceptions(); checkbox.onclick = onRaiseExceptionsClick; if (specsExecuted < totalSpecsDefined) { - var skippedMessage = "Ran " + specsExecuted + " of " + totalSpecsDefined + " specs - run all"; + var skippedMessage = 'Ran ' + specsExecuted + ' of ' + totalSpecsDefined + ' specs - run all'; alert.appendChild( - createDom("span", {className: "bar skipped"}, - createDom("a", {href: "?", title: "Run all specs"}, skippedMessage) + createDom('span', {className: 'bar skipped'}, + createDom('a', {href: '?', title: 'Run all specs'}, skippedMessage) ) ); } - var statusBarMessage = "" + pluralize("spec", specsExecuted) + ", " + pluralize("failure", failureCount); - if (pendingSpecCount) { statusBarMessage += ", " + pluralize("pending spec", pendingSpecCount); } + var statusBarMessage = '' + pluralize('spec', specsExecuted) + ', ' + pluralize('failure', failureCount); + if (pendingSpecCount) { statusBarMessage += ', ' + pluralize('pending spec', pendingSpecCount); } - var statusBarClassName = "bar " + ((failureCount > 0) ? "failed" : "passed"); - alert.appendChild(createDom("span", {className: statusBarClassName}, statusBarMessage)); + var statusBarClassName = 'bar ' + ((failureCount > 0) ? 'failed' : 'passed'); + alert.appendChild(createDom('span', {className: statusBarClassName}, statusBarMessage)); - var results = find(".results"); + var results = find('.results'); results.appendChild(summary); summaryList(topResults, summary); @@ -174,27 +174,27 @@ jasmineRequire.HtmlReporter = function(j$) { var specListNode; for (var i = 0; i < resultsTree.children.length; i++) { var resultNode = resultsTree.children[i]; - if (resultNode.type == "suite") { - var suiteListNode = createDom("ul", {className: "suite", id: "suite-" + resultNode.result.id}, - createDom("li", {className: "suite-detail"}, - createDom("a", {href: specHref(resultNode.result)}, resultNode.result.description) + if (resultNode.type == 'suite') { + var suiteListNode = createDom('ul', {className: 'suite', id: 'suite-' + resultNode.result.id}, + createDom('li', {className: 'suite-detail'}, + createDom('a', {href: specHref(resultNode.result)}, resultNode.result.description) ) ); summaryList(resultNode, suiteListNode); domParent.appendChild(suiteListNode); } - if (resultNode.type == "spec") { - if (domParent.getAttribute("class") != "specs") { - specListNode = createDom("ul", {className: "specs"}); + if (resultNode.type == 'spec') { + if (domParent.getAttribute('class') != 'specs') { + specListNode = createDom('ul', {className: 'specs'}); domParent.appendChild(specListNode); } specListNode.appendChild( - createDom("li", { + createDom('li', { className: resultNode.result.status, - id: "spec-" + resultNode.result.id + id: 'spec-' + resultNode.result.id }, - createDom("a", {href: specHref(resultNode.result)}, resultNode.result.description) + createDom('a', {href: specHref(resultNode.result)}, resultNode.result.description) ) ); } @@ -203,24 +203,24 @@ jasmineRequire.HtmlReporter = function(j$) { if (failures.length) { alert.appendChild( - createDom('span', {className: "menu bar spec-list"}, - createDom("span", {}, "Spec List | "), - createDom('a', {className: "failures-menu", href: "#"}, "Failures"))); + createDom('span', {className: 'menu bar spec-list'}, + createDom('span', {}, 'Spec List | '), + createDom('a', {className: 'failures-menu', href: '#'}, 'Failures'))); alert.appendChild( - createDom('span', {className: "menu bar failure-list"}, - createDom('a', {className: "spec-list-menu", href: "#"}, "Spec List"), - createDom("span", {}, " | Failures "))); + createDom('span', {className: 'menu bar failure-list'}, + createDom('a', {className: 'spec-list-menu', href: '#'}, 'Spec List'), + createDom('span', {}, ' | Failures '))); - find(".failures-menu").onclick = function() { + find('.failures-menu').onclick = function() { setMenuModeTo('failure-list'); }; - find(".spec-list-menu").onclick = function() { + find('.spec-list-menu').onclick = function() { setMenuModeTo('spec-list'); }; setMenuModeTo('failure-list'); - var failureNode = find(".failures"); + var failureNode = find('.failures'); for (var i = 0; i < failures.length; i++) { failureNode.appendChild(failures[i]); } @@ -249,7 +249,7 @@ jasmineRequire.HtmlReporter = function(j$) { } for (var attr in attrs) { - if (attr == "className") { + if (attr == 'className') { el[attr] = attrs[attr]; } else { el.setAttribute(attr, attrs[attr]); @@ -260,17 +260,17 @@ jasmineRequire.HtmlReporter = function(j$) { } function pluralize(singular, count) { - var word = (count == 1 ? singular : singular + "s"); + var word = (count == 1 ? singular : singular + 's'); - return "" + count + " " + word; + return '' + count + ' ' + word; } function specHref(result) { - return "?spec=" + encodeURIComponent(result.fullName); + return '?spec=' + encodeURIComponent(result.fullName); } function setMenuModeTo(mode) { - htmlReporterMain.setAttribute("class", "html-reporter " + mode); + htmlReporterMain.setAttribute('class', 'html-reporter ' + mode); } } @@ -279,7 +279,7 @@ jasmineRequire.HtmlReporter = function(j$) { jasmineRequire.HtmlSpecFilter = function() { function HtmlSpecFilter(options) { - var filterString = options && options.filterString() && options.filterString().replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"); + var filterString = options && options.filterString() && options.filterString().replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&'); var filterPattern = new RegExp(filterString); this.matches = function(specName) { @@ -328,9 +328,9 @@ jasmineRequire.QueryString = function() { function toQueryString(paramMap) { var qStrPairs = []; for (var prop in paramMap) { - qStrPairs.push(encodeURIComponent(prop) + "=" + encodeURIComponent(paramMap[prop])); + qStrPairs.push(encodeURIComponent(prop) + '=' + encodeURIComponent(paramMap[prop])); } - return "?" + qStrPairs.join('&'); + return '?' + qStrPairs.join('&'); } function queryStringToParamMap() { @@ -343,7 +343,7 @@ jasmineRequire.QueryString = function() { for (var i = 0; i < params.length; i++) { var p = params[i].split('='); var value = decodeURIComponent(p[1]); - if (value === "true" || value === "false") { + if (value === 'true' || value === 'false') { value = JSON.parse(value); } paramMap[decodeURIComponent(p[0])] = value; diff --git a/lib/jasmine-core/jasmine.js b/lib/jasmine-core/jasmine.js index bb0c4fc5..a3fdbae0 100644 --- a/lib/jasmine-core/jasmine.js +++ b/lib/jasmine-core/jasmine.js @@ -21,7 +21,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ function getJasmineRequireObj() { - if (typeof module !== "undefined" && module.exports) { + if (typeof module !== 'undefined' && module.exports) { return exports; } else { window.jasmineRequire = window.jasmineRequire || {}; @@ -61,23 +61,23 @@ getJasmineRequireObj().core = function(jRequire) { getJasmineRequireObj().requireMatchers = function(jRequire, j$) { var availableMatchers = [ - "toBe", - "toBeCloseTo", - "toBeDefined", - "toBeFalsy", - "toBeGreaterThan", - "toBeLessThan", - "toBeNaN", - "toBeNull", - "toBeTruthy", - "toBeUndefined", - "toContain", - "toEqual", - "toHaveBeenCalled", - "toHaveBeenCalledWith", - "toMatch", - "toThrow", - "toThrowError" + 'toBe', + 'toBeCloseTo', + 'toBeDefined', + 'toBeFalsy', + 'toBeGreaterThan', + 'toBeLessThan', + 'toBeNaN', + 'toBeNull', + 'toBeTruthy', + 'toBeUndefined', + 'toContain', + 'toEqual', + 'toHaveBeenCalled', + 'toHaveBeenCalledWith', + 'toMatch', + 'toThrow', + 'toThrowError' ], matchers = {}; @@ -90,13 +90,13 @@ getJasmineRequireObj().requireMatchers = function(jRequire, j$) { }; getJasmineRequireObj().base = (function (jasmineGlobal) { - if (typeof module !== "undefined" && module.exports) { + if (typeof module !== 'undefined' && module.exports) { jasmineGlobal = global; } return function(j$) { j$.unimplementedMethod_ = function() { - throw new Error("unimplemented method"); + throw new Error('unimplemented method'); }; j$.MAX_PRETTY_PRINT_DEPTH = 40; @@ -113,15 +113,15 @@ getJasmineRequireObj().base = (function (jasmineGlobal) { }; j$.isArray_ = function(value) { - return j$.isA_("Array", value); + return j$.isA_('Array', value); }; j$.isString_ = function(value) { - return j$.isA_("String", value); + return j$.isA_('String', value); }; j$.isNumber_ = function(value) { - return j$.isA_("Number", value); + return j$.isA_('Number', value); }; j$.isA_ = function(typeName, value) { @@ -158,7 +158,7 @@ getJasmineRequireObj().base = (function (jasmineGlobal) { for (var prop in originalFn) { if (prop === 'and' || prop === 'calls') { - throw new Error("Jasmine spies would overwrite the 'and' and 'calls' properties on the object being spied upon"); + throw new Error('Jasmine spies would overwrite the \'and\' and \'calls\' properties on the object being spied upon'); } spy[prop] = originalFn[prop]; @@ -180,7 +180,7 @@ getJasmineRequireObj().base = (function (jasmineGlobal) { j$.createSpyObj = function(baseName, methodNames) { if (!j$.isArray_(methodNames) || methodNames.length === 0) { - throw "createSpyObj requires a non-empty array of method names to create spies for"; + throw 'createSpyObj requires a non-empty array of method names to create spies for'; } var obj = {}; for (var i = 0; i < methodNames.length; i++) { @@ -320,10 +320,10 @@ getJasmineRequireObj().Spec = function(j$) { } self.addExpectationResult(false, { - matcherName: "", + matcherName: '', passed: false, - expected: "", - actual: "", + expected: '', + actual: '', error: e }); } @@ -366,7 +366,7 @@ getJasmineRequireObj().Spec = function(j$) { return this.getSpecName(this); }; - Spec.pendingSpecExceptionMessage = "=> marked Pending"; + Spec.pendingSpecExceptionMessage = '=> marked Pending'; Spec.isPendingSpecException = function(e) { return !!(e && e.toString && e.toString().indexOf(Spec.pendingSpecExceptionMessage) !== -1); @@ -375,7 +375,7 @@ getJasmineRequireObj().Spec = function(j$) { return Spec; }; -if (typeof window == void 0 && typeof exports == "object") { +if (typeof window == void 0 && typeof exports == 'object') { exports.Spec = jasmineRequire.Spec; } @@ -402,12 +402,12 @@ getJasmineRequireObj().Env = function(j$) { var currentSuite = null; var reporter = new j$.ReportDispatcher([ - "jasmineStarted", - "jasmineDone", - "suiteStarted", - "suiteDone", - "specStarted", - "specDone" + 'jasmineStarted', + 'jasmineDone', + 'suiteStarted', + 'suiteDone', + 'specStarted', + 'specDone' ]); this.specFilter = function() { @@ -561,7 +561,7 @@ getJasmineRequireObj().Env = function(j$) { this.spyOn = function(obj, methodName) { if (j$.util.isUndefined(obj)) { - throw new Error("spyOn could not find an object to spy upon for " + methodName + "()"); + throw new Error('spyOn could not find an object to spy upon for ' + methodName + '()'); } if (j$.util.isUndefined(obj[methodName])) { @@ -619,7 +619,7 @@ getJasmineRequireObj().Env = function(j$) { } if (declarationError) { - this.it("encountered a declaration exception", function() { + this.it('encountered a declaration exception', function() { throw declarationError; }); } @@ -726,7 +726,7 @@ getJasmineRequireObj().JsApiReporter = function() { function JsApiReporter(options) { var timer = options.timer || noopTimer, - status = "loaded"; + status = 'loaded'; this.started = false; this.finished = false; @@ -913,7 +913,7 @@ getJasmineRequireObj().Clock = function() { self.setTimeout = function(fn, delay, params) { if (legacyIE()) { if (arguments.length > 2) { - throw new Error("IE < 9 cannot support extra params to setTimeout without a polyfill"); + throw new Error('IE < 9 cannot support extra params to setTimeout without a polyfill'); } return timer.setTimeout(fn, delay); } @@ -923,7 +923,7 @@ getJasmineRequireObj().Clock = function() { self.setInterval = function(fn, delay, params) { if (legacyIE()) { if (arguments.length > 2) { - throw new Error("IE < 9 cannot support extra params to setInterval without a polyfill"); + throw new Error('IE < 9 cannot support extra params to setInterval without a polyfill'); } return timer.setInterval(fn, delay); } @@ -942,7 +942,7 @@ getJasmineRequireObj().Clock = function() { if (installed) { delayedFunctionScheduler.tick(millis); } else { - throw new Error("Mock clock is not installed, use jasmine.clock().install()"); + throw new Error('Mock clock is not installed, use jasmine.clock().install()'); } }; @@ -1141,11 +1141,11 @@ getJasmineRequireObj().ExceptionFormatter = function() { } if (error.fileName || error.sourceURL) { - message += " in " + (error.fileName || error.sourceURL); + message += ' in ' + (error.fileName || error.sourceURL); } if (error.line || error.lineNumber) { - message += " (line " + (error.line || error.lineNumber) + ")"; + message += ' (line ' + (error.line || error.lineNumber) + ')'; } return message; @@ -1179,7 +1179,7 @@ getJasmineRequireObj().Expectation = function() { return function() { var args = Array.prototype.slice.call(arguments, 0), expected = args.slice(0), - message = ""; + message = ''; args.unshift(this.actual); @@ -1204,7 +1204,7 @@ getJasmineRequireObj().Expectation = function() { args.unshift(name); message = this.util.buildFailureMessage.apply(null, args); } else { - if (Object.prototype.toString.apply(result.message) === "[object Function]") { + if (Object.prototype.toString.apply(result.message) === '[object Function]') { message = result.message(); } else { message = result.message; @@ -1284,18 +1284,18 @@ getJasmineRequireObj().buildExpectationResult = function() { function message() { if (options.passed) { - return "Passed."; + return 'Passed.'; } else if (options.message) { return options.message; } else if (options.error) { return messageFormatter(options.error); } - return ""; + return ''; } function stack() { if (options.passed) { - return ""; + return ''; } var error = options.error; @@ -1320,7 +1320,7 @@ getJasmineRequireObj().ObjectContaining = function(j$) { } ObjectContaining.prototype.jasmineMatches = function(other, mismatchKeys, mismatchValues) { - if (typeof(this.sample) !== "object") { throw new Error("You must provide an object to objectContaining, not '"+this.sample+"'."); } + if (typeof(this.sample) !== 'object') { throw new Error('You must provide an object to objectContaining, not \''+this.sample+'\'.'); } mismatchKeys = mismatchKeys || []; mismatchValues = mismatchValues || []; @@ -1331,10 +1331,10 @@ getJasmineRequireObj().ObjectContaining = function(j$) { for (var property in this.sample) { if (!hasKey(other, property) && hasKey(this.sample, property)) { - mismatchKeys.push("expected has key '" + property + "', but missing from actual."); + mismatchKeys.push('expected has key \'' + property + '\', but missing from actual.'); } else if (!j$.matchersUtil.equals(this.sample[property], other[property])) { - mismatchValues.push("'" + property + "' was '" + (other[property] ? j$.util.htmlEscape(other[property].toString()) : other[property]) + "' in actual, but was '" + (this.sample[property] ? j$.util.htmlEscape(this.sample[property].toString()) : this.sample[property]) + "' in expected."); + mismatchValues.push('\'' + property + '\' was \'' + (other[property] ? j$.util.htmlEscape(other[property].toString()) : other[property]) + '\' in actual, but was \'' + (this.sample[property] ? j$.util.htmlEscape(this.sample[property].toString()) : this.sample[property]) + '\' in expected.'); } } @@ -1342,7 +1342,7 @@ getJasmineRequireObj().ObjectContaining = function(j$) { }; ObjectContaining.prototype.jasmineToString = function() { - return ""; + return ''; }; return ObjectContaining; @@ -1370,7 +1370,7 @@ getJasmineRequireObj().pp = function(j$) { } else if (typeof value === 'string') { this.emitString(value); } else if (j$.isSpy(value)) { - this.emitScalar("spy on " + value.and.identity()); + this.emitScalar('spy on ' + value.and.identity()); } else if (value instanceof RegExp) { this.emitScalar(value.toString()); } else if (typeof value === 'function') { @@ -1424,12 +1424,12 @@ getJasmineRequireObj().pp = function(j$) { }; StringPrettyPrinter.prototype.emitString = function(value) { - this.append("'" + value + "'"); + this.append('\'' + value + '\''); }; StringPrettyPrinter.prototype.emitArray = function(array) { if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) { - this.append("Array"); + this.append('Array'); return; } @@ -1445,7 +1445,7 @@ getJasmineRequireObj().pp = function(j$) { StringPrettyPrinter.prototype.emitObject = function(obj) { if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) { - this.append("Object"); + this.append('Object'); return; } @@ -1591,7 +1591,7 @@ getJasmineRequireObj().SpyStrategy = function() { function SpyStrategy(options) { options = options || {}; - var identity = options.name || "unknown", + var identity = options.name || 'unknown', originalFn = options.fn || function() {}, getSpy = options.getSpy || function() {}, plan = function() {}; @@ -1725,7 +1725,7 @@ getJasmineRequireObj().Suite = function() { return Suite; }; -if (typeof window == void 0 && typeof exports == "object") { +if (typeof window == void 0 && typeof exports == 'object') { exports.Suite = jasmineRequire.Suite; } @@ -1765,7 +1765,7 @@ getJasmineRequireObj().matchersUtil = function(j$) { contains: function(haystack, needle, customTesters) { customTesters = customTesters || []; - if (Object.prototype.toString.apply(haystack) === "[object Array]") { + if (Object.prototype.toString.apply(haystack) === '[object Array]') { for (var i = 0; i < haystack.length; i++) { if (eq(haystack[i], needle, [], [], customTesters)) { return true; @@ -1784,21 +1784,21 @@ getJasmineRequireObj().matchersUtil = function(j$) { expected = args.slice(3), englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); }); - var message = "Expected " + + var message = 'Expected ' + j$.pp(actual) + - (isNot ? " not " : " ") + + (isNot ? ' not ' : ' ') + englishyPredicate; if (expected.length > 0) { for (var i = 0; i < expected.length; i++) { if (i > 0) { - message += ","; + message += ','; } - message += " " + j$.pp(expected[i]); + message += ' ' + j$.pp(expected[i]); } } - return message + "."; + return message + '.'; } }; @@ -2035,9 +2035,9 @@ getJasmineRequireObj().toBeNaN = function(j$) { }; if (result.pass) { - result.message = "Expected actual not to be NaN."; + result.message = 'Expected actual not to be NaN.'; } else { - result.message = function() { return "Expected " + j$.pp(actual) + " to be NaN."; }; + result.message = function() { return 'Expected ' + j$.pp(actual) + ' to be NaN.'; }; } return result; @@ -2149,8 +2149,8 @@ getJasmineRequireObj().toHaveBeenCalled = function(j$) { result.pass = actual.calls.any(); result.message = result.pass ? - "Expected spy " + actual.and.identity() + " not to have been called." : - "Expected spy " + actual.and.identity() + " to have been called."; + 'Expected spy ' + actual.and.identity() + ' not to have been called.' : + 'Expected spy ' + actual.and.identity() + ' to have been called.'; return result; } @@ -2175,15 +2175,15 @@ getJasmineRequireObj().toHaveBeenCalledWith = function(j$) { } if (!actual.calls.any()) { - result.message = function() { return "Expected spy " + actual.and.identity() + " to have been called with " + j$.pp(expectedArgs) + " but it was never called."; }; + result.message = function() { return 'Expected spy ' + actual.and.identity() + ' to have been called with ' + j$.pp(expectedArgs) + ' but it was never called.'; }; return result; } if (util.contains(actual.calls.allArgs(), expectedArgs)) { result.pass = true; - result.message = function() { return "Expected spy " + actual.and.identity() + " not to have been called with " + j$.pp(expectedArgs) + " but it was."; }; + result.message = function() { return 'Expected spy ' + actual.and.identity() + ' not to have been called with ' + j$.pp(expectedArgs) + ' but it was.'; }; } else { - result.message = function() { return "Expected spy " + actual.and.identity() + " to have been called with " + j$.pp(expectedArgs) + " but actual calls were " + j$.pp(actual.calls.allArgs()).replace(/^\[ | \]$/g, '') + "."; }; + result.message = function() { return 'Expected spy ' + actual.and.identity() + ' to have been called with ' + j$.pp(expectedArgs) + ' but actual calls were ' + j$.pp(actual.calls.allArgs()).replace(/^\[ | \]$/g, '') + '.'; }; } return result; @@ -2220,8 +2220,8 @@ getJasmineRequireObj().toThrow = function(j$) { threw = false, thrown; - if (typeof actual != "function") { - throw new Error("Actual is not a Function"); + if (typeof actual != 'function') { + throw new Error('Actual is not a Function'); } try { @@ -2232,22 +2232,22 @@ getJasmineRequireObj().toThrow = function(j$) { } if (!threw) { - result.message = "Expected function to throw an exception."; + result.message = 'Expected function to throw an exception.'; return result; } if (arguments.length == 1) { result.pass = true; - result.message = function() { return "Expected function not to throw, but it threw " + j$.pp(thrown) + "."; }; + result.message = function() { return 'Expected function not to throw, but it threw ' + j$.pp(thrown) + '.'; }; return result; } if (util.equals(thrown, expected)) { result.pass = true; - result.message = function() { return "Expected function not to throw " + j$.pp(expected) + "."; }; + result.message = function() { return 'Expected function not to throw ' + j$.pp(expected) + '.'; }; } else { - result.message = function() { return "Expected function to throw " + j$.pp(expected) + ", but it threw " + j$.pp(thrown) + "."; }; + result.message = function() { return 'Expected function to throw ' + j$.pp(expected) + ', but it threw ' + j$.pp(thrown) + '.'; }; } return result; @@ -2272,8 +2272,8 @@ getJasmineRequireObj().toThrowError = function(j$) { name, constructorName; - if (typeof actual != "function") { - throw new Error("Actual is not a Function"); + if (typeof actual != 'function') { + throw new Error('Actual is not a Function'); } extractExpectedParams.apply(null, arguments); @@ -2286,17 +2286,17 @@ getJasmineRequireObj().toThrowError = function(j$) { } if (!threw) { - fail.message = "Expected function to throw an Error."; + fail.message = 'Expected function to throw an Error.'; return fail; } if (!(thrown instanceof Error)) { - fail.message = function() { return "Expected function to throw an Error, but it threw " + j$.pp(thrown) + "."; }; + fail.message = function() { return 'Expected function to throw an Error, but it threw ' + j$.pp(thrown) + '.'; }; return fail; } if (arguments.length == 1) { - pass.message = "Expected function not to throw an Error, but it threw " + fnNameFor(thrown) + "."; + pass.message = 'Expected function not to throw an Error, but it threw ' + fnNameFor(thrown) + '.'; return pass; } @@ -2307,54 +2307,54 @@ getJasmineRequireObj().toThrowError = function(j$) { if (errorType && message) { if (thrown.constructor == errorType && util.equals(thrown.message, message)) { - pass.message = function() { return "Expected function not to throw " + name + " with message " + j$.pp(message) + "."; }; + pass.message = function() { return 'Expected function not to throw ' + name + ' with message ' + j$.pp(message) + '.'; }; return pass; } else { - fail.message = function() { return "Expected function to throw " + name + " with message " + j$.pp(message) + - ", but it threw " + constructorName + " with message " + j$.pp(thrown.message) + "."; }; + fail.message = function() { return 'Expected function to throw ' + name + ' with message ' + j$.pp(message) + + ', but it threw ' + constructorName + ' with message ' + j$.pp(thrown.message) + '.'; }; return fail; } } if (errorType && regexp) { if (thrown.constructor == errorType && regexp.test(thrown.message)) { - pass.message = function() { return "Expected function not to throw " + name + " with message matching " + j$.pp(regexp) + "."; }; + pass.message = function() { return 'Expected function not to throw ' + name + ' with message matching ' + j$.pp(regexp) + '.'; }; return pass; } else { - fail.message = function() { return "Expected function to throw " + name + " with message matching " + j$.pp(regexp) + - ", but it threw " + constructorName + " with message " + j$.pp(thrown.message) + "."; }; + fail.message = function() { return 'Expected function to throw ' + name + ' with message matching ' + j$.pp(regexp) + + ', but it threw ' + constructorName + ' with message ' + j$.pp(thrown.message) + '.'; }; return fail; } } if (errorType) { if (thrown.constructor == errorType) { - pass.message = "Expected function not to throw " + name + "."; + pass.message = 'Expected function not to throw ' + name + '.'; return pass; } else { - fail.message = "Expected function to throw " + name + ", but it threw " + constructorName + "."; + fail.message = 'Expected function to throw ' + name + ', but it threw ' + constructorName + '.'; return fail; } } if (message) { if (thrown.message == message) { - pass.message = function() { return "Expected function not to throw an exception with message " + j$.pp(message) + "."; }; + pass.message = function() { return 'Expected function not to throw an exception with message ' + j$.pp(message) + '.'; }; return pass; } else { - fail.message = function() { return "Expected function to throw an exception with message " + j$.pp(message) + - ", but it threw an exception with message " + j$.pp(thrown.message) + "."; }; + fail.message = function() { return 'Expected function to throw an exception with message ' + j$.pp(message) + + ', but it threw an exception with message ' + j$.pp(thrown.message) + '.'; }; return fail; } } if (regexp) { if (regexp.test(thrown.message)) { - pass.message = function() { return "Expected function not to throw an exception with a message matching " + j$.pp(regexp) + "."; }; + pass.message = function() { return 'Expected function not to throw an exception with a message matching ' + j$.pp(regexp) + '.'; }; return pass; } else { - fail.message = function() { return "Expected function to throw an exception with a message matching " + j$.pp(regexp) + - ", but it threw an exception with message " + j$.pp(thrown.message) + "."; }; + fail.message = function() { return 'Expected function to throw an exception with a message matching ' + j$.pp(regexp) + + ', but it threw an exception with message ' + j$.pp(thrown.message) + '.'; }; return fail; } } @@ -2373,34 +2373,34 @@ getJasmineRequireObj().toThrowError = function(j$) { if (expected instanceof RegExp) { regexp = expected; - } else if (typeof expected == "string") { + } else if (typeof expected == 'string') { message = expected; } else if (checkForAnErrorType(expected)) { errorType = expected; } if (!(errorType || message || regexp)) { - throw new Error("Expected is not an Error, string, or RegExp."); + throw new Error('Expected is not an Error, string, or RegExp.'); } } else { if (checkForAnErrorType(arguments[1])) { errorType = arguments[1]; } else { - throw new Error("Expected error type is not an Error."); + throw new Error('Expected error type is not an Error.'); } if (arguments[2] instanceof RegExp) { regexp = arguments[2]; - } else if (typeof arguments[2] == "string") { + } else if (typeof arguments[2] == 'string') { message = arguments[2]; } else { - throw new Error("Expected error message is not a string or RegExp."); + throw new Error('Expected error message is not a string or RegExp.'); } } } function checkForAnErrorType(type) { - if (typeof type !== "function") { + if (typeof type !== 'function') { return false; } @@ -2416,5 +2416,5 @@ getJasmineRequireObj().toThrowError = function(j$) { }; getJasmineRequireObj().version = function() { - return "2.0.0"; + return '2.0.0'; }; diff --git a/src/console/ConsoleReporter.js b/src/console/ConsoleReporter.js index 9435961f..f2fac6b8 100644 --- a/src/console/ConsoleReporter.js +++ b/src/console/ConsoleReporter.js @@ -25,7 +25,7 @@ getJasmineRequireObj().ConsoleReporter = function() { specCount = 0; failureCount = 0; pendingCount = 0; - print("Started"); + print('Started'); printNewline(); timer.start(); }; @@ -37,18 +37,18 @@ getJasmineRequireObj().ConsoleReporter = function() { } printNewline(); - var specCounts = specCount + " " + plural("spec", specCount) + ", " + - failureCount + " " + plural("failure", failureCount); + var specCounts = specCount + ' ' + plural('spec', specCount) + ', ' + + failureCount + ' ' + plural('failure', failureCount); if (pendingCount) { - specCounts += ", " + pendingCount + " pending " + plural("spec", pendingCount); + specCounts += ', ' + pendingCount + ' pending ' + plural('spec', pendingCount); } print(specCounts); printNewline(); var seconds = timer.elapsed() / 1000; - print("Finished in " + seconds + " " + plural("second", seconds)); + print('Finished in ' + seconds + ' ' + plural('second', seconds)); printNewline(); @@ -58,28 +58,28 @@ getJasmineRequireObj().ConsoleReporter = function() { this.specDone = function(result) { specCount++; - if (result.status == "pending") { + if (result.status == 'pending') { pendingCount++; - print(colored("yellow", "*")); + print(colored('yellow', '*')); return; } - if (result.status == "passed") { - print(colored("green", '.')); + if (result.status == 'passed') { + print(colored('green', '.')); return; } - if (result.status == "failed") { + if (result.status == 'failed') { failureCount++; failedSpecs.push(result); - print(colored("red", 'F')); + print(colored('red', 'F')); } }; return this; function printNewline() { - print("\n"); + print('\n'); } function colored(color, str) { @@ -87,7 +87,7 @@ getJasmineRequireObj().ConsoleReporter = function() { } function plural(str, count) { - return count == 1 ? str : str + "s"; + return count == 1 ? str : str + 's'; } function repeat(thing, times) { @@ -99,12 +99,12 @@ getJasmineRequireObj().ConsoleReporter = function() { } function indent(str, spaces) { - var lines = (str || '').split("\n"); + var lines = (str || '').split('\n'); var newArr = []; for (var i = 0; i < lines.length; i++) { - newArr.push(repeat(" ", spaces).join("") + lines[i]); + newArr.push(repeat(' ', spaces).join('') + lines[i]); } - return newArr.join("\n"); + return newArr.join('\n'); } function specFailureDetails(result) { diff --git a/src/console/requireConsole.js b/src/console/requireConsole.js index e4a5fc0c..a4515172 100644 --- a/src/console/requireConsole.js +++ b/src/console/requireConsole.js @@ -1,5 +1,5 @@ function getJasmineRequireObj() { - if (typeof module !== "undefined" && module.exports) { + if (typeof module !== 'undefined' && module.exports) { return exports; } else { window.jasmineRequire = window.jasmineRequire || {}; diff --git a/src/core/Clock.js b/src/core/Clock.js index f78a4136..69832506 100644 --- a/src/core/Clock.js +++ b/src/core/Clock.js @@ -32,7 +32,7 @@ getJasmineRequireObj().Clock = function() { self.setTimeout = function(fn, delay, params) { if (legacyIE()) { if (arguments.length > 2) { - throw new Error("IE < 9 cannot support extra params to setTimeout without a polyfill"); + throw new Error('IE < 9 cannot support extra params to setTimeout without a polyfill'); } return timer.setTimeout(fn, delay); } @@ -42,7 +42,7 @@ getJasmineRequireObj().Clock = function() { self.setInterval = function(fn, delay, params) { if (legacyIE()) { if (arguments.length > 2) { - throw new Error("IE < 9 cannot support extra params to setInterval without a polyfill"); + throw new Error('IE < 9 cannot support extra params to setInterval without a polyfill'); } return timer.setInterval(fn, delay); } @@ -61,7 +61,7 @@ getJasmineRequireObj().Clock = function() { if (installed) { delayedFunctionScheduler.tick(millis); } else { - throw new Error("Mock clock is not installed, use jasmine.clock().install()"); + throw new Error('Mock clock is not installed, use jasmine.clock().install()'); } }; diff --git a/src/core/Env.js b/src/core/Env.js index 61b49668..99772559 100644 --- a/src/core/Env.js +++ b/src/core/Env.js @@ -21,12 +21,12 @@ getJasmineRequireObj().Env = function(j$) { var currentSuite = null; var reporter = new j$.ReportDispatcher([ - "jasmineStarted", - "jasmineDone", - "suiteStarted", - "suiteDone", - "specStarted", - "specDone" + 'jasmineStarted', + 'jasmineDone', + 'suiteStarted', + 'suiteDone', + 'specStarted', + 'specDone' ]); this.specFilter = function() { @@ -180,7 +180,7 @@ getJasmineRequireObj().Env = function(j$) { this.spyOn = function(obj, methodName) { if (j$.util.isUndefined(obj)) { - throw new Error("spyOn could not find an object to spy upon for " + methodName + "()"); + throw new Error('spyOn could not find an object to spy upon for ' + methodName + '()'); } if (j$.util.isUndefined(obj[methodName])) { @@ -238,7 +238,7 @@ getJasmineRequireObj().Env = function(j$) { } if (declarationError) { - this.it("encountered a declaration exception", function() { + this.it('encountered a declaration exception', function() { throw declarationError; }); } diff --git a/src/core/ExceptionFormatter.js b/src/core/ExceptionFormatter.js index 1af2f75f..74361a9a 100644 --- a/src/core/ExceptionFormatter.js +++ b/src/core/ExceptionFormatter.js @@ -10,11 +10,11 @@ getJasmineRequireObj().ExceptionFormatter = function() { } if (error.fileName || error.sourceURL) { - message += " in " + (error.fileName || error.sourceURL); + message += ' in ' + (error.fileName || error.sourceURL); } if (error.line || error.lineNumber) { - message += " (line " + (error.line || error.lineNumber) + ")"; + message += ' (line ' + (error.line || error.lineNumber) + ')'; } return message; diff --git a/src/core/Expectation.js b/src/core/Expectation.js index 33b5c8e0..626a5cec 100644 --- a/src/core/Expectation.js +++ b/src/core/Expectation.js @@ -18,7 +18,7 @@ getJasmineRequireObj().Expectation = function() { return function() { var args = Array.prototype.slice.call(arguments, 0), expected = args.slice(0), - message = ""; + message = ''; args.unshift(this.actual); @@ -43,7 +43,7 @@ getJasmineRequireObj().Expectation = function() { args.unshift(name); message = this.util.buildFailureMessage.apply(null, args); } else { - if (Object.prototype.toString.apply(result.message) === "[object Function]") { + if (Object.prototype.toString.apply(result.message) === '[object Function]') { message = result.message(); } else { message = result.message; diff --git a/src/core/ExpectationResult.js b/src/core/ExpectationResult.js index 98f9eb10..66dfdb69 100644 --- a/src/core/ExpectationResult.js +++ b/src/core/ExpectationResult.js @@ -15,18 +15,18 @@ getJasmineRequireObj().buildExpectationResult = function() { function message() { if (options.passed) { - return "Passed."; + return 'Passed.'; } else if (options.message) { return options.message; } else if (options.error) { return messageFormatter(options.error); } - return ""; + return ''; } function stack() { if (options.passed) { - return ""; + return ''; } var error = options.error; diff --git a/src/core/JsApiReporter.js b/src/core/JsApiReporter.js index bcae8943..dfb7a03c 100644 --- a/src/core/JsApiReporter.js +++ b/src/core/JsApiReporter.js @@ -7,7 +7,7 @@ getJasmineRequireObj().JsApiReporter = function() { function JsApiReporter(options) { var timer = options.timer || noopTimer, - status = "loaded"; + status = 'loaded'; this.started = false; this.finished = false; diff --git a/src/core/ObjectContaining.js b/src/core/ObjectContaining.js index f080523b..215fcfcb 100644 --- a/src/core/ObjectContaining.js +++ b/src/core/ObjectContaining.js @@ -5,7 +5,7 @@ getJasmineRequireObj().ObjectContaining = function(j$) { } ObjectContaining.prototype.jasmineMatches = function(other, mismatchKeys, mismatchValues) { - if (typeof(this.sample) !== "object") { throw new Error("You must provide an object to objectContaining, not '"+this.sample+"'."); } + if (typeof(this.sample) !== 'object') { throw new Error('You must provide an object to objectContaining, not \''+this.sample+'\'.'); } mismatchKeys = mismatchKeys || []; mismatchValues = mismatchValues || []; @@ -16,10 +16,10 @@ getJasmineRequireObj().ObjectContaining = function(j$) { for (var property in this.sample) { if (!hasKey(other, property) && hasKey(this.sample, property)) { - mismatchKeys.push("expected has key '" + property + "', but missing from actual."); + mismatchKeys.push('expected has key \'' + property + '\', but missing from actual.'); } else if (!j$.matchersUtil.equals(this.sample[property], other[property])) { - mismatchValues.push("'" + property + "' was '" + (other[property] ? j$.util.htmlEscape(other[property].toString()) : other[property]) + "' in actual, but was '" + (this.sample[property] ? j$.util.htmlEscape(this.sample[property].toString()) : this.sample[property]) + "' in expected."); + mismatchValues.push('\'' + property + '\' was \'' + (other[property] ? j$.util.htmlEscape(other[property].toString()) : other[property]) + '\' in actual, but was \'' + (this.sample[property] ? j$.util.htmlEscape(this.sample[property].toString()) : this.sample[property]) + '\' in expected.'); } } @@ -27,7 +27,7 @@ getJasmineRequireObj().ObjectContaining = function(j$) { }; ObjectContaining.prototype.jasmineToString = function() { - return ""; + return ''; }; return ObjectContaining; diff --git a/src/core/PrettyPrinter.js b/src/core/PrettyPrinter.js index 8a2dea8b..621abac2 100644 --- a/src/core/PrettyPrinter.js +++ b/src/core/PrettyPrinter.js @@ -20,7 +20,7 @@ getJasmineRequireObj().pp = function(j$) { } else if (typeof value === 'string') { this.emitString(value); } else if (j$.isSpy(value)) { - this.emitScalar("spy on " + value.and.identity()); + this.emitScalar('spy on ' + value.and.identity()); } else if (value instanceof RegExp) { this.emitScalar(value.toString()); } else if (typeof value === 'function') { @@ -74,12 +74,12 @@ getJasmineRequireObj().pp = function(j$) { }; StringPrettyPrinter.prototype.emitString = function(value) { - this.append("'" + value + "'"); + this.append('\'' + value + '\''); }; StringPrettyPrinter.prototype.emitArray = function(array) { if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) { - this.append("Array"); + this.append('Array'); return; } @@ -95,7 +95,7 @@ getJasmineRequireObj().pp = function(j$) { StringPrettyPrinter.prototype.emitObject = function(obj) { if (this.ppNestLevel_ > j$.MAX_PRETTY_PRINT_DEPTH) { - this.append("Object"); + this.append('Object'); return; } diff --git a/src/core/Spec.js b/src/core/Spec.js index 462a0f02..60b9397d 100644 --- a/src/core/Spec.js +++ b/src/core/Spec.js @@ -92,10 +92,10 @@ getJasmineRequireObj().Spec = function(j$) { } self.addExpectationResult(false, { - matcherName: "", + matcherName: '', passed: false, - expected: "", - actual: "", + expected: '', + actual: '', error: e }); } @@ -138,7 +138,7 @@ getJasmineRequireObj().Spec = function(j$) { return this.getSpecName(this); }; - Spec.pendingSpecExceptionMessage = "=> marked Pending"; + Spec.pendingSpecExceptionMessage = '=> marked Pending'; Spec.isPendingSpecException = function(e) { return !!(e && e.toString && e.toString().indexOf(Spec.pendingSpecExceptionMessage) !== -1); @@ -147,6 +147,6 @@ getJasmineRequireObj().Spec = function(j$) { return Spec; }; -if (typeof window == void 0 && typeof exports == "object") { +if (typeof window == void 0 && typeof exports == 'object') { exports.Spec = jasmineRequire.Spec; } diff --git a/src/core/SpyStrategy.js b/src/core/SpyStrategy.js index 819d8ce2..e58438ed 100644 --- a/src/core/SpyStrategy.js +++ b/src/core/SpyStrategy.js @@ -3,7 +3,7 @@ getJasmineRequireObj().SpyStrategy = function() { function SpyStrategy(options) { options = options || {}; - var identity = options.name || "unknown", + var identity = options.name || 'unknown', originalFn = options.fn || function() {}, getSpy = options.getSpy || function() {}, plan = function() {}; diff --git a/src/core/Suite.js b/src/core/Suite.js index beae37ce..4b5e573d 100644 --- a/src/core/Suite.js +++ b/src/core/Suite.js @@ -85,6 +85,6 @@ getJasmineRequireObj().Suite = function() { return Suite; }; -if (typeof window == void 0 && typeof exports == "object") { +if (typeof window == void 0 && typeof exports == 'object') { exports.Suite = jasmineRequire.Suite; } diff --git a/src/core/base.js b/src/core/base.js index d5d2c6ab..e152294d 100644 --- a/src/core/base.js +++ b/src/core/base.js @@ -1,11 +1,11 @@ getJasmineRequireObj().base = (function (jasmineGlobal) { - if (typeof module !== "undefined" && module.exports) { + if (typeof module !== 'undefined' && module.exports) { jasmineGlobal = global; } return function(j$) { j$.unimplementedMethod_ = function() { - throw new Error("unimplemented method"); + throw new Error('unimplemented method'); }; j$.MAX_PRETTY_PRINT_DEPTH = 40; @@ -22,15 +22,15 @@ getJasmineRequireObj().base = (function (jasmineGlobal) { }; j$.isArray_ = function(value) { - return j$.isA_("Array", value); + return j$.isA_('Array', value); }; j$.isString_ = function(value) { - return j$.isA_("String", value); + return j$.isA_('String', value); }; j$.isNumber_ = function(value) { - return j$.isA_("Number", value); + return j$.isA_('Number', value); }; j$.isA_ = function(typeName, value) { @@ -67,7 +67,7 @@ getJasmineRequireObj().base = (function (jasmineGlobal) { for (var prop in originalFn) { if (prop === 'and' || prop === 'calls') { - throw new Error("Jasmine spies would overwrite the 'and' and 'calls' properties on the object being spied upon"); + throw new Error('Jasmine spies would overwrite the \'and\' and \'calls\' properties on the object being spied upon'); } spy[prop] = originalFn[prop]; @@ -89,7 +89,7 @@ getJasmineRequireObj().base = (function (jasmineGlobal) { j$.createSpyObj = function(baseName, methodNames) { if (!j$.isArray_(methodNames) || methodNames.length === 0) { - throw "createSpyObj requires a non-empty array of method names to create spies for"; + throw 'createSpyObj requires a non-empty array of method names to create spies for'; } var obj = {}; for (var i = 0; i < methodNames.length; i++) { diff --git a/src/core/matchers/matchersUtil.js b/src/core/matchers/matchersUtil.js index e5121fdd..0948e9f5 100644 --- a/src/core/matchers/matchersUtil.js +++ b/src/core/matchers/matchersUtil.js @@ -11,7 +11,7 @@ getJasmineRequireObj().matchersUtil = function(j$) { contains: function(haystack, needle, customTesters) { customTesters = customTesters || []; - if (Object.prototype.toString.apply(haystack) === "[object Array]") { + if (Object.prototype.toString.apply(haystack) === '[object Array]') { for (var i = 0; i < haystack.length; i++) { if (eq(haystack[i], needle, [], [], customTesters)) { return true; @@ -30,21 +30,21 @@ getJasmineRequireObj().matchersUtil = function(j$) { expected = args.slice(3), englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); }); - var message = "Expected " + + var message = 'Expected ' + j$.pp(actual) + - (isNot ? " not " : " ") + + (isNot ? ' not ' : ' ') + englishyPredicate; if (expected.length > 0) { for (var i = 0; i < expected.length; i++) { if (i > 0) { - message += ","; + message += ','; } - message += " " + j$.pp(expected[i]); + message += ' ' + j$.pp(expected[i]); } } - return message + "."; + return message + '.'; } }; diff --git a/src/core/matchers/requireMatchers.js b/src/core/matchers/requireMatchers.js index 33234c62..2b21a7a4 100644 --- a/src/core/matchers/requireMatchers.js +++ b/src/core/matchers/requireMatchers.js @@ -1,22 +1,22 @@ getJasmineRequireObj().requireMatchers = function(jRequire, j$) { var availableMatchers = [ - "toBe", - "toBeCloseTo", - "toBeDefined", - "toBeFalsy", - "toBeGreaterThan", - "toBeLessThan", - "toBeNaN", - "toBeNull", - "toBeTruthy", - "toBeUndefined", - "toContain", - "toEqual", - "toHaveBeenCalled", - "toHaveBeenCalledWith", - "toMatch", - "toThrow", - "toThrowError" + 'toBe', + 'toBeCloseTo', + 'toBeDefined', + 'toBeFalsy', + 'toBeGreaterThan', + 'toBeLessThan', + 'toBeNaN', + 'toBeNull', + 'toBeTruthy', + 'toBeUndefined', + 'toContain', + 'toEqual', + 'toHaveBeenCalled', + 'toHaveBeenCalledWith', + 'toMatch', + 'toThrow', + 'toThrowError' ], matchers = {}; diff --git a/src/core/matchers/toBeNaN.js b/src/core/matchers/toBeNaN.js index cdf8ee65..f00eee2f 100644 --- a/src/core/matchers/toBeNaN.js +++ b/src/core/matchers/toBeNaN.js @@ -8,9 +8,9 @@ getJasmineRequireObj().toBeNaN = function(j$) { }; if (result.pass) { - result.message = "Expected actual not to be NaN."; + result.message = 'Expected actual not to be NaN.'; } else { - result.message = function() { return "Expected " + j$.pp(actual) + " to be NaN."; }; + result.message = function() { return 'Expected ' + j$.pp(actual) + ' to be NaN.'; }; } return result; diff --git a/src/core/matchers/toHaveBeenCalled.js b/src/core/matchers/toHaveBeenCalled.js index a1b647f1..5c7a1a99 100644 --- a/src/core/matchers/toHaveBeenCalled.js +++ b/src/core/matchers/toHaveBeenCalled.js @@ -16,8 +16,8 @@ getJasmineRequireObj().toHaveBeenCalled = function(j$) { result.pass = actual.calls.any(); result.message = result.pass ? - "Expected spy " + actual.and.identity() + " not to have been called." : - "Expected spy " + actual.and.identity() + " to have been called."; + 'Expected spy ' + actual.and.identity() + ' not to have been called.' : + 'Expected spy ' + actual.and.identity() + ' to have been called.'; return result; } diff --git a/src/core/matchers/toHaveBeenCalledWith.js b/src/core/matchers/toHaveBeenCalledWith.js index ca6db4c4..03b26872 100644 --- a/src/core/matchers/toHaveBeenCalledWith.js +++ b/src/core/matchers/toHaveBeenCalledWith.js @@ -13,15 +13,15 @@ getJasmineRequireObj().toHaveBeenCalledWith = function(j$) { } if (!actual.calls.any()) { - result.message = function() { return "Expected spy " + actual.and.identity() + " to have been called with " + j$.pp(expectedArgs) + " but it was never called."; }; + result.message = function() { return 'Expected spy ' + actual.and.identity() + ' to have been called with ' + j$.pp(expectedArgs) + ' but it was never called.'; }; return result; } if (util.contains(actual.calls.allArgs(), expectedArgs)) { result.pass = true; - result.message = function() { return "Expected spy " + actual.and.identity() + " not to have been called with " + j$.pp(expectedArgs) + " but it was."; }; + result.message = function() { return 'Expected spy ' + actual.and.identity() + ' not to have been called with ' + j$.pp(expectedArgs) + ' but it was.'; }; } else { - result.message = function() { return "Expected spy " + actual.and.identity() + " to have been called with " + j$.pp(expectedArgs) + " but actual calls were " + j$.pp(actual.calls.allArgs()).replace(/^\[ | \]$/g, '') + "."; }; + result.message = function() { return 'Expected spy ' + actual.and.identity() + ' to have been called with ' + j$.pp(expectedArgs) + ' but actual calls were ' + j$.pp(actual.calls.allArgs()).replace(/^\[ | \]$/g, '') + '.'; }; } return result; diff --git a/src/core/matchers/toThrow.js b/src/core/matchers/toThrow.js index 7b47a310..ae0ea129 100644 --- a/src/core/matchers/toThrow.js +++ b/src/core/matchers/toThrow.js @@ -7,8 +7,8 @@ getJasmineRequireObj().toThrow = function(j$) { threw = false, thrown; - if (typeof actual != "function") { - throw new Error("Actual is not a Function"); + if (typeof actual != 'function') { + throw new Error('Actual is not a Function'); } try { @@ -19,22 +19,22 @@ getJasmineRequireObj().toThrow = function(j$) { } if (!threw) { - result.message = "Expected function to throw an exception."; + result.message = 'Expected function to throw an exception.'; return result; } if (arguments.length == 1) { result.pass = true; - result.message = function() { return "Expected function not to throw, but it threw " + j$.pp(thrown) + "."; }; + result.message = function() { return 'Expected function not to throw, but it threw ' + j$.pp(thrown) + '.'; }; return result; } if (util.equals(thrown, expected)) { result.pass = true; - result.message = function() { return "Expected function not to throw " + j$.pp(expected) + "."; }; + result.message = function() { return 'Expected function not to throw ' + j$.pp(expected) + '.'; }; } else { - result.message = function() { return "Expected function to throw " + j$.pp(expected) + ", but it threw " + j$.pp(thrown) + "."; }; + result.message = function() { return 'Expected function to throw ' + j$.pp(expected) + ', but it threw ' + j$.pp(thrown) + '.'; }; } return result; diff --git a/src/core/matchers/toThrowError.js b/src/core/matchers/toThrowError.js index 956dea07..e8f220d2 100644 --- a/src/core/matchers/toThrowError.js +++ b/src/core/matchers/toThrowError.js @@ -12,8 +12,8 @@ getJasmineRequireObj().toThrowError = function(j$) { name, constructorName; - if (typeof actual != "function") { - throw new Error("Actual is not a Function"); + if (typeof actual != 'function') { + throw new Error('Actual is not a Function'); } extractExpectedParams.apply(null, arguments); @@ -26,17 +26,17 @@ getJasmineRequireObj().toThrowError = function(j$) { } if (!threw) { - fail.message = "Expected function to throw an Error."; + fail.message = 'Expected function to throw an Error.'; return fail; } if (!(thrown instanceof Error)) { - fail.message = function() { return "Expected function to throw an Error, but it threw " + j$.pp(thrown) + "."; }; + fail.message = function() { return 'Expected function to throw an Error, but it threw ' + j$.pp(thrown) + '.'; }; return fail; } if (arguments.length == 1) { - pass.message = "Expected function not to throw an Error, but it threw " + fnNameFor(thrown) + "."; + pass.message = 'Expected function not to throw an Error, but it threw ' + fnNameFor(thrown) + '.'; return pass; } @@ -47,54 +47,54 @@ getJasmineRequireObj().toThrowError = function(j$) { if (errorType && message) { if (thrown.constructor == errorType && util.equals(thrown.message, message)) { - pass.message = function() { return "Expected function not to throw " + name + " with message " + j$.pp(message) + "."; }; + pass.message = function() { return 'Expected function not to throw ' + name + ' with message ' + j$.pp(message) + '.'; }; return pass; } else { - fail.message = function() { return "Expected function to throw " + name + " with message " + j$.pp(message) + - ", but it threw " + constructorName + " with message " + j$.pp(thrown.message) + "."; }; + fail.message = function() { return 'Expected function to throw ' + name + ' with message ' + j$.pp(message) + + ', but it threw ' + constructorName + ' with message ' + j$.pp(thrown.message) + '.'; }; return fail; } } if (errorType && regexp) { if (thrown.constructor == errorType && regexp.test(thrown.message)) { - pass.message = function() { return "Expected function not to throw " + name + " with message matching " + j$.pp(regexp) + "."; }; + pass.message = function() { return 'Expected function not to throw ' + name + ' with message matching ' + j$.pp(regexp) + '.'; }; return pass; } else { - fail.message = function() { return "Expected function to throw " + name + " with message matching " + j$.pp(regexp) + - ", but it threw " + constructorName + " with message " + j$.pp(thrown.message) + "."; }; + fail.message = function() { return 'Expected function to throw ' + name + ' with message matching ' + j$.pp(regexp) + + ', but it threw ' + constructorName + ' with message ' + j$.pp(thrown.message) + '.'; }; return fail; } } if (errorType) { if (thrown.constructor == errorType) { - pass.message = "Expected function not to throw " + name + "."; + pass.message = 'Expected function not to throw ' + name + '.'; return pass; } else { - fail.message = "Expected function to throw " + name + ", but it threw " + constructorName + "."; + fail.message = 'Expected function to throw ' + name + ', but it threw ' + constructorName + '.'; return fail; } } if (message) { if (thrown.message == message) { - pass.message = function() { return "Expected function not to throw an exception with message " + j$.pp(message) + "."; }; + pass.message = function() { return 'Expected function not to throw an exception with message ' + j$.pp(message) + '.'; }; return pass; } else { - fail.message = function() { return "Expected function to throw an exception with message " + j$.pp(message) + - ", but it threw an exception with message " + j$.pp(thrown.message) + "."; }; + fail.message = function() { return 'Expected function to throw an exception with message ' + j$.pp(message) + + ', but it threw an exception with message ' + j$.pp(thrown.message) + '.'; }; return fail; } } if (regexp) { if (regexp.test(thrown.message)) { - pass.message = function() { return "Expected function not to throw an exception with a message matching " + j$.pp(regexp) + "."; }; + pass.message = function() { return 'Expected function not to throw an exception with a message matching ' + j$.pp(regexp) + '.'; }; return pass; } else { - fail.message = function() { return "Expected function to throw an exception with a message matching " + j$.pp(regexp) + - ", but it threw an exception with message " + j$.pp(thrown.message) + "."; }; + fail.message = function() { return 'Expected function to throw an exception with a message matching ' + j$.pp(regexp) + + ', but it threw an exception with message ' + j$.pp(thrown.message) + '.'; }; return fail; } } @@ -113,34 +113,34 @@ getJasmineRequireObj().toThrowError = function(j$) { if (expected instanceof RegExp) { regexp = expected; - } else if (typeof expected == "string") { + } else if (typeof expected == 'string') { message = expected; } else if (checkForAnErrorType(expected)) { errorType = expected; } if (!(errorType || message || regexp)) { - throw new Error("Expected is not an Error, string, or RegExp."); + throw new Error('Expected is not an Error, string, or RegExp.'); } } else { if (checkForAnErrorType(arguments[1])) { errorType = arguments[1]; } else { - throw new Error("Expected error type is not an Error."); + throw new Error('Expected error type is not an Error.'); } if (arguments[2] instanceof RegExp) { regexp = arguments[2]; - } else if (typeof arguments[2] == "string") { + } else if (typeof arguments[2] == 'string') { message = arguments[2]; } else { - throw new Error("Expected error message is not a string or RegExp."); + throw new Error('Expected error message is not a string or RegExp.'); } } } function checkForAnErrorType(type) { - if (typeof type !== "function") { + if (typeof type !== 'function') { return false; } diff --git a/src/core/requireCore.js b/src/core/requireCore.js index 15b949ea..13642335 100644 --- a/src/core/requireCore.js +++ b/src/core/requireCore.js @@ -1,5 +1,5 @@ function getJasmineRequireObj() { - if (typeof module !== "undefined" && module.exports) { + if (typeof module !== 'undefined' && module.exports) { return exports; } else { window.jasmineRequire = window.jasmineRequire || {}; diff --git a/src/html/HtmlReporter.js b/src/html/HtmlReporter.js index c230ba42..a81f6583 100644 --- a/src/html/HtmlReporter.js +++ b/src/html/HtmlReporter.js @@ -20,20 +20,20 @@ jasmineRequire.HtmlReporter = function(j$) { symbols; this.initialize = function() { - htmlReporterMain = createDom("div", {className: "html-reporter"}, - createDom("div", {className: "banner"}, - createDom("span", {className: "title"}, "Jasmine"), - createDom("span", {className: "version"}, j$.version) + htmlReporterMain = createDom('div', {className: 'html-reporter'}, + createDom('div', {className: 'banner'}, + createDom('span', {className: 'title'}, 'Jasmine'), + createDom('span', {className: 'version'}, j$.version) ), - createDom("ul", {className: "symbol-summary"}), - createDom("div", {className: "alert"}), - createDom("div", {className: "results"}, - createDom("div", {className: "failures"}) + createDom('ul', {className: 'symbol-summary'}), + createDom('div', {className: 'alert'}), + createDom('div', {className: 'results'}, + createDom('div', {className: 'failures'}) ) ); getContainer().appendChild(htmlReporterMain); - symbols = find(".symbol-summary"); + symbols = find('.symbol-summary'); }; var totalSpecsDefined; @@ -42,13 +42,13 @@ jasmineRequire.HtmlReporter = function(j$) { timer.start(); }; - var summary = createDom("div", {className: "summary"}); + var summary = createDom('div', {className: 'summary'}); - var topResults = new j$.ResultsNode({}, "", null), + var topResults = new j$.ResultsNode({}, '', null), currentParent = topResults; this.suiteStarted = function(result) { - currentParent.addChild(result, "suite"); + currentParent.addChild(result, 'suite'); currentParent = currentParent.last(); }; @@ -61,82 +61,82 @@ jasmineRequire.HtmlReporter = function(j$) { }; this.specStarted = function(result) { - currentParent.addChild(result, "spec"); + currentParent.addChild(result, 'spec'); }; var failures = []; this.specDone = function(result) { - if (result.status != "disabled") { + if (result.status != 'disabled') { specsExecuted++; } - symbols.appendChild(createDom("li", { + symbols.appendChild(createDom('li', { className: result.status, - id: "spec_" + result.id, + id: 'spec_' + result.id, title: result.fullName } )); - if (result.status == "failed") { + if (result.status == 'failed') { failureCount++; var failure = - createDom("div", {className: "spec-detail failed"}, - createDom("div", {className: "description"}, - createDom("a", {title: result.fullName, href: specHref(result)}, result.fullName) + createDom('div', {className: 'spec-detail failed'}, + createDom('div', {className: 'description'}, + createDom('a', {title: result.fullName, href: specHref(result)}, result.fullName) ), - createDom("div", {className: "messages"}) + createDom('div', {className: 'messages'}) ); var messages = failure.childNodes[1]; for (var i = 0; i < result.failedExpectations.length; i++) { var expectation = result.failedExpectations[i]; - messages.appendChild(createDom("div", {className: "result-message"}, expectation.message)); - messages.appendChild(createDom("div", {className: "stack-trace"}, expectation.stack)); + messages.appendChild(createDom('div', {className: 'result-message'}, expectation.message)); + messages.appendChild(createDom('div', {className: 'stack-trace'}, expectation.stack)); } failures.push(failure); } - if (result.status == "pending") { + if (result.status == 'pending') { pendingSpecCount++; } }; this.jasmineDone = function() { - var banner = find(".banner"); - banner.appendChild(createDom("span", {className: "duration"}, "finished in " + timer.elapsed() / 1000 + "s")); + var banner = find('.banner'); + banner.appendChild(createDom('span', {className: 'duration'}, 'finished in ' + timer.elapsed() / 1000 + 's')); - var alert = find(".alert"); + var alert = find('.alert'); - alert.appendChild(createDom("span", { className: "exceptions" }, - createDom("label", { className: "label", 'for': "raise-exceptions" }, "raise exceptions"), - createDom("input", { - className: "raise", - id: "raise-exceptions", - type: "checkbox" + alert.appendChild(createDom('span', { className: 'exceptions' }, + createDom('label', { className: 'label', 'for': 'raise-exceptions' }, 'raise exceptions'), + createDom('input', { + className: 'raise', + id: 'raise-exceptions', + type: 'checkbox' }) )); - var checkbox = find("input"); + var checkbox = find('input'); checkbox.checked = !env.catchingExceptions(); checkbox.onclick = onRaiseExceptionsClick; if (specsExecuted < totalSpecsDefined) { - var skippedMessage = "Ran " + specsExecuted + " of " + totalSpecsDefined + " specs - run all"; + var skippedMessage = 'Ran ' + specsExecuted + ' of ' + totalSpecsDefined + ' specs - run all'; alert.appendChild( - createDom("span", {className: "bar skipped"}, - createDom("a", {href: "?", title: "Run all specs"}, skippedMessage) + createDom('span', {className: 'bar skipped'}, + createDom('a', {href: '?', title: 'Run all specs'}, skippedMessage) ) ); } - var statusBarMessage = "" + pluralize("spec", specsExecuted) + ", " + pluralize("failure", failureCount); - if (pendingSpecCount) { statusBarMessage += ", " + pluralize("pending spec", pendingSpecCount); } + var statusBarMessage = '' + pluralize('spec', specsExecuted) + ', ' + pluralize('failure', failureCount); + if (pendingSpecCount) { statusBarMessage += ', ' + pluralize('pending spec', pendingSpecCount); } - var statusBarClassName = "bar " + ((failureCount > 0) ? "failed" : "passed"); - alert.appendChild(createDom("span", {className: statusBarClassName}, statusBarMessage)); + var statusBarClassName = 'bar ' + ((failureCount > 0) ? 'failed' : 'passed'); + alert.appendChild(createDom('span', {className: statusBarClassName}, statusBarMessage)); - var results = find(".results"); + var results = find('.results'); results.appendChild(summary); summaryList(topResults, summary); @@ -145,27 +145,27 @@ jasmineRequire.HtmlReporter = function(j$) { var specListNode; for (var i = 0; i < resultsTree.children.length; i++) { var resultNode = resultsTree.children[i]; - if (resultNode.type == "suite") { - var suiteListNode = createDom("ul", {className: "suite", id: "suite-" + resultNode.result.id}, - createDom("li", {className: "suite-detail"}, - createDom("a", {href: specHref(resultNode.result)}, resultNode.result.description) + if (resultNode.type == 'suite') { + var suiteListNode = createDom('ul', {className: 'suite', id: 'suite-' + resultNode.result.id}, + createDom('li', {className: 'suite-detail'}, + createDom('a', {href: specHref(resultNode.result)}, resultNode.result.description) ) ); summaryList(resultNode, suiteListNode); domParent.appendChild(suiteListNode); } - if (resultNode.type == "spec") { - if (domParent.getAttribute("class") != "specs") { - specListNode = createDom("ul", {className: "specs"}); + if (resultNode.type == 'spec') { + if (domParent.getAttribute('class') != 'specs') { + specListNode = createDom('ul', {className: 'specs'}); domParent.appendChild(specListNode); } specListNode.appendChild( - createDom("li", { + createDom('li', { className: resultNode.result.status, - id: "spec-" + resultNode.result.id + id: 'spec-' + resultNode.result.id }, - createDom("a", {href: specHref(resultNode.result)}, resultNode.result.description) + createDom('a', {href: specHref(resultNode.result)}, resultNode.result.description) ) ); } @@ -174,24 +174,24 @@ jasmineRequire.HtmlReporter = function(j$) { if (failures.length) { alert.appendChild( - createDom('span', {className: "menu bar spec-list"}, - createDom("span", {}, "Spec List | "), - createDom('a', {className: "failures-menu", href: "#"}, "Failures"))); + createDom('span', {className: 'menu bar spec-list'}, + createDom('span', {}, 'Spec List | '), + createDom('a', {className: 'failures-menu', href: '#'}, 'Failures'))); alert.appendChild( - createDom('span', {className: "menu bar failure-list"}, - createDom('a', {className: "spec-list-menu", href: "#"}, "Spec List"), - createDom("span", {}, " | Failures "))); + createDom('span', {className: 'menu bar failure-list'}, + createDom('a', {className: 'spec-list-menu', href: '#'}, 'Spec List'), + createDom('span', {}, ' | Failures '))); - find(".failures-menu").onclick = function() { + find('.failures-menu').onclick = function() { setMenuModeTo('failure-list'); }; - find(".spec-list-menu").onclick = function() { + find('.spec-list-menu').onclick = function() { setMenuModeTo('spec-list'); }; setMenuModeTo('failure-list'); - var failureNode = find(".failures"); + var failureNode = find('.failures'); for (var i = 0; i < failures.length; i++) { failureNode.appendChild(failures[i]); } @@ -220,7 +220,7 @@ jasmineRequire.HtmlReporter = function(j$) { } for (var attr in attrs) { - if (attr == "className") { + if (attr == 'className') { el[attr] = attrs[attr]; } else { el.setAttribute(attr, attrs[attr]); @@ -231,17 +231,17 @@ jasmineRequire.HtmlReporter = function(j$) { } function pluralize(singular, count) { - var word = (count == 1 ? singular : singular + "s"); + var word = (count == 1 ? singular : singular + 's'); - return "" + count + " " + word; + return '' + count + ' ' + word; } function specHref(result) { - return "?spec=" + encodeURIComponent(result.fullName); + return '?spec=' + encodeURIComponent(result.fullName); } function setMenuModeTo(mode) { - htmlReporterMain.setAttribute("class", "html-reporter " + mode); + htmlReporterMain.setAttribute('class', 'html-reporter ' + mode); } } diff --git a/src/html/HtmlSpecFilter.js b/src/html/HtmlSpecFilter.js index 52e2b8fd..3d0a6c23 100644 --- a/src/html/HtmlSpecFilter.js +++ b/src/html/HtmlSpecFilter.js @@ -1,6 +1,6 @@ jasmineRequire.HtmlSpecFilter = function() { function HtmlSpecFilter(options) { - var filterString = options && options.filterString() && options.filterString().replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&"); + var filterString = options && options.filterString() && options.filterString().replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&'); var filterPattern = new RegExp(filterString); this.matches = function(specName) { diff --git a/src/html/QueryString.js b/src/html/QueryString.js index c2d667bc..13d6855c 100644 --- a/src/html/QueryString.js +++ b/src/html/QueryString.js @@ -16,9 +16,9 @@ jasmineRequire.QueryString = function() { function toQueryString(paramMap) { var qStrPairs = []; for (var prop in paramMap) { - qStrPairs.push(encodeURIComponent(prop) + "=" + encodeURIComponent(paramMap[prop])); + qStrPairs.push(encodeURIComponent(prop) + '=' + encodeURIComponent(paramMap[prop])); } - return "?" + qStrPairs.join('&'); + return '?' + qStrPairs.join('&'); } function queryStringToParamMap() { @@ -31,7 +31,7 @@ jasmineRequire.QueryString = function() { for (var i = 0; i < params.length; i++) { var p = params[i].split('='); var value = decodeURIComponent(p[1]); - if (value === "true" || value === "false") { + if (value === 'true' || value === 'false') { value = JSON.parse(value); } paramMap[decodeURIComponent(p[0])] = value; diff --git a/src/version.js b/src/version.js index e9dd786a..5b2223b3 100644 --- a/src/version.js +++ b/src/version.js @@ -1,3 +1,3 @@ getJasmineRequireObj().version = function() { - return "<%= version %>"; + return '<%= version %>'; };