From b7553062bddf3af45a93d3c73f872df482e66744 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Wed, 11 Jan 2012 15:41:27 -0500 Subject: [PATCH] rearrange js --- vendor/assets/coffeescripts/prolog.coffee | 13 ++ .../jasmine-extensions.coffee | 14 +- .../assets/javascripts/jasmine-extensions.js | 129 ------------------ .../jasmine.HeadlessReporter.Verbose.coffee | 10 ++ vendor/assets/javascripts/prolog.js | 15 ++ 5 files changed, 42 insertions(+), 139 deletions(-) rename vendor/assets/{coffeescripts => javascripts}/jasmine-extensions.coffee (88%) delete mode 100644 vendor/assets/javascripts/jasmine-extensions.js diff --git a/vendor/assets/coffeescripts/prolog.coffee b/vendor/assets/coffeescripts/prolog.coffee index d999175..078be7c 100644 --- a/vendor/assets/coffeescripts/prolog.coffee +++ b/vendor/assets/coffeescripts/prolog.coffee @@ -79,6 +79,19 @@ if window.JHW puts msg + JHW.createCoffeeScriptFileException = (e) -> + if e and e.sourceURL and window.CoffeeScriptToFilename + filename = e.sourceURL.split('/').pop() + if realFilename = window.CoffeeScriptToFilename[filename] + e = { + name: e.name, + message: e.message, + lineNumber: "~" + String(e.line), + sourceURL: realFilename + } + + e + window.CoffeeScriptToFilename = {} window.CSTF = window.CoffeeScriptToFilename diff --git a/vendor/assets/coffeescripts/jasmine-extensions.coffee b/vendor/assets/javascripts/jasmine-extensions.coffee similarity index 88% rename from vendor/assets/coffeescripts/jasmine-extensions.coffee rename to vendor/assets/javascripts/jasmine-extensions.coffee index 92dd70b..397e167 100644 --- a/vendor/assets/coffeescripts/jasmine-extensions.coffee +++ b/vendor/assets/javascripts/jasmine-extensions.coffee @@ -30,15 +30,7 @@ if window.JHW this.env.reporter.reportSpecResults(this) jasmine.Spec.prototype.fail = (e) -> - if e and e.sourceURL and window.CoffeeScriptToFilename - filename = e.sourceURL.split('/').pop() - if realFilename = window.CoffeeScriptToFilename[filename] - e = { - name: e.name, - message: e.message, - lineNumber: "~" + String(e.line), - sourceURL: realFilename - } + e = JHW.createCoffeeScriptFileException(e) expectationResult = new jasmine.ExpectationResult({ passed: false, @@ -47,6 +39,8 @@ if window.JHW }) @results_.addResult(expectationResult) + this.env.reporter.reportException(e) + jasmine.NestedResults.isValidSpecLine = (line) -> line.match(/^\s*expect/) != null || line.match(/^\s*return\s*expect/) != null @@ -92,7 +86,7 @@ if window.JHW this.addResult_(result) - for method in [ "reportSpecWaiting", "reportSpecRunning" ] + for method in [ "reportSpecWaiting", "reportSpecRunning", "reportException" ] generator = (method) -> (args...) -> for reporter in @subReporters_ diff --git a/vendor/assets/javascripts/jasmine-extensions.js b/vendor/assets/javascripts/jasmine-extensions.js deleted file mode 100644 index 5710fce..0000000 --- a/vendor/assets/javascripts/jasmine-extensions.js +++ /dev/null @@ -1,129 +0,0 @@ -(function() { - var generator, getSplitName, method, pauseAndRun, _i, _len, _ref, - __slice = Array.prototype.slice; - - if (!(typeof jasmine !== "undefined" && jasmine !== null)) { - throw new Error("jasmine not laoded!"); - } - - if (window.JHW) { - getSplitName = function(parts) { - parts.push(String(this.description).replace(/[\n\r]/g, ' ')); - return parts; - }; - jasmine.Suite.prototype.getSuiteSplitName = function() { - return this.getSplitName(this.parentSuite ? this.parentSuite.getSuiteSplitName() : []); - }; - jasmine.Spec.prototype.getSpecSplitName = function() { - return this.getSplitName(this.suite.getSuiteSplitName()); - }; - jasmine.Suite.prototype.getSplitName = getSplitName; - jasmine.Spec.prototype.getSplitName = getSplitName; - jasmine.Spec.prototype.getJHWSpecInformation = function() { - var parts, specLineInfo; - parts = this.getSpecSplitName(); - specLineInfo = HeadlessReporterResult.findSpecLine(parts); - if (specLineInfo.file) { - parts.push("" + specLineInfo.file + ":" + specLineInfo.lineNumber); - } else { - parts.push(''); - } - return parts.join("||"); - }; - jasmine.Spec.prototype.finishCallback = function() { - JHW.ping(); - return this.env.reporter.reportSpecResults(this); - }; - jasmine.Spec.prototype.fail = function(e) { - var expectationResult, filename, realFilename; - if (e && e.sourceURL && window.CoffeeScriptToFilename) { - filename = e.sourceURL.split('/').pop(); - if (realFilename = window.CoffeeScriptToFilename[filename]) { - e = { - name: e.name, - message: e.message, - lineNumber: "~" + String(e.line), - sourceURL: realFilename - }; - } - } - expectationResult = new jasmine.ExpectationResult({ - passed: false, - message: e ? jasmine.util.formatException(e) : 'Exception', - trace: { - stack: e.stack - } - }); - return this.results_.addResult(expectationResult); - }; - jasmine.NestedResults.isValidSpecLine = function(line) { - return line.match(/^\s*expect/) !== null || line.match(/^\s*return\s*expect/) !== null; - }; - jasmine.NestedResults.parseFunction = function(func) { - var line, lineCount, lines, _i, _len, _ref; - lines = []; - lineCount = 0; - _ref = func.split("\n"); - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - line = _ref[_i]; - if (jasmine.NestedResults.isValidSpecLine(line)) { - line = line.replace(/^\s*/, '').replace(/\s*$/, '').replace(/^return\s*/, ''); - lines.push([line, lineCount]); - } - lineCount += 1; - } - return lines; - }; - jasmine.NestedResults.parseAndStore = function(func) { - if (!jasmine.NestedResults.ParsedFunctions[func]) { - jasmine.NestedResults.ParsedFunctions[func] = jasmine.NestedResults.parseFunction(func); - } - return jasmine.NestedResults.ParsedFunctions[func]; - }; - jasmine.NestedResults.ParsedFunctions = []; - if (!jasmine.WaitsBlock.prototype._execute) { - jasmine.WaitsBlock.prototype._execute = jasmine.WaitsBlock.prototype.execute; - jasmine.WaitsForBlock.prototype._execute = jasmine.WaitsForBlock.prototype.execute; - pauseAndRun = function(onComplete) { - JHW.timerPause(); - jasmine.getEnv().reporter.reportSpecWaiting(); - return this._execute(function() { - jasmine.getEnv().reporter.reportSpecRunning(); - JHW.timerDone(); - return onComplete(); - }); - }; - jasmine.WaitsBlock.prototype.execute = pauseAndRun; - jasmine.WaitsForBlock.prototype.execute = pauseAndRun; - jasmine.NestedResults.prototype.addResult_ = jasmine.NestedResults.prototype.addResult; - jasmine.NestedResults.prototype.addResult = function(result) { - result.expectations = []; - result.expectations = jasmine.NestedResults.parseAndStore(arguments.callee.caller.caller.caller.toString()); - return this.addResult_(result); - }; - _ref = ["reportSpecWaiting", "reportSpecRunning"]; - for (_i = 0, _len = _ref.length; _i < _len; _i++) { - method = _ref[_i]; - generator = function(method) { - return function() { - var args, reporter, _j, _len2, _ref2, _results; - args = 1 <= arguments.length ? __slice.call(arguments, 0) : []; - _ref2 = this.subReporters_; - _results = []; - for (_j = 0, _len2 = _ref2.length; _j < _len2; _j++) { - reporter = _ref2[_j]; - if (reporter[method] != null) { - _results.push(reporter[method].apply(reporter, args)); - } else { - _results.push(void 0); - } - } - return _results; - }; - }; - jasmine.MultiReporter.prototype[method] = generator(method); - } - } - } - -}).call(this); diff --git a/vendor/assets/javascripts/jasmine.HeadlessReporter.Verbose.coffee b/vendor/assets/javascripts/jasmine.HeadlessReporter.Verbose.coffee index 605bb5f..1d1d0b0 100644 --- a/vendor/assets/javascripts/jasmine.HeadlessReporter.Verbose.coffee +++ b/vendor/assets/javascripts/jasmine.HeadlessReporter.Verbose.coffee @@ -45,3 +45,13 @@ class jasmine.HeadlessReporter.Verbose extends jasmine.HeadlessReporter.ConsoleB colorLine: (line, color) => line.foreground(color) + + reportException: (e) => + e = JHW.createCoffeeScriptFileException(e) + + output = e.message + if e.sourceURL && e.lineNumber + output = "#{e.sourceURL}:~#{e.lineNumber} #{output}" + + this.puts(output.foreground('yellow')) + diff --git a/vendor/assets/javascripts/prolog.js b/vendor/assets/javascripts/prolog.js index 6ccdbc5..3ada0bb 100644 --- a/vendor/assets/javascripts/prolog.js +++ b/vendor/assets/javascripts/prolog.js @@ -82,6 +82,21 @@ JHW._usedConsole = true; return puts(msg); }; + JHW.createCoffeeScriptFileException = function(e) { + var filename, realFilename; + if (e && e.sourceURL && window.CoffeeScriptToFilename) { + filename = e.sourceURL.split('/').pop(); + if (realFilename = window.CoffeeScriptToFilename[filename]) { + e = { + name: e.name, + message: e.message, + lineNumber: "~" + String(e.line), + sourceURL: realFilename + }; + } + } + return e; + }; } window.CoffeeScriptToFilename = {};