diff --git a/build/json-min.js b/build/json-min.js index e31eb9f0f5..e3692c5df6 100644 --- a/build/json-min.js +++ b/build/json-min.js @@ -1,6 +1,6 @@ /* Copyright 2012, KISSY UI Library v1.40dev MIT Licensed -build time: Nov 9 16:14 +build time: Nov 13 13:58 */ -KISSY.add("json",function(c,a){a=a||window.JSON;return c.JSON={parse:function(b){return null==b||""===b?null:a.parse(b)},stringify:a.stringify}},{requires:[KISSY.Features.isNativeJSONSupported?"empty":"json/json2"]}); +KISSY.add("json",function(c,a){"undefined"!==typeof JSON&&(a=JSON);return c.JSON={parse:function(b){return null==b||""===b?null:a.parse(b)},stringify:a.stringify}},{requires:[KISSY.Features.isNativeJSONSupported?"empty":"json/json2"]}); diff --git a/build/json.js b/build/json.js index 3437cdb2b9..e9db8dd57f 100644 --- a/build/json.js +++ b/build/json.js @@ -1,15 +1,17 @@ /* Copyright 2012, KISSY UI Library v1.40dev MIT Licensed -build time: Nov 9 16:14 +build time: Nov 13 13:58 */ /** * @ignore * @fileOverview kissy json use json2 or native conditionally */ -KISSY.add('json', function (S, JSON) { +KISSY.add('json', function (S, J) { - JSON = JSON || window.JSON; + if (typeof JSON !== 'undefined') { + J = JSON; + } /** * Provide json utils for KISSY. @@ -28,7 +30,7 @@ KISSY.add('json', function (S, JSON) { if (text == null || text === '') { return null; } - return JSON.parse(text); + return J.parse(text); }, /** * serialize json object to string. @@ -36,7 +38,7 @@ KISSY.add('json', function (S, JSON) { * @param {Object} jsonObject * @return {String} */ - stringify: JSON.stringify + stringify: J.stringify }; }, { requires: [ diff --git a/build/json/json2-min.js b/build/json/json2-min.js index 4b1c3560d6..4f4c2cda92 100644 --- a/build/json/json2-min.js +++ b/build/json/json2-min.js @@ -1,7 +1,7 @@ /* Copyright 2012, KISSY UI Library v1.40dev MIT Licensed -build time: Nov 9 16:14 +build time: Nov 13 13:58 */ KISSY.add("json/json2",function(){function k(a){return 10>a?"0"+a:a}function o(a){p.lastIndex=0;return p.test(a)?'"'+a.replace(p,function(a){var c=s[a];return"string"===typeof c?c:"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+a+'"'}function m(a,i){var c,d,h,n,g=e,f,b=i[a];b&&"object"===typeof b&&"function"===typeof b.toJSON&&(b=b.toJSON(a));"function"===typeof j&&(b=j.call(i,a,b));switch(typeof b){case "string":return o(b);case "number":return isFinite(b)?""+b:"null";case "boolean":case "null":return""+ b;case "object":if(!b)return"null";e+=l;f=[];if("[object Array]"===Object.prototype.toString.apply(b)){n=b.length;for(c=0;c=0.2.0", "js-beautify": ">=0.2.0" }, + "devDependencies": { + "walkdir": ">0.0.4", + "jasmine-reporters": ">0.2" + }, "licenses": [ { "type": "MIT", diff --git a/reports/TEST-base.xml b/reports/TEST-base.xml new file mode 100644 index 0000000000..3b3e8b5d76 --- /dev/null +++ b/reports/TEST-base.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/reports/TEST-base_complex.xml b/reports/TEST-base_complex.xml new file mode 100644 index 0000000000..1144f8732a --- /dev/null +++ b/reports/TEST-base_complex.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/reports/TEST-htmlparser_for_editor.xml b/reports/TEST-htmlparser_for_editor.xml new file mode 100644 index 0000000000..9d8ee32f2a --- /dev/null +++ b/reports/TEST-htmlparser_for_editor.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/reports/TEST-htmlparser_lexer.xml b/reports/TEST-htmlparser_lexer.xml new file mode 100644 index 0000000000..e45da4b5d3 --- /dev/null +++ b/reports/TEST-htmlparser_lexer.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/reports/TEST-htmlparser_parser.xml b/reports/TEST-htmlparser_parser.xml new file mode 100644 index 0000000000..7f70c08fb1 --- /dev/null +++ b/reports/TEST-htmlparser_parser.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/reports/TEST-json.xml b/reports/TEST-json.xml new file mode 100644 index 0000000000..26e4804902 --- /dev/null +++ b/reports/TEST-json.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/reports/TEST-kison.xml b/reports/TEST-kison.xml new file mode 100644 index 0000000000..01fa1c6370 --- /dev/null +++ b/reports/TEST-kison.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/reports/TEST-template.xml b/reports/TEST-template.xml new file mode 100644 index 0000000000..1aee2fea7a --- /dev/null +++ b/reports/TEST-template.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/reports/TEST-xtemplate.xml b/reports/TEST-xtemplate.xml new file mode 100644 index 0000000000..4a740feb68 --- /dev/null +++ b/reports/TEST-xtemplate.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/base/tests/specs/complex-spec.js b/src/base/tests/specs/complex-spec.js index dd3c6eefd6..0f8f4e0fea 100644 --- a/src/base/tests/specs/complex-spec.js +++ b/src/base/tests/specs/complex-spec.js @@ -3,7 +3,7 @@ * @author yiminghe@gmail.com */ KISSY.use("base", function (S, Base) { - describe("complex base/attribute", function () { + describe("base_complex", function () { it("can merge property value object from parent class", function () { function a() { diff --git a/src/htmlparser/tests/specs/editor-spec.js b/src/htmlparser/tests/specs/editor-spec.js index ea57c20e3f..235ebd449b 100644 --- a/src/htmlparser/tests/specs/editor-spec.js +++ b/src/htmlparser/tests/specs/editor-spec.js @@ -1,9 +1,26 @@ KISSY.use("htmlparser", function (S, HtmlParser) { var UA = S.UA; - describe("htmlparser for editor works", function () { + + + function getTextSync(path, callback) { + if (S.Env.nodejs) { + path=require('path').resolve(__dirname,path); + var fs = require('fs'); + callback(fs.readFileSync(path, 'utf-8')); + } else { + S.io({ + url: path, + dataType: 'text', + async: false, + success: callback + }); + } + } + + describe("htmlparser_for_editor", function () { it("can filter elementNames", function () { var dataFilterRules = { - tagNames:[ + tagNames: [ [ /^script$/i , '' ], [ /^iframe$/i , '' ], [ /^style$/i , '' ], @@ -32,11 +49,11 @@ KISSY.use("htmlparser", function (S, HtmlParser) { it("can filter imagedata in vml@ie", function () { var dataFilterRules = { - tagNames:[ + tagNames: [ [/^\?xml.*$/i, ''] ], - tags:{ - $:function (el) { + tags: { + $: function (el) { var tagName = el.tagName || ""; if (tagName.indexOf(':') != -1 && !/^ke/.test(tagName)) { if (tagName == 'v:imagedata') { @@ -66,13 +83,8 @@ KISSY.use("htmlparser", function (S, HtmlParser) { var before = ""; - S.io({ - url:"../others/editor/vml_img.html", - dataType:'text', - async:false, - success:function (d) { - before = d; - } + getTextSync("../others/editor/vml_img.html", function (d) { + before = d; }); var n = new HtmlParser.Parser(before).parse(); @@ -132,8 +144,9 @@ KISSY.use("htmlparser", function (S, HtmlParser) { }); - for (var i = 0; i < rules.length; i++) + for (var i = 0; i < rules.length; i++) { rules[ i ] = rules[ i ].join(':'); + } return rules.length ? ( rules.join(';') + ';' ) : false; @@ -153,9 +166,9 @@ KISSY.use("htmlparser", function (S, HtmlParser) { ]); var dataFilterRules = { - attributes:{ + attributes: { // word - "class":function (value) { + "class": function (value) { if ( !value || @@ -165,7 +178,7 @@ KISSY.use("htmlparser", function (S, HtmlParser) { } return value; }, - 'style':function (value) { + 'style': function (value) { //去除微软垃圾 var re = filterStyle(value); if (!re) { @@ -199,8 +212,9 @@ KISSY.use("htmlparser", function (S, HtmlParser) { var childNodes = block.childNodes, lastIndex = childNodes.length, last = childNodes[ lastIndex - 1 ]; - while (last && last.nodeType == 3 && !S.trim(last.nodeValue)) + while (last && last.nodeType == 3 && !S.trim(last.nodeValue)) { last = childNodes[ --lastIndex ]; + } return last; } @@ -254,8 +268,8 @@ KISSY.use("htmlparser", function (S, HtmlParser) { var dataFilterRules = { - tags:{ - p:extendBlockForDisplay + tags: { + p: extendBlockForDisplay } }; @@ -279,17 +293,17 @@ KISSY.use("htmlparser", function (S, HtmlParser) { it("filter children works while modify html", function () { var rules = { - tags:{ + tags: { - p:function (el) { + p: function (el) { el.filterChildren(); } } }; var rules2 = { - tags:{ - p:function (el) { + tags: { + p: function (el) { el.appendChild(new HtmlParser.Text(" ")); } } @@ -314,11 +328,11 @@ KISSY.use("htmlparser", function (S, HtmlParser) { it("filter will run only once", function () { var count = 0; var rules = { - tags:{ - p:function (el) { + tags: { + p: function (el) { el.filterChildren(); }, - span:function () { + span: function () { count++; } } @@ -340,7 +354,7 @@ KISSY.use("htmlparser", function (S, HtmlParser) { it("can filter attributeNames", function () { var rules = { - attributeNames:[ + attributeNames: [ // 把保存的作为真正的属性，替换掉原来的 // replace(/^_ke_saved_/,"") // _ke_saved_href -> href diff --git a/src/htmlparser/tests/specs/lexer-spec.js b/src/htmlparser/tests/specs/lexer-spec.js index 6af0022cf4..2b6a89861c 100644 --- a/src/htmlparser/tests/specs/lexer-spec.js +++ b/src/htmlparser/tests/specs/lexer-spec.js @@ -1,6 +1,6 @@ KISSY.use("htmlparser", function(S, HtmlParser) { var Lexer = HtmlParser.Lexer; - describe("Lexer", function() { + describe("htmlparser_lexer", function() { it("works", function() { diff --git a/src/htmlparser/tests/specs/parser-spec.js b/src/htmlparser/tests/specs/parser-spec.js index 4e7560f882..44832089e4 100644 --- a/src/htmlparser/tests/specs/parser-spec.js +++ b/src/htmlparser/tests/specs/parser-spec.js @@ -4,7 +4,7 @@ */ KISSY.use("htmlparser", function (S, HtmlParser) { var Parser = HtmlParser.Parser; - describe("Parser", function () { + describe("htmlparser_parser", function () { it("works for valid html", function () { // valid html is fine diff --git a/src/jasmine-node.js b/src/jasmine-node.js new file mode 100644 index 0000000000..e6f126ed4e --- /dev/null +++ b/src/jasmine-node.js @@ -0,0 +1,200 @@ +/** + * @fileOverview jasmine runner in nodejs for KISSY. + * refer: https://github.com/mhevery/jasmine-node/ + * @author yiminghe@gmail.com + */ + +// global +var S = global.KISSY = require('../' + 'build/kissy-nodejs.js'); + +var jasmineWrapper = require('../tools/jasmine/jasmine'); + +var jasmine = jasmineWrapper.jasmine; + +S.each(jasmineWrapper, function (v, k) { + global[k] = v; +}); + +require('jasmine-reporters'); + +// ------------ configs start + +var isVerbose = false; +var showColors = true; +var extentions = "js"; +var match = '.'; +var matchAll = false; + +var junitReport = { + report: true, + savePath: "./reports/", + useDotNotation: true, + consolidate: true +}; + +var mods = [ + 'xtemplate', + 'kison', + 'json', + 'base', + 'htmlparser', + 'template' +]; + +// ------------ configs end + +var specFolders = []; + +var util, + path = require('path'); + +try { + util = require('util') +} catch (e) { + util = require('sys') +} + +for (var key in jasmine) { + global[key] = jasmine[key]; +} + +S.each(mods, function (m) { + specFolders.push(m + '/tests/specs/'); +}); + +var regExpSpec = new RegExp(match + (matchAll ? "" : "spec\\.") + + "(" + extentions + ")$", 'i'); + +var cwd = process.cwd(); + +// in case run from idea +if (!S.endsWith(cwd, "src")) { + cwd += '/src'; +} + +var exitCode, index = 0; + +// KISSY.use is asynchronous even in nodejs +KISSY.use(mods, function () { + + var index = 0; + + function onComplete(runner) { + var description = runner.queue.blocks[0].description; + util.print(description + ' ↑ \n'); + util.print(new Array(20).join('-')); + util.print('\n'); + if (runner.results().failedCount == 0) { + exitCode = 0; + } else { + exitCode = 1; + } + + process.nextTick(function () { + // new environment + jasmine.currentEnv_ = new jasmine.Env(); + next(); + }); + } + + function next() { + + if (index < specFolders.length) { + var specFolder = path.resolve(cwd, specFolders[index++]); + + executeSpecsInFolder(specFolder, + onComplete, + isVerbose, + showColors, + regExpSpec, + junitReport); + } + } + + next(); + +}); + +function help() { + util.print([ + 'USAGE: jasmine-node [--color|--noColor] [--verbose] [--coffee] directory' + , '' + , 'Options:' + , ' --color - use color coding for output' + , ' --noColor - do not use color coding for output' + , ' -m, --match REGEXP - load only specs containing "REGEXPspec"' + , ' --matchAll - relax requirement of "spec" in spec file names' + , ' --verbose - print extra information per each test run' + , ' --junitReport - export tests results as junitReport xml format' + , ' --output - defines the output folder for junitReport files' + , ' -h, --help - display this help and exit' + , '' + ].join("\n")); + + process.exit(-1); +} + +var walkdir = require('walkdir'); +var fs = require('fs'); + +function loadSpecs(loadPath, matcher) { + var wannaBeSpecs = walkdir.sync(loadPath), + specs = []; + + for (var i = 0; i < wannaBeSpecs.length; i++) { + var file = wannaBeSpecs[i]; + try { + if (fs.statSync(file).isFile()) { + if (!/.*node_modules.*/.test(file) && + matcher.test(path.basename(file))) { + specs.push(file); + } + } + } catch (e) { + // nothing to do here + } + } + + return specs; +} + +var jasmineNode = require('../tools/jasmine/node/reporter').jasmineNode; + +function executeSpecsInFolder(folder, done, isVerbose, showColors, matcher, junitReport) { + var fileMatcher = matcher || new RegExp(".(js)$", "i"), + jasmineEnv = jasmine.getEnv(); + + var specsList = loadSpecs(folder, fileMatcher); + + if (junitReport && junitReport.report) { + if (!path.existsSync(junitReport.savePath)) { + util.puts('creating junit xml report save path: ' + junitReport.savePath); + fs.mkdirSync(junitReport.savePath, "0755"); + } + jasmineEnv.addReporter(new jasmine['JUnitXmlReporter'](junitReport.savePath, + junitReport.consolidate, + junitReport.useDotNotation)); + } + + if (isVerbose) { + jasmineEnv.addReporter(new jasmineNode.TerminalVerboseReporter({ + print: util.print, + color: showColors, + onComplete: done + })); + } else { + jasmineEnv.addReporter(new jasmineNode.TerminalReporter({ + print: util.print, + color: showColors, + onComplete: done + })); + } + + + for (var i = 0, len = specsList.length; i < len; ++i) { + var filename = specsList[i]; + require(filename.replace(/\.\w+$/, "")); + } + + jasmineEnv.execute(); +} \ No newline at end of file diff --git a/src/json/src/json.js b/src/json/src/json.js index b03b1130d0..be4013f365 100644 --- a/src/json/src/json.js +++ b/src/json/src/json.js @@ -2,9 +2,11 @@ * @ignore * @fileOverview kissy json use json2 or native conditionally */ -KISSY.add('json', function (S, JSON) { +KISSY.add('json', function (S, J) { - JSON = JSON || window.JSON; + if (typeof JSON !== 'undefined') { + J = JSON; + } /** * Provide json utils for KISSY. @@ -23,7 +25,7 @@ KISSY.add('json', function (S, JSON) { if (text == null || text === '') { return null; } - return JSON.parse(text); + return J.parse(text); }, /** * serialize json object to string. @@ -31,7 +33,7 @@ KISSY.add('json', function (S, JSON) { * @param {Object} jsonObject * @return {String} */ - stringify: JSON.stringify + stringify: J.stringify }; }, { requires: [ diff --git a/src/kison/tests/specs/grammar-spec.js b/src/kison/tests/specs/grammar-spec.js index 81b0213c48..9b902586fa 100644 --- a/src/kison/tests/specs/grammar-spec.js +++ b/src/kison/tests/specs/grammar-spec.js @@ -5,7 +5,11 @@ KISSY.use("kison", function (S, Kison) { var Grammar = Kison.Grammar; var Utils = Kison.Utils; - describe("grammar", function () { + if (typeof global == 'undefined') { + window.global = {}; + } + + describe("kison", function () { it('escape correctly', function () { @@ -64,29 +68,29 @@ KISSY.use("kison", function (S, Kison) { var itemSets = grammar.get("itemSets"); S.each(itemSets, function (itemSet, i) { - S.log("************************* " + i); - S.log(itemSet.toString()); + // S.log("************************* " + i); + // S.log(itemSet.toString()); }); expect(itemSets.length).toBe(8); - S.log(itemSets); + // S.log(itemSets); var i1gotos = itemSets[1].get("gotos"); expect(itemSets[0].get("gotos")['c']).toBe(itemSets[1]); - S.log("!!!!!!!!!!!!!!!"); - // S.log(itemSets[4].get("gotos")['c'].toString()); - S.log("!!!!!!!!!!!!!!!"); + // S.log("!!!!!!!!!!!!!!!"); + // // S.log(itemSets[4].get("gotos")['c'].toString()); + // S.log("!!!!!!!!!!!!!!!"); // expect(itemSets[4].get("gotos")['c']).toBe(itemSets[1]); var num = 0; S.each(i1gotos, function (itemSet, symbol) { - S.log("************************* " + symbol); - S.log(itemSet.toString()); + // S.log("************************* " + symbol); + // S.log(itemSet.toString()); if (symbol == "c") { expect(itemSet).toBe(itemSets[1]); } @@ -100,7 +104,7 @@ KISSY.use("kison", function (S, Kison) { it("generate table ok", function () { - S.log('it("generate table ok", function () {'); + // S.log('it("generate table ok", function () {'); var grammar = new Grammar({ productions: [ @@ -147,7 +151,7 @@ KISSY.use("kison", function (S, Kison) { var table = grammar.visualizeTable(); - S.log(table.join("\n")); + // S.log(table.join("\n")); }); @@ -465,12 +469,12 @@ KISSY.use("kison", function (S, Kison) { it("parse ok with action", function () { - S.log("---------------- parse ok with action : ccdd by "); - S.log(" S0 => S "); - S.log(" S => CC "); - S.log(" C => cC "); - S.log(" C => d "); - S.log("------------------------------------------------\n"); + // S.log("---------------- parse ok with action : ccdd by "); + // S.log(" S0 => S "); + // S.log(" S => CC "); + // S.log(" C => cC "); + // S.log(" C => d "); + // S.log("------------------------------------------------\n"); // S0 => S // S => CC @@ -486,7 +490,7 @@ KISSY.use("kison", function (S, Kison) { "S" ], action: function () { - var ret = window.TEST_RET || (window.TEST_RET = []); + var ret = global.TEST_RET || (global.TEST_RET = []); ret.push("S0 => S"); ret.push("|_____ " + this.$1 + " -> S0"); ret.push(""); @@ -498,7 +502,7 @@ KISSY.use("kison", function (S, Kison) { "C", "C" ], action: function () { - var ret = window.TEST_RET || (window.TEST_RET = []); + var ret = global.TEST_RET || (global.TEST_RET = []); ret.push("S => C C"); ret.push("|_____ " + this.$1 + " + " + this.$2 + " -> S"); ret.push(""); @@ -511,7 +515,7 @@ KISSY.use("kison", function (S, Kison) { "c", "C" ], action: function () { - var ret = window.TEST_RET || (window.TEST_RET = []); + var ret = global.TEST_RET || (global.TEST_RET = []); ret.push("C => c C"); ret.push("|_____ " + this.$1 + " + " + this.$2 + " -> C"); ret.push(""); @@ -524,7 +528,7 @@ KISSY.use("kison", function (S, Kison) { "d" ], action: function () { - var ret = window.TEST_RET || (window.TEST_RET = []); + var ret = global.TEST_RET || (global.TEST_RET = []); ret.push("C => d"); ret.push("|_____ " + this.$1 + " -> C"); ret.push(""); @@ -550,7 +554,7 @@ KISSY.use("kison", function (S, Kison) { new Function(grammar.genCode())().parse("ccdd") }).not.toThrow(undefined); - S.log(window.TEST_RET.join("\n")); + // S.log(global.TEST_RET.join("\n")); }); diff --git a/src/template/tests/specs/template-spec.js b/src/template/tests/specs/template-spec.js index bba821f724..a2a339b569 100644 --- a/src/template/tests/specs/template-spec.js +++ b/src/template/tests/specs/template-spec.js @@ -3,7 +3,7 @@ KISSY.use("template,dom", function (S, T, DOM) { describe('template', function () { it("slash and quote should be escaped", function () { - expect(T('{{#if a=="a"}}{{b}}\\"{{/if}}').render({a:"a", b:"b"})).toBe('b\\"'); + expect(T('{{#if a=="a"}}{{b}}\\"{{/if}}').render({a: "a", b: "b"})).toBe('b\\"'); }); it("should also support @", function () { @@ -19,11 +19,11 @@ KISSY.use("template,dom", function (S, T, DOM) { // KS_TEMPL.push(typeof (item.x||item.y) ==="undefined"?"":item.x||item.y) it("should support undefined variable in object", function () { expect(T('{{item.x||item.y}}').render({ - item:{x:0, y:2} + item: {x: 0, y: 2} })).toBe('2'); }); - describe('variable', function () { // {{{ + describe('variable', function () { it('should render a normal string', function () { expect(T('a').render()).toEqual('a'); expect(T('a').render({})).toEqual('a'); @@ -31,137 +31,139 @@ KISSY.use("template,dom", function (S, T, DOM) { expect(T('>a').render({})).toEqual('>a'); }); it('should render a normal variable', function () { - expect(T('{{a}},{{b}}').render({a:'1', b:'2'})).toEqual('1,2'); + expect(T('{{a}},{{b}}').render({a: '1', b: '2'})).toEqual('1,2'); expect(T('{{}}').render({})).toEqual('{{}}'); }); - }); // }}} - describe('statement', function () { // {{{ + }); + describe('statement', function () { describe('if', function () { it('support if statement', function () { - expect(T('{{#if a}}{{b}}{{/if}}').render({a:'a', b:'b'})).toEqual('b'); - expect(T('{{#if a}}normal string{{b}}{{/if}}').render({a:'a', b:'b'})).toEqual('normal stringb'); - expect(T('{{#if a==\'a\'}}{{b}}{{/if}}').render({a:'a', b:'b'})).toEqual('b'); - expect(T('{{#if a==\'b\'}}{{b}}{{/if}}').render({a:'a', b:'b'})).toEqual(''); - expect(T('{{#if a!=\'b\'}}{{b}}{{/if}}').render({a:'a', b:'b'})).toEqual('b'); - expect(T('{{#if a == " "}}{{b}}{{/if}}').render({a:' ', b:'b'})).toEqual('b'); + expect(T('{{#if a}}{{b}}{{/if}}').render({a: 'a', b: 'b'})).toEqual('b'); + expect(T('{{#if a}}normal string{{b}}{{/if}}').render({a: 'a', b: 'b'})).toEqual('normal stringb'); + expect(T('{{#if a==\'a\'}}{{b}}{{/if}}').render({a: 'a', b: 'b'})).toEqual('b'); + expect(T('{{#if a==\'b\'}}{{b}}{{/if}}').render({a: 'a', b: 'b'})).toEqual(''); + expect(T('{{#if a!=\'b\'}}{{b}}{{/if}}').render({a: 'a', b: 'b'})).toEqual('b'); + expect(T('{{#if a == " "}}{{b}}{{/if}}').render({a: ' ', b: 'b'})).toEqual('b'); }); }); describe('else', function () { it('support else statement', function () { - expect(T('{{#if a}}{{b}}{{#else}}{{c}}{{/if}}').render({a:'a', b:'b', c:'c'})).toEqual('b'); - expect(T('{{#if a}}{{b}}{{#else}}{{c}}{{/if}}').render({a:false, b:'b', c:'c'})).toEqual('c'); - expect(T('{{#if a==\'b\'}}{{b}}{{#else}}{{c}}{{/if}}').render({a:'a', b:'b', c:'c'})).toEqual('c'); + expect(T('{{#if a}}{{b}}{{#else}}{{c}}{{/if}}').render({a: 'a', b: 'b', c: 'c'})).toEqual('b'); + expect(T('{{#if a}}{{b}}{{#else}}{{c}}{{/if}}').render({a: false, b: 'b', c: 'c'})).toEqual('c'); + expect(T('{{#if a==\'b\'}}{{b}}{{#else}}{{c}}{{/if}}').render({a: 'a', b: 'b', c: 'c'})).toEqual('c'); }); }); describe('elseif', function () { it('support elseif statement', function () { - expect(T('{{#if a}}{{b}}{{#elseif true}}{{c}}{{/if}}').render({a:false, b:'b', c:'c'})).toEqual('c'); - expect(T('{{#if a}}{{b}}{{#elseif false}}{{c}}{{/if}}').render({a:false, b:'b', c:'c'})).toEqual(''); - expect(T('{{#if !a}}{{b}}{{#elseif false}}{{c}}{{/if}}').render({a:false, b:'b', c:'c'})).toEqual('b'); - expect(T('{{#if a}}{{b}}{{#elseif !!b}}{{c}}{{/if}}').render({a:false, b:'b', c:'c'})).toEqual('c'); + expect(T('{{#if a}}{{b}}{{#elseif true}}{{c}}{{/if}}').render({a: false, b: 'b', c: 'c'})).toEqual('c'); + expect(T('{{#if a}}{{b}}{{#elseif false}}{{c}}{{/if}}').render({a: false, b: 'b', c: 'c'})).toEqual(''); + expect(T('{{#if !a}}{{b}}{{#elseif false}}{{c}}{{/if}}').render({a: false, b: 'b', c: 'c'})).toEqual('b'); + expect(T('{{#if a}}{{b}}{{#elseif !!b}}{{c}}{{/if}}').render({a: false, b: 'b', c: 'c'})).toEqual('c'); }); }); describe('each', function () { it('support each function', function () { - expect(T('{{#each a}}<{{_ks_value.a}}{{/each}}').render({a:[ - {a:1}, - {a:2}, - {a:3} + expect(T('{{#each a}}<{{_ks_value.a}}{{/each}}').render({a: [ + {a: 1}, + {a: 2}, + {a: 3} ]})).toEqual('<1<2<3'); - expect(T('{{#each a}}{{#if _ks_value.a > 1}}{{_ks_value.a}}{{/if}}{{/each}}').render({a:[ - {a:1}, - {a:2}, - {a:3} + expect(T('{{#each a}}{{#if _ks_value.a > 1}}{{_ks_value.a}}{{/if}}{{/each}}').render({a: [ + {a: 1}, + {a: 2}, + {a: 3} ]})).toEqual('23'); }); it('support custom value, index', function () { - expect(T('{{#each a as}}<{{_ks_value.a}}{{/each}}').render({a:[ - {a:1}, - {a:2}, - {a:3} + expect(T('{{#each a as}}<{{_ks_value.a}}{{/each}}').render({a: [ + {a: 1}, + {a: 2}, + {a: 3} ]})).toEqual('<1<2<3'); - expect(T('{{#each a as value}}<{{value.a}}{{/each}}').render({a:[ - {a:1}, - {a:2}, - {a:3} + expect(T('{{#each a as value}}<{{value.a}}{{/each}}').render({a: [ + {a: 1}, + {a: 2}, + {a: 3} ]})).toEqual('<1<2<3'); - expect(T('{{#each a as value index}}<{{index}}:{{value.a}}{{/each}}').render({a:[ - {a:1}, - {a:2}, - {a:3} + expect(T('{{#each a as value index}}<{{index}}:{{value.a}}{{/each}}').render({a: [ + {a: 1}, + {a: 2}, + {a: 3} ]})).toEqual('<0:1<1:2<2:3'); }); }); - }); // }}} - describe('cache', function () { // {{{ + }); + describe('cache', function () { it('have template cache', function () { var t = T('{{#each a}}<{{_ks_value.a}}{{/each}}'); f = T('{{#each a}}<{{_ks_value.a}}{{/each}}'); expect(t).toEqual(f); }); - }); // }}} - describe('error', function () { // {{{ + }); + describe('error', function () { it('can handle syntax template error', function () { expect(T('{{-}}').render().indexOf('Syntax Error.')).not.toEqual(-1); }); - }); // }}} - describe('log', function () { // {{{ + }); + describe('log', function () { it('can log all compiled template code', function () { - T.log('{{}}'); + // T.log('{{}}'); }); - }); // }}} - describe('node', function () { // {{{ - it('have chain support for KISSY.Node', function () { - S.one(S.DOM.create([ - '
' - ].join(''))).appendTo(document.body); - S.one(T(S.one('#template').html()).render({ - a:[ - {a:1}, - {a:2}, - {a:3} - ], - b:[ - {a:4}, - {a:5}, - {a:6} - ] - })).appendTo('#container'); - expect(S.one('#render').html()).toEqual('123'); - S.one('#container').html(''); + }); + if (!S.Env.nodejs) { + describe('node', function () { + it('have chain support for KISSY.Node', function () { + S.one(S.DOM.create([ + '
' + ].join(''))).appendTo(document.body); + S.one(T(S.one('#template').html()).render({ + a: [ + {a: 1}, + {a: 2}, + {a: 3} + ], + b: [ + {a: 4}, + {a: 5}, + {a: 6} + ] + })).appendTo('#container'); + expect(S.one('#render').html()).toEqual('123'); + S.one('#container').html(''); + }); }); - }); // }}} - describe('comments', function () { // {{{ + } + describe('comments', function () { it('supports comments', function () { expect(T('{{#! here is a comment tag}}').render()).toEqual(''); }); - }); // }}} - describe('nested', function () { // {{{ + }); + describe('nested', function () { it('supports nested', function () { expect(T('Hello, {{#each users}}' + '{{#if _ks_value.show}}{{_ks_value.name}}{{/if}}' + '{{#each _ks_value.friends}} {{_ks_value.name}} {{/each}} {{/each}}.') - .render({users:[ + .render({users: [ { - show:false, - name:'Frank', - friends:[ - { name:'jolin' }, - { name:'jolin2' } + show: false, + name: 'Frank', + friends: [ + { name: 'jolin' }, + { name: 'jolin2' } ] }, { - show:true, - name:'yyfrankyy', - friends:[ - { name:'angela' } + show: true, + name: 'yyfrankyy', + friends: [ + { name: 'angela' } ] } ]})).toEqual('Hello, jolin jolin2 yyfrankyy angela .'); @@ -170,20 +172,20 @@ KISSY.use("template,dom", function (S, T, DOM) { expect(T('Hello, {{#each users as user}}' + '{{#if user.show}}{{user.name}}{{/if}}' + '{{#each user.friends as friend}} {{friend.name}} {{/each}} {{/each}}.') - .render({users:[ + .render({users: [ { - show:false, - name:'Frank', - friends:[ - { name:'jolin' }, - { name:'jolin2' } + show: false, + name: 'Frank', + friends: [ + { name: 'jolin' }, + { name: 'jolin2' } ] }, { - show:true, - name:'yyfrankyy', - friends:[ - { name:'angela' } + show: true, + name: 'yyfrankyy', + friends: [ + { name: 'angela' } ] } ]})).toEqual('Hello, jolin jolin2 yyfrankyy angela .'); diff --git a/tools/jasmine/jasmine-html.js b/tools/jasmine/jasmine-html.js index 81402b9c10..a0b06394ec 100644 --- a/tools/jasmine/jasmine-html.js +++ b/tools/jasmine/jasmine-html.js @@ -1,3 +1,429 @@ +jasmine.HtmlReporterHelpers = {}; + +jasmine.HtmlReporterHelpers.createDom = function(type, attrs, childrenVarArgs) { + var el = document.createElement(type); + + for (var i = 2; i < arguments.length; i++) { + var child = arguments[i]; + + if (typeof child === 'string') { + el.appendChild(document.createTextNode(child)); + } else { + if (child) { + el.appendChild(child); + } + } + } + + for (var attr in attrs) { + if (attr == "className") { + el[attr] = attrs[attr]; + } else { + el.setAttribute(attr, attrs[attr]); + } + } + + return el; +}; + +jasmine.HtmlReporterHelpers.getSpecStatus = function(child) { + var results = child.results(); + var status = results.passed() ? 'passed' : 'failed'; + if (results.skipped) { + status = 'skipped'; + } + + return status; +}; + +jasmine.HtmlReporterHelpers.appendToSummary = function(child, childElement) { + var parentDiv = this.dom.summary; + var parentSuite = (typeof child.parentSuite == 'undefined') ? 'suite' : 'parentSuite'; + var parent = child[parentSuite]; + + if (parent) { + if (typeof this.views.suites[parent.id] == 'undefined') { + this.views.suites[parent.id] = new jasmine.HtmlReporter.SuiteView(parent, this.dom, this.views); + } + parentDiv = this.views.suites[parent.id].element; + } + + parentDiv.appendChild(childElement); +}; + + +jasmine.HtmlReporterHelpers.addHelpers = function(ctor) { + for(var fn in jasmine.HtmlReporterHelpers) { + ctor.prototype[fn] = jasmine.HtmlReporterHelpers[fn]; + } +}; + +jasmine.HtmlReporter = function(_doc) { + var self = this; + var doc = _doc || window.document; + + var reporterView; + + var dom = {}; + + // Jasmine Reporter Public Interface + self.logRunningSpecs = false; + + self.reportRunnerStarting = function(runner) { + var specs = runner.specs() || []; + + if (specs.length == 0) { + return; + } + + createReporterDom(runner.env.versionString()); + doc.body.appendChild(dom.reporter); + + reporterView = new jasmine.HtmlReporter.ReporterView(dom); + reporterView.addSpecs(specs, self.specFilter); + }; + + self.reportRunnerResults = function(runner) { + reporterView && reporterView.complete(); + }; + + self.reportSuiteResults = function(suite) { + reporterView.suiteComplete(suite); + }; + + self.reportSpecStarting = function(spec) { + if (self.logRunningSpecs) { + self.log('>> Jasmine Running ' + spec.suite.description + ' ' + spec.description + '...'); + } + }; + + self.reportSpecResults = function(spec) { + reporterView.specComplete(spec); + }; + + self.log = function() { + var console = jasmine.getGlobal().console; + if (console && console.log) { + if (console.log.apply) { + console.log.apply(console, arguments); + } else { + console.log(arguments); // ie fix: console.log.apply doesn't exist on ie + } + } + }; + + self.specFilter = function(spec) { + if (!focusedSpecName()) { + return true; + } + + return spec.getFullName().indexOf(focusedSpecName()) === 0; + }; + + return self; + + function focusedSpecName() { + var specName; + + (function memoizeFocusedSpec() { + if (specName) { + return; + } + + var paramMap = []; + var params = doc.location.search.substring(1).split('&'); + + for (var i = 0; i < params.length; i++) { + var p = params[i].split('='); + paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]); + } + + specName = paramMap.spec; + })(); + + return specName; + } + + function createReporterDom(version) { + dom.reporter = self.createDom('div', { id: 'HTMLReporter', className: 'jasmine_reporter' }, + dom.banner = self.createDom('div', { className: 'banner' }, + self.createDom('span', { className: 'title' }, "Jasmine "), + self.createDom('span', { className: 'version' }, version)), + + dom.symbolSummary = self.createDom('ul', {className: 'symbolSummary'}), + dom.alert = self.createDom('div', {className: 'alert'}), + dom.results = self.createDom('div', {className: 'results'}, + dom.summary = self.createDom('div', { className: 'summary' }), + dom.details = self.createDom('div', { id: 'details' })) + ); + } +}; +jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter);jasmine.HtmlReporter.ReporterView = function(dom) { + this.startedAt = new Date(); + this.runningSpecCount = 0; + this.completeSpecCount = 0; + this.passedCount = 0; + this.failedCount = 0; + this.skippedCount = 0; + + this.createResultsMenu = function() { + this.resultsMenu = this.createDom('span', {className: 'resultsMenu bar'}, + this.summaryMenuItem = this.createDom('a', {className: 'summaryMenuItem', href: "#"}, '0 specs'), + ' | ', + this.detailsMenuItem = this.createDom('a', {className: 'detailsMenuItem', href: "#"}, '0 failing')); + + this.summaryMenuItem.onclick = function() { + dom.reporter.className = dom.reporter.className.replace(/ showDetails/g, ''); + }; + + this.detailsMenuItem.onclick = function() { + showDetails(); + }; + }; + + this.addSpecs = function(specs, specFilter) { + this.totalSpecCount = specs.length; + + this.views = { + specs: {}, + suites: {} + }; + + for (var i = 0; i < specs.length; i++) { + var spec = specs[i]; + this.views.specs[spec.id] = new jasmine.HtmlReporter.SpecView(spec, dom, this.views); + if (specFilter(spec)) { + this.runningSpecCount++; + } + } + }; + + this.specComplete = function(spec) { + this.completeSpecCount++; + + if (isUndefined(this.views.specs[spec.id])) { + this.views.specs[spec.id] = new jasmine.HtmlReporter.SpecView(spec, dom); + } + + var specView = this.views.specs[spec.id]; + + switch (specView.status()) { + case 'passed': + this.passedCount++; + break; + + case 'failed': + this.failedCount++; + break; + + case 'skipped': + this.skippedCount++; + break; + } + + specView.refresh(); + this.refresh(); + }; + + this.suiteComplete = function(suite) { + var suiteView = this.views.suites[suite.id]; + if (isUndefined(suiteView)) { + return; + } + suiteView.refresh(); + }; + + this.refresh = function() { + + if (isUndefined(this.resultsMenu)) { + this.createResultsMenu(); + } + + // currently running UI + if (isUndefined(this.runningAlert)) { + this.runningAlert = this.createDom('a', {href: "?", className: "runningAlert bar"}); + dom.alert.appendChild(this.runningAlert); + } + this.runningAlert.innerHTML = "Running " + this.completeSpecCount + " of " + specPluralizedFor(this.totalSpecCount); + + // skipped specs UI + if (isUndefined(this.skippedAlert)) { + this.skippedAlert = this.createDom('a', {href: "?", className: "skippedAlert bar"}); + } + + this.skippedAlert.innerHTML = "Skipping " + this.skippedCount + " of " + specPluralizedFor(this.totalSpecCount) + " - run all"; + + if (this.skippedCount === 1 && isDefined(dom.alert)) { + dom.alert.appendChild(this.skippedAlert); + } + + // passing specs UI + if (isUndefined(this.passedAlert)) { + this.passedAlert = this.createDom('span', {href: "?", className: "passingAlert bar"}); + } + this.passedAlert.innerHTML = "Passing " + specPluralizedFor(this.passedCount); + + // failing specs UI + if (isUndefined(this.failedAlert)) { + this.failedAlert = this.createDom('span', {href: "?", className: "failingAlert bar"}); + } + this.failedAlert.innerHTML = "Failing " + specPluralizedFor(this.failedCount); + + if (this.failedCount === 1 && isDefined(dom.alert)) { + dom.alert.appendChild(this.failedAlert); + dom.alert.appendChild(this.resultsMenu); + } + + // summary info + this.summaryMenuItem.innerHTML = "" + specPluralizedFor(this.runningSpecCount); + this.detailsMenuItem.innerHTML = "" + this.failedCount + " failing"; + }; + + this.complete = function() { + dom.alert.removeChild(this.runningAlert); + + this.skippedAlert.innerHTML = "Ran " + this.runningSpecCount + " of " + specPluralizedFor(this.totalSpecCount) + " - run all"; + + if (this.failedCount === 0) { + dom.alert.appendChild(this.createDom('span', {className: 'passingAlert bar'}, "Passing " + specPluralizedFor(this.passedCount))); + } else { + showDetails(); + } + + dom.banner.appendChild(this.createDom('span', {className: 'duration'}, "finished in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s")); + }; + + return this; + + function showDetails() { + if (dom.reporter.className.search(/showDetails/) === -1) { + dom.reporter.className += " showDetails"; + } + } + + function isUndefined(obj) { + return typeof obj === 'undefined'; + } + + function isDefined(obj) { + return !isUndefined(obj); + } + + function specPluralizedFor(count) { + var str = count + " spec"; + if (count > 1) { + str += "s" + } + return str; + } + +}; + +jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.ReporterView); + + +jasmine.HtmlReporter.SpecView = function(spec, dom, views) { + this.spec = spec; + this.dom = dom; + this.views = views; + + this.symbol = this.createDom('li', { className: 'pending' }); + this.dom.symbolSummary.appendChild(this.symbol); + + this.summary = this.createDom('div', { className: 'specSummary' }, + this.createDom('a', { + className: 'description', + href: '?spec=' + encodeURIComponent(this.spec.getFullName()), + title: this.spec.getFullName() + }, this.spec.description) + ); + + this.detail = this.createDom('div', { className: 'specDetail' }, + this.createDom('a', { + className: 'description', + href: '?spec=' + encodeURIComponent(this.spec.getFullName()), + title: this.spec.getFullName() + }, this.spec.getFullName()) + ); +}; + +jasmine.HtmlReporter.SpecView.prototype.status = function() { + return this.getSpecStatus(this.spec); +}; + +jasmine.HtmlReporter.SpecView.prototype.refresh = function() { + this.symbol.className = this.status(); + + switch (this.status()) { + case 'skipped': + break; + + case 'passed': + this.appendSummaryToSuiteDiv(); + break; + + case 'failed': + this.appendSummaryToSuiteDiv(); + this.appendFailureDetail(); + break; + } +}; + +jasmine.HtmlReporter.SpecView.prototype.appendSummaryToSuiteDiv = function() { + this.summary.className += ' ' + this.status(); + this.appendToSummary(this.spec, this.summary); +}; + +jasmine.HtmlReporter.SpecView.prototype.appendFailureDetail = function() { + this.detail.className += ' ' + this.status(); + + var resultItems = this.spec.results().getItems(); + var messagesDiv = this.createDom('div', { className: 'messages' }); + + for (var i = 0; i < resultItems.length; i++) { + var result = resultItems[i]; + + if (result.type == 'log') { + messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage log'}, result.toString())); + } else if (result.type == 'expect' && result.passed && !result.passed()) { + messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message)); + + if (result.trace.stack) { + messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack)); + } + } + } + + if (messagesDiv.childNodes.length > 0) { + this.detail.appendChild(messagesDiv); + this.dom.details.appendChild(this.detail); + } +}; + +jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SpecView);jasmine.HtmlReporter.SuiteView = function(suite, dom, views) { + this.suite = suite; + this.dom = dom; + this.views = views; + + this.element = this.createDom('div', { className: 'suite' }, + this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(this.suite.getFullName()) }, this.suite.description) + ); + + this.appendToSummary(this.suite, this.element); +}; + +jasmine.HtmlReporter.SuiteView.prototype.status = function() { + return this.getSpecStatus(this.suite); +}; + +jasmine.HtmlReporter.SuiteView.prototype.refresh = function() { + this.element.className += " " + this.status(); +}; + +jasmine.HtmlReporterHelpers.addHelpers(jasmine.HtmlReporter.SuiteView); + +/* @deprecated Use jasmine.HtmlReporter instead + */ jasmine.TrivialReporter = function(doc) { this.document = doc || document; this.suiteDivs = {}; @@ -31,10 +457,10 @@ jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarA jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) { var showPassed, showSkipped; - this.outerDiv = this.createDom('div', { className: 'jasmine_reporter' }, + this.outerDiv = this.createDom('div', { id: 'TrivialReporter', className: 'jasmine_reporter' }, this.createDom('div', { className: 'banner' }, this.createDom('div', { className: 'logo' }, - this.createDom('a', { href: 'http://pivotal.github.com/jasmine/', target: "_blank" }, "Jasmine"), + this.createDom('span', { className: 'title' }, "Jasmine"), this.createDom('span', { className: 'version' }, runner.env.versionString())), this.createDom('div', { className: 'options' }, "Show ", @@ -110,7 +536,7 @@ jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) { jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) { var results = suite.results(); var status = results.passed() ? 'passed' : 'failed'; - if (results.totalCount == 0) { // todo: change this to check results.skipped + if (results.totalCount === 0) { // todo: change this to check results.skipped status = 'skipped'; } this.suiteDivs[suite.id].className += " " + status; @@ -183,6 +609,8 @@ jasmine.TrivialReporter.prototype.specFilter = function(spec) { paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]); } - if (!paramMap["spec"]) return true; - return spec.getFullName().indexOf(paramMap["spec"]) == 0; + if (!paramMap.spec) { + return true; + } + return spec.getFullName().indexOf(paramMap.spec) === 0; }; diff --git a/tools/jasmine/jasmine.css b/tools/jasmine/jasmine.css index 6583fe7c66..826e575310 100644 --- a/tools/jasmine/jasmine.css +++ b/tools/jasmine/jasmine.css @@ -1,166 +1,81 @@ -body { - font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; -} - - -.jasmine_reporter a:visited, .jasmine_reporter a { - color: #303; -} - -.jasmine_reporter a:hover, .jasmine_reporter a:active { - color: blue; -} - -.run_spec { - float:right; - padding-right: 5px; - font-size: .8em; - text-decoration: none; -} - -.jasmine_reporter { - margin: 0 5px; -} - -.banner { - color: #303; - background-color: #fef; - padding: 5px; -} - -.logo { - float: left; - font-size: 1.1em; - padding-left: 5px; -} - -.logo .version { - font-size: .6em; - padding-left: 1em; -} - -.runner.running { - background-color: yellow; -} - - -.options { - text-align: right; - font-size: .8em; -} - - - - -.suite { - border: 1px outset gray; - margin: 5px 0; - padding-left: 1em; -} - -.suite .suite { - margin: 5px; -} - -.suite.passed { - background-color: #dfd; -} - -.suite.failed { - background-color: #fdd; -} - -.spec { - margin: 5px; - padding-left: 1em; - clear: both; -} - -.spec.failed, .spec.passed, .spec.skipped { - padding-bottom: 5px; - border: 1px solid gray; -} - -.spec.failed { - background-color: #fbb; - border-color: red; -} - -.spec.passed { - background-color: #bfb; - border-color: green; -} - -.spec.skipped { - background-color: #bbb; -} - -.messages { - border-left: 1px dashed gray; - padding-left: 1em; - padding-right: 1em; -} - -.passed { - background-color: #cfc; - display: none; -} - -.failed { - background-color: #fbb; -} - -.skipped { - color: #777; - background-color: #eee; - display: none; -} - - -/*.resultMessage {*/ - /*white-space: pre;*/ -/*}*/ - -.resultMessage span.result { - display: block; - line-height: 2em; - color: black; -} - -.resultMessage .mismatch { - color: black; -} - -.stackTrace { - white-space: pre; - font-size: .8em; - margin-left: 10px; - max-height: 5em; - overflow: auto; - border: 1px inset red; - padding: 1em; - background: #eef; -} - -.finished-at { - padding-left: 1em; - font-size: .6em; -} - -.show-passed .passed, -.show-skipped .skipped { - display: block; -} - - -#jasmine_content { - position:fixed; - right: 100%; -} - -.runner { - border: 1px solid gray; - display: block; - margin: 5px 0; - padding: 2px 0 2px 10px; -} +body { background-color: #eeeeee; padding: 0; margin: 5px; overflow-y: scroll; } + +#HTMLReporter { font-size: 11px; font-family: Monaco, "Lucida Console", monospace; line-height: 14px; color: #333333; } +#HTMLReporter a { text-decoration: none; } +#HTMLReporter a:hover { text-decoration: underline; } +#HTMLReporter p, #HTMLReporter h1, #HTMLReporter h2, #HTMLReporter h3, #HTMLReporter h4, #HTMLReporter h5, #HTMLReporter h6 { margin: 0; line-height: 14px; } +#HTMLReporter .banner, #HTMLReporter .symbolSummary, #HTMLReporter .summary, #HTMLReporter .resultMessage, #HTMLReporter .specDetail .description, #HTMLReporter .alert .bar, #HTMLReporter .stackTrace { padding-left: 9px; padding-right: 9px; } +#HTMLReporter #jasmine_content { position: fixed; right: 100%; } +#HTMLReporter .version { color: #aaaaaa; } +#HTMLReporter .banner { margin-top: 14px; } +#HTMLReporter .duration { color: #aaaaaa; float: right; } +#HTMLReporter .symbolSummary { overflow: hidden; *zoom: 1; margin: 14px 0; } +#HTMLReporter .symbolSummary li { display: block; float: left; height: 7px; width: 14px; margin-bottom: 7px; font-size: 16px; } +#HTMLReporter .symbolSummary li.passed { font-size: 14px; } +#HTMLReporter .symbolSummary li.passed:before { color: #5e7d00; content: "\02022"; } +#HTMLReporter .symbolSummary li.failed { line-height: 9px; } +#HTMLReporter .symbolSummary li.failed:before { color: #b03911; content: "x"; font-weight: bold; margin-left: -1px; } +#HTMLReporter .symbolSummary li.skipped { font-size: 14px; } +#HTMLReporter .symbolSummary li.skipped:before { color: #bababa; content: "\02022"; } +#HTMLReporter .symbolSummary li.pending { line-height: 11px; } +#HTMLReporter .symbolSummary li.pending:before { color: #aaaaaa; content: "-"; } +#HTMLReporter .bar { line-height: 28px; font-size: 14px; display: block; color: #eee; } +#HTMLReporter .runningAlert { background-color: #666666; } +#HTMLReporter .skippedAlert { background-color: #aaaaaa; } +#HTMLReporter .skippedAlert:first-child { background-color: #333333; } +#HTMLReporter .skippedAlert:hover { text-decoration: none; color: white; text-decoration: underline; } +#HTMLReporter .passingAlert { background-color: #a6b779; } +#HTMLReporter .passingAlert:first-child { background-color: #5e7d00; } +#HTMLReporter .failingAlert { background-color: #cf867e; } +#HTMLReporter .failingAlert:first-child { background-color: #b03911; } +#HTMLReporter .results { margin-top: 14px; } +#HTMLReporter #details { display: none; } +#HTMLReporter .resultsMenu, #HTMLReporter .resultsMenu a { background-color: #fff; color: #333333; } +#HTMLReporter.showDetails .summaryMenuItem { font-weight: normal; text-decoration: inherit; } +#HTMLReporter.showDetails .summaryMenuItem:hover { text-decoration: underline; } +#HTMLReporter.showDetails .detailsMenuItem { font-weight: bold; text-decoration: underline; } +#HTMLReporter.showDetails .summary { display: none; } +#HTMLReporter.showDetails #details { display: block; } +#HTMLReporter .summaryMenuItem { font-weight: bold; text-decoration: underline; } +#HTMLReporter .summary { margin-top: 14px; } +#HTMLReporter .summary .suite .suite, #HTMLReporter .summary .specSummary { margin-left: 14px; } +#HTMLReporter .summary .specSummary.passed a { color: #5e7d00; } +#HTMLReporter .summary .specSummary.failed a { color: #b03911; } +#HTMLReporter .description + .suite { margin-top: 0; } +#HTMLReporter .suite { margin-top: 14px; } +#HTMLReporter .suite a { color: #333333; } +#HTMLReporter #details .specDetail { margin-bottom: 28px; } +#HTMLReporter #details .specDetail .description { display: block; color: white; background-color: #b03911; } +#HTMLReporter .resultMessage { padding-top: 14px; color: #333333; } +#HTMLReporter .resultMessage span.result { display: block; } +#HTMLReporter .stackTrace { margin: 5px 0 0 0; max-height: 224px; overflow: auto; line-height: 18px; color: #666666; border: 1px solid #ddd; background: white; white-space: pre; } + +#TrivialReporter { padding: 8px 13px; position: absolute; top: 0; bottom: 0; left: 0; right: 0; overflow-y: scroll; background-color: white; font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; /*.resultMessage {*/ /*white-space: pre;*/ /*}*/ } +#TrivialReporter a:visited, #TrivialReporter a { color: #303; } +#TrivialReporter a:hover, #TrivialReporter a:active { color: blue; } +#TrivialReporter .run_spec { float: right; padding-right: 5px; font-size: .8em; text-decoration: none; } +#TrivialReporter .banner { color: #303; background-color: #fef; padding: 5px; } +#TrivialReporter .logo { float: left; font-size: 1.1em; padding-left: 5px; } +#TrivialReporter .logo .version { font-size: .6em; padding-left: 1em; } +#TrivialReporter .runner.running { background-color: yellow; } +#TrivialReporter .options { text-align: right; font-size: .8em; } +#TrivialReporter .suite { border: 1px outset gray; margin: 5px 0; padding-left: 1em; } +#TrivialReporter .suite .suite { margin: 5px; } +#TrivialReporter .suite.passed { background-color: #dfd; } +#TrivialReporter .suite.failed { background-color: #fdd; } +#TrivialReporter .spec { margin: 5px; padding-left: 1em; clear: both; } +#TrivialReporter .spec.failed, #TrivialReporter .spec.passed, #TrivialReporter .spec.skipped { padding-bottom: 5px; border: 1px solid gray; } +#TrivialReporter .spec.failed { background-color: #fbb; border-color: red; } +#TrivialReporter .spec.passed { background-color: #bfb; border-color: green; } +#TrivialReporter .spec.skipped { background-color: #bbb; } +#TrivialReporter .messages { border-left: 1px dashed gray; padding-left: 1em; padding-right: 1em; } +#TrivialReporter .passed { background-color: #cfc; display: none; } +#TrivialReporter .failed { background-color: #fbb; } +#TrivialReporter .skipped { color: #777; background-color: #eee; display: none; } +#TrivialReporter .resultMessage span.result { display: block; line-height: 2em; color: black; } +#TrivialReporter .resultMessage .mismatch { color: black; } +#TrivialReporter .stackTrace { white-space: pre; font-size: .8em; margin-left: 10px; max-height: 5em; overflow: auto; border: 1px inset red; padding: 1em; background: #eef; } +#TrivialReporter .finished-at { padding-left: 1em; font-size: .6em; } +#TrivialReporter.show-passed .passed, #TrivialReporter.show-skipped .skipped { display: block; } +#TrivialReporter #jasmine_content { position: fixed; right: 100%; } +#TrivialReporter .runner { border: 1px solid gray; display: block; margin: 5px 0; padding: 2px 0 2px 10px; } diff --git a/tools/jasmine/jasmine.js b/tools/jasmine/jasmine.js index 6152c8e9e0..30babc8b89 100644 --- a/tools/jasmine/jasmine.js +++ b/tools/jasmine/jasmine.js @@ -1,15 +1,17 @@ +var isCommonJS = typeof window == "undefined"; + /** * Top level namespace for Jasmine, a lightweight JavaScript BDD/spec/testing framework. * * @namespace */ var jasmine = {}; - +if (isCommonJS) exports.jasmine = jasmine; /** * @private */ -jasmine.unimplementedMethod_ = function () { - throw new Error("unimplemented method"); +jasmine.unimplementedMethod_ = function() { + throw new Error("unimplemented method"); }; /** @@ -20,6 +22,12 @@ jasmine.unimplementedMethod_ = function () { */ jasmine.undefined = jasmine.___undefined___; +/** + * Show diagnostic messages in the console if set to true + * + */ +jasmine.VERBOSE = false; + /** * Default interval in milliseconds for event loop yields (e.g. to allow network activity or to refresh the screen with the HTML-based runner). Small values here may result in slow test running. Zero means no updates until all tests have completed. * @@ -31,12 +39,12 @@ jasmine.DEFAULT_UPDATE_INTERVAL = 250; */ jasmine.DEFAULT_TIMEOUT_INTERVAL = 5000; -jasmine.getGlobal = function () { - function getGlobal() { - return this; - } +jasmine.getGlobal = function() { + function getGlobal() { + return this; + } - return getGlobal(); + return getGlobal(); }; /** @@ -47,16 +55,16 @@ jasmine.getGlobal = function () { * @param base {Object} bound 'this' for the function * @param name {Function} function to find */ -jasmine.bindOriginal_ = function (base, name) { - var original = base[name]; - if (original.apply) { - return function () { - return original.apply(base, arguments); - }; - } else { - // IE support - return jasmine.getGlobal()[name]; - } +jasmine.bindOriginal_ = function(base, name) { + var original = base[name]; + if (original.apply) { + return function() { + return original.apply(base, arguments); + }; + } else { + // IE support + return jasmine.getGlobal()[name]; + } }; jasmine.setTimeout = jasmine.bindOriginal_(jasmine.getGlobal(), 'setTimeout'); @@ -64,49 +72,51 @@ jasmine.clearTimeout = jasmine.bindOriginal_(jasmine.getGlobal(), 'clearTimeout' jasmine.setInterval = jasmine.bindOriginal_(jasmine.getGlobal(), 'setInterval'); jasmine.clearInterval = jasmine.bindOriginal_(jasmine.getGlobal(), 'clearInterval'); -jasmine.MessageResult = function (values) { - this.type = 'log'; - this.values = values; - this.trace = new Error(); // todo: test better +jasmine.MessageResult = function(values) { + this.type = 'log'; + this.values = values; + this.trace = new Error(); // todo: test better }; -jasmine.MessageResult.prototype.toString = function () { - var text = ""; - for (var i = 0; i < this.values.length; i++) { - if (i > 0) text += " "; - if (jasmine.isString_(this.values[i])) { - text += this.values[i]; - } else { - text += jasmine.pp(this.values[i]); - } +jasmine.MessageResult.prototype.toString = function() { + var text = ""; + for (var i = 0; i < this.values.length; i++) { + if (i > 0) text += " "; + if (jasmine.isString_(this.values[i])) { + text += this.values[i]; + } else { + text += jasmine.pp(this.values[i]); } - return text; + } + return text; }; -jasmine.ExpectationResult = function (params) { - this.type = 'expect'; - this.matcherName = params.matcherName; - this.passed_ = params.passed; - this.expected = params.expected; - this.actual = params.actual; +jasmine.ExpectationResult = function(params) { + this.type = 'expect'; + this.matcherName = params.matcherName; + this.passed_ = params.passed; + this.expected = params.expected; + this.actual = params.actual; + this.message = this.passed_ ? 'Passed.' : params.message; - this.message = this.passed_ ? 'Passed.' : params.message; - this.trace = this.passed_ ? '' : new Error(this.message); + var trace = (params.trace || new Error(this.message)); + this.trace = this.passed_ ? '' : trace; }; jasmine.ExpectationResult.prototype.toString = function () { - return this.message; + return this.message; }; jasmine.ExpectationResult.prototype.passed = function () { - return this.passed_; + return this.passed_; }; /** * Getter for the Jasmine environment. Ensures one gets created */ -jasmine.getEnv = function () { - return jasmine.currentEnv_ = jasmine.currentEnv_ || new jasmine.Env(); +jasmine.getEnv = function() { + var env = jasmine.currentEnv_ = jasmine.currentEnv_ || new jasmine.Env(); + return env; }; /** @@ -115,8 +125,8 @@ jasmine.getEnv = function () { * @param value * @returns {Boolean} */ -jasmine.isArray_ = function (value) { - return jasmine.isA_("Array", value); +jasmine.isArray_ = function(value) { + return jasmine.isA_("Array", value); }; /** @@ -125,8 +135,8 @@ jasmine.isArray_ = function (value) { * @param value * @returns {Boolean} */ -jasmine.isString_ = function (value) { - return jasmine.isA_("String", value); +jasmine.isString_ = function(value) { + return jasmine.isA_("String", value); }; /** @@ -135,8 +145,8 @@ jasmine.isString_ = function (value) { * @param value * @returns {Boolean} */ -jasmine.isNumber_ = function (value) { - return jasmine.isA_("Number", value); +jasmine.isNumber_ = function(value) { + return jasmine.isA_("Number", value); }; /** @@ -146,8 +156,8 @@ jasmine.isNumber_ = function (value) { * @param value * @returns {Boolean} */ -jasmine.isA_ = function (typeName, value) { - return Object.prototype.toString.apply(value) === '[object ' + typeName + ']'; +jasmine.isA_ = function(typeName, value) { + return Object.prototype.toString.apply(value) === '[object ' + typeName + ']'; }; /** @@ -156,10 +166,10 @@ jasmine.isA_ = function (typeName, value) { * @param value {Object} an object to be outputted * @returns {String} */ -jasmine.pp = function (value) { - var stringPrettyPrinter = new jasmine.StringPrettyPrinter(); - stringPrettyPrinter.format(value); - return stringPrettyPrinter.string; +jasmine.pp = function(value) { + var stringPrettyPrinter = new jasmine.StringPrettyPrinter(); + stringPrettyPrinter.format(value); + return stringPrettyPrinter.string; }; /** @@ -168,8 +178,8 @@ jasmine.pp = function (value) { * @param {Object} obj object to check * @returns {Boolean} */ -jasmine.isDomNode = function (obj) { - return obj['nodeType'] > 0; +jasmine.isDomNode = function(obj) { + return obj.nodeType > 0; }; /** @@ -182,8 +192,23 @@ jasmine.isDomNode = function (obj) { * @param {Class} clazz * @returns matchable object of the type clazz */ -jasmine.any = function (clazz) { - return new jasmine.Matchers.Any(clazz); +jasmine.any = function(clazz) { + return new jasmine.Matchers.Any(clazz); +}; + +/** + * Returns a matchable subset of a JSON object. For use in expectations when you don't care about all of the + * attributes on the object. + * + * @example + * // don't care about any other attributes than foo. + * expect(mySpy).toHaveBeenCalledWith(jasmine.objectContaining({foo: "bar"}); + * + * @param sample {Object} sample + * @returns matchable object for the sample + */ +jasmine.objectContaining = function (sample) { + return new jasmine.Matchers.ObjectContaining(sample); }; /** @@ -230,41 +255,41 @@ jasmine.any = function (clazz) { * @see spyOn, jasmine.createSpy, jasmine.createSpyObj * @param {String} name */ -jasmine.Spy = function (name) { - /** - * The name of the spy, if provided. - */ - this.identity = name || 'unknown'; - /** - * Is this Object a spy? - */ - this.isSpy = true; - /** - * The actual function this spy stubs. - */ - this.plan = function () { - }; - /** - * Tracking of the most recent call to the spy. - * @example - * var mySpy = jasmine.createSpy('foo'); - * mySpy(1, 2); - * mySpy.mostRecentCall.args = [1, 2]; - */ - this.mostRecentCall = {}; - - /** - * Holds arguments for each call to the spy, indexed by call count - * @example - * var mySpy = jasmine.createSpy('foo'); - * mySpy(1, 2); - * mySpy(7, 8); - * mySpy.mostRecentCall.args = [7, 8]; - * mySpy.argsForCall[0] = [1, 2]; - * mySpy.argsForCall[1] = [7, 8]; - */ - this.argsForCall = []; - this.calls = []; +jasmine.Spy = function(name) { + /** + * The name of the spy, if provided. + */ + this.identity = name || 'unknown'; + /** + * Is this Object a spy? + */ + this.isSpy = true; + /** + * The actual function this spy stubs. + */ + this.plan = function() { + }; + /** + * Tracking of the most recent call to the spy. + * @example + * var mySpy = jasmine.createSpy('foo'); + * mySpy(1, 2); + * mySpy.mostRecentCall.args = [1, 2]; + */ + this.mostRecentCall = {}; + + /** + * Holds arguments for each call to the spy, indexed by call count + * @example + * var mySpy = jasmine.createSpy('foo'); + * mySpy(1, 2); + * mySpy(7, 8); + * mySpy.mostRecentCall.args = [7, 8]; + * mySpy.argsForCall[0] = [1, 2]; + * mySpy.argsForCall[1] = [7, 8]; + */ + this.argsForCall = []; + this.calls = []; }; /** @@ -278,9 +303,9 @@ jasmine.Spy = function (name) { * // defining a spy on an existing property: foo.bar * spyOn(foo, 'bar').andCallThrough(); */ -jasmine.Spy.prototype.andCallThrough = function () { - this.plan = this.originalValue; - return this; +jasmine.Spy.prototype.andCallThrough = function() { + this.plan = this.originalValue; + return this; }; /** @@ -295,11 +320,11 @@ jasmine.Spy.prototype.andCallThrough = function () { * * @param {Object} value */ -jasmine.Spy.prototype.andReturn = function (value) { - this.plan = function () { - return value; - }; - return this; +jasmine.Spy.prototype.andReturn = function(value) { + this.plan = function() { + return value; + }; + return this; }; /** @@ -314,11 +339,11 @@ jasmine.Spy.prototype.andReturn = function (value) { * * @param {String} exceptionMsg */ -jasmine.Spy.prototype.andThrow = function (exceptionMsg) { - this.plan = function () { - throw exceptionMsg; - }; - return this; +jasmine.Spy.prototype.andThrow = function(exceptionMsg) { + this.plan = function() { + throw exceptionMsg; + }; + return this; }; /** @@ -336,9 +361,9 @@ jasmine.Spy.prototype.andThrow = function (exceptionMsg) { * * @param {Function} fakeFunc */ -jasmine.Spy.prototype.andCallFake = function (fakeFunc) { - this.plan = fakeFunc; - return this; +jasmine.Spy.prototype.andCallFake = function(fakeFunc) { + this.plan = fakeFunc; + return this; }; /** @@ -355,36 +380,36 @@ jasmine.Spy.prototype.andCallFake = function (fakeFunc) { * * expect(foo.bar.callCount).toEqual(0); */ -jasmine.Spy.prototype.reset = function () { - this.wasCalled = false; - this.callCount = 0; - this.argsForCall = []; - this.calls = []; - this.mostRecentCall = {}; -}; - -jasmine.createSpy = function (name) { - - var spyObj = function () { - spyObj.wasCalled = true; - spyObj.callCount++; - var args = jasmine.util.argsToArray(arguments); - spyObj.mostRecentCall.object = this; - spyObj.mostRecentCall.args = args; - spyObj.argsForCall.push(args); - spyObj.calls.push({object: this, args: args}); - return spyObj.plan.apply(this, arguments); - }; +jasmine.Spy.prototype.reset = function() { + this.wasCalled = false; + this.callCount = 0; + this.argsForCall = []; + this.calls = []; + this.mostRecentCall = {}; +}; - var spy = new jasmine.Spy(name); +jasmine.createSpy = function(name) { - for (var prop in spy) { - spyObj[prop] = spy[prop]; - } + var spyObj = function() { + spyObj.wasCalled = true; + spyObj.callCount++; + var args = jasmine.util.argsToArray(arguments); + spyObj.mostRecentCall.object = this; + spyObj.mostRecentCall.args = args; + spyObj.argsForCall.push(args); + spyObj.calls.push({object: this, args: args}); + return spyObj.plan.apply(this, arguments); + }; + + var spy = new jasmine.Spy(name); - spyObj.reset(); + for (var prop in spy) { + spyObj[prop] = spy[prop]; + } - return spyObj; + spyObj.reset(); + + return spyObj; }; /** @@ -393,8 +418,8 @@ jasmine.createSpy = function (name) { * @param {jasmine.Spy|Object} putativeSpy * @returns {Boolean} */ -jasmine.isSpy = function (putativeSpy) { - return putativeSpy && putativeSpy.isSpy; +jasmine.isSpy = function(putativeSpy) { + return putativeSpy && putativeSpy.isSpy; }; /** @@ -404,15 +429,15 @@ jasmine.isSpy = function (putativeSpy) { * @param {String} baseName name of spy class * @param {Array} methodNames array of names of methods to make spies */ -jasmine.createSpyObj = function (baseName, methodNames) { - if (!jasmine.isArray_(methodNames) || methodNames.length == 0) { - throw new Error('createSpyObj requires a non-empty array of method names to create spies for'); - } - var obj = {}; - for (var i = 0; i < methodNames.length; i++) { - obj[methodNames[i]] = jasmine.createSpy(baseName + '.' + methodNames[i]); - } - return obj; +jasmine.createSpyObj = function(baseName, methodNames) { + if (!jasmine.isArray_(methodNames) || methodNames.length === 0) { + throw new Error('createSpyObj requires a non-empty array of method names to create spies for'); + } + var obj = {}; + for (var i = 0; i < methodNames.length; i++) { + obj[methodNames[i]] = jasmine.createSpy(baseName + '.' + methodNames[i]); + } + return obj; }; /** @@ -420,9 +445,9 @@ jasmine.createSpyObj = function (baseName, methodNames) { * * Be careful not to leave calls to jasmine.log in production code. */ -jasmine.log = function () { - var spec = jasmine.getEnv().currentSpec; - spec.log.apply(spec, arguments); +jasmine.log = function() { + var spec = jasmine.getEnv().currentSpec; + spec.log.apply(spec, arguments); }; /** @@ -440,9 +465,10 @@ jasmine.log = function () { * @param methodName * @returns a Jasmine spy that can be chained with all spy methods */ -var spyOn = function (obj, methodName) { - return jasmine.getEnv().currentSpec.spyOn(obj, methodName); +var spyOn = function(obj, methodName) { + return jasmine.getEnv().currentSpec.spyOn(obj, methodName); }; +if (isCommonJS) exports.spyOn = spyOn; /** * Creates a Jasmine spec that will be added to the current suite. @@ -457,9 +483,10 @@ var spyOn = function (obj, methodName) { * @param {String} desc description of this specification * @param {Function} func defines the preconditions and expectations of the spec */ -var it = function (desc, func) { - return jasmine.getEnv().it(desc, func); +var it = function(desc, func) { + return jasmine.getEnv().it(desc, func); }; +if (isCommonJS) exports.it = it; /** * Creates a disabled Jasmine spec. @@ -469,9 +496,10 @@ var it = function (desc, func) { * @param {String} desc description of this specification * @param {Function} func defines the preconditions and expectations of the spec */ -var xit = function (desc, func) { - return jasmine.getEnv().xit(desc, func); +var xit = function(desc, func) { + return jasmine.getEnv().xit(desc, func); }; +if (isCommonJS) exports.xit = xit; /** * Starts a chain for a Jasmine expectation. @@ -481,18 +509,20 @@ var xit = function (desc, func) { * * @param {Object} actual Actual value to test against and expected value */ -var expect = function (actual) { - return jasmine.getEnv().currentSpec.expect(actual); +var expect = function(actual) { + return jasmine.getEnv().currentSpec.expect(actual); }; +if (isCommonJS) exports.expect = expect; /** * Defines part of a jasmine spec. Used in cominbination with waits or waitsFor in asynchrnous specs. * * @param {Function} func Function that defines part of a jasmine spec. */ -var runs = function (func) { - jasmine.getEnv().currentSpec.runs(func); +var runs = function(func) { + jasmine.getEnv().currentSpec.runs(func); }; +if (isCommonJS) exports.runs = runs; /** * Waits a fixed time period before moving to the next block. @@ -500,9 +530,10 @@ var runs = function (func) { * @deprecated Use waitsFor() instead * @param {Number} timeout milliseconds to wait */ -var waits = function (timeout) { - jasmine.getEnv().currentSpec.waits(timeout); +var waits = function(timeout) { + jasmine.getEnv().currentSpec.waits(timeout); }; +if (isCommonJS) exports.waits = waits; /** * Waits for the latchFunction to return true before proceeding to the next block. @@ -511,9 +542,10 @@ var waits = function (timeout) { * @param {String} optional_timeoutMessage * @param {Number} optional_timeout */ -var waitsFor = function (latchFunction, optional_timeoutMessage, optional_timeout) { - jasmine.getEnv().currentSpec.waitsFor.apply(jasmine.getEnv().currentSpec, arguments); +var waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) { + jasmine.getEnv().currentSpec.waitsFor.apply(jasmine.getEnv().currentSpec, arguments); }; +if (isCommonJS) exports.waitsFor = waitsFor; /** * A function that is called before each spec in a suite. @@ -522,9 +554,10 @@ var waitsFor = function (latchFunction, optional_timeoutMessage, optional_timeou * * @param {Function} beforeEachFunction */ -var beforeEach = function (beforeEachFunction) { - jasmine.getEnv().beforeEach(beforeEachFunction); +var beforeEach = function(beforeEachFunction) { + jasmine.getEnv().beforeEach(beforeEachFunction); }; +if (isCommonJS) exports.beforeEach = beforeEach; /** * A function that is called after each spec in a suite. @@ -533,9 +566,10 @@ var beforeEach = function (beforeEachFunction) { * * @param {Function} afterEachFunction */ -var afterEach = function (afterEachFunction) { - jasmine.getEnv().afterEach(afterEachFunction); +var afterEach = function(afterEachFunction) { + jasmine.getEnv().afterEach(afterEachFunction); }; +if (isCommonJS) exports.afterEach = afterEach; /** * Defines a suite of specifications. @@ -552,9 +586,10 @@ var afterEach = function (afterEachFunction) { * @param {String} description A string, usually the class under test. * @param {Function} specDefinitions function that defines several specs. */ -var describe = function (description, specDefinitions) { - return jasmine.getEnv().describe(description, specDefinitions); +var describe = function(description, specDefinitions) { + return jasmine.getEnv().describe(description, specDefinitions); }; +if (isCommonJS) exports.describe = describe; /** * Disables a suite of specifications. Used to disable some suites in a file, or files, temporarily during development. @@ -562,30 +597,38 @@ var describe = function (description, specDefinitions) { * @param {String} description A string, usually the class under test. * @param {Function} specDefinitions function that defines several specs. */ -var xdescribe = function (description, specDefinitions) { - return jasmine.getEnv().xdescribe(description, specDefinitions); +var xdescribe = function(description, specDefinitions) { + return jasmine.getEnv().xdescribe(description, specDefinitions); }; +if (isCommonJS) exports.xdescribe = xdescribe; // Provide the XMLHttpRequest class for IE 5.x-6.x: -jasmine.XmlHttpRequest = (typeof XMLHttpRequest == "undefined") ? function () { +jasmine.XmlHttpRequest = (typeof XMLHttpRequest == "undefined") ? function() { + function tryIt(f) { try { - return new ActiveXObject("Msxml2.XMLHTTP.6.0"); - } catch (e) { - } - try { - return new ActiveXObject("Msxml2.XMLHTTP.3.0"); - } catch (e) { - } - try { - return new ActiveXObject("Msxml2.XMLHTTP"); - } catch (e) { - } - try { - return new ActiveXObject("Microsoft.XMLHTTP"); - } catch (e) { - } - throw new Error("This browser does not support XMLHttpRequest."); + return f(); + } catch(e) { + } + return null; + } + + var xhr = tryIt(function() { + return new ActiveXObject("Msxml2.XMLHTTP.6.0"); + }) || + tryIt(function() { + return new ActiveXObject("Msxml2.XMLHTTP.3.0"); + }) || + tryIt(function() { + return new ActiveXObject("Msxml2.XMLHTTP"); + }) || + tryIt(function() { + return new ActiveXObject("Microsoft.XMLHTTP"); + }); + + if (!xhr) throw new Error("This browser does not support XMLHttpRequest."); + + return xhr; } : XMLHttpRequest; /** * @namespace @@ -599,63 +642,59 @@ jasmine.util = {}; * @param {Function} childClass * @param {Function} parentClass */ -jasmine.util.inherit = function (childClass, parentClass) { - /** - * @private - */ - var subclass = function () { - }; - subclass.prototype = parentClass.prototype; - childClass.prototype = new subclass; +jasmine.util.inherit = function(childClass, parentClass) { + /** + * @private + */ + var subclass = function() { + }; + subclass.prototype = parentClass.prototype; + childClass.prototype = new subclass(); }; -jasmine.util.formatException = function (e) { - var lineNumber; - if (e.line) { - lineNumber = e.line; - } - else if (e.lineNumber) { - lineNumber = e.lineNumber; - } +jasmine.util.formatException = function(e) { + var lineNumber; + if (e.line) { + lineNumber = e.line; + } + else if (e.lineNumber) { + lineNumber = e.lineNumber; + } - var file; + var file; - if (e.sourceURL) { - file = e.sourceURL; - } - else if (e.fileName) { - file = e.fileName; - } + if (e.sourceURL) { + file = e.sourceURL; + } + else if (e.fileName) { + file = e.fileName; + } - var message = (e.name && e.message) ? (e.name + ': ' + e.message) : e.toString(); + var message = (e.name && e.message) ? (e.name + ': ' + e.message) : e.toString(); - if (file && lineNumber) { - message += ' in ' + file + ' (line ' + lineNumber + ')'; - } + if (file && lineNumber) { + message += ' in ' + file + ' (line ' + lineNumber + ')'; + } - return message; + return message; }; -jasmine.util.htmlEscape = function (str) { - if (!str) return str; - return str.replace(/&/g, '&') - .replace(//g, '>'); +jasmine.util.htmlEscape = function(str) { + if (!str) return str; + return str.replace(/&/g, '&') + .replace(//g, '>'); }; -jasmine.util.argsToArray = function (args) { - var arrayOfArgs = []; - for (var i = 0; i < args.length; i++) { - arrayOfArgs.push(args[i]); - } - return arrayOfArgs; +jasmine.util.argsToArray = function(args) { + var arrayOfArgs = []; + for (var i = 0; i < args.length; i++) arrayOfArgs.push(args[i]); + return arrayOfArgs; }; -jasmine.util.extend = function (destination, source) { - for (var property in source) { - destination[property] = source[property]; - } - return destination; +jasmine.util.extend = function(destination, source) { + for (var property in source) destination[property] = source[property]; + return destination; }; /** @@ -663,31 +702,31 @@ jasmine.util.extend = function (destination, source) { * * @constructor */ -jasmine.Env = function () { - this.currentSpec = null; - this.currentSuite = null; - this.currentRunner_ = new jasmine.Runner(this); +jasmine.Env = function() { + this.currentSpec = null; + this.currentSuite = null; + this.currentRunner_ = new jasmine.Runner(this); - this.reporter = new jasmine.MultiReporter(); + this.reporter = new jasmine.MultiReporter(); - this.updateInterval = jasmine.DEFAULT_UPDATE_INTERVAL; - this.defaultTimeoutInterval = jasmine.DEFAULT_TIMEOUT_INTERVAL; - this.lastUpdate = 0; - this.specFilter = function () { - return true; - }; + this.updateInterval = jasmine.DEFAULT_UPDATE_INTERVAL; + this.defaultTimeoutInterval = jasmine.DEFAULT_TIMEOUT_INTERVAL; + this.lastUpdate = 0; + this.specFilter = function() { + return true; + }; - this.nextSpecId_ = 0; - this.nextSuiteId_ = 0; - this.equalityTesters_ = []; + this.nextSpecId_ = 0; + this.nextSuiteId_ = 0; + this.equalityTesters_ = []; - // wrap matchers - this.matchersClass = function () { - jasmine.Matchers.apply(this, arguments); - }; - jasmine.util.inherit(this.matchersClass, jasmine.Matchers); + // wrap matchers + this.matchersClass = function() { + jasmine.Matchers.apply(this, arguments); + }; + jasmine.util.inherit(this.matchersClass, jasmine.Matchers); - jasmine.Matchers.wrapInto_(jasmine.Matchers.prototype, this.matchersClass); + jasmine.Matchers.wrapInto_(jasmine.Matchers.prototype, this.matchersClass); }; @@ -700,261 +739,270 @@ jasmine.Env.prototype.clearInterval = jasmine.clearInterval; * @returns an object containing jasmine version build info, if set. */ jasmine.Env.prototype.version = function () { - if (jasmine.version_) { - return jasmine.version_; - } else { - throw new Error('Version not set'); - } + if (jasmine.version_) { + return jasmine.version_; + } else { + throw new Error('Version not set'); + } }; /** * @returns string containing jasmine version build info, if set. */ -jasmine.Env.prototype.versionString = function () { - if (jasmine.version_) { - var version = this.version(); - return version.major + "." + version.minor + "." + version.build + " revision " + version.revision; - } else { - return "version unknown"; - } +jasmine.Env.prototype.versionString = function() { + if (!jasmine.version_) { + return "version unknown"; + } + + var version = this.version(); + var versionString = version.major + "." + version.minor + "." + version.build; + if (version.release_candidate) { + versionString += ".rc" + version.release_candidate; + } + versionString += " revision " + version.revision; + return versionString; }; /** * @returns a sequential integer starting at 0 */ jasmine.Env.prototype.nextSpecId = function () { - return this.nextSpecId_++; + return this.nextSpecId_++; }; /** * @returns a sequential integer starting at 0 */ jasmine.Env.prototype.nextSuiteId = function () { - return this.nextSuiteId_++; + return this.nextSuiteId_++; }; /** * Register a reporter to receive status updates from Jasmine. * @param {jasmine.Reporter} reporter An object which will receive status updates. */ -jasmine.Env.prototype.addReporter = function (reporter) { - this.reporter.addReporter(reporter); +jasmine.Env.prototype.addReporter = function(reporter) { + this.reporter.addReporter(reporter); }; -jasmine.Env.prototype.execute = function (onComplete) { - this.currentRunner_.execute(onComplete); +jasmine.Env.prototype.execute = function() { + this.currentRunner_.execute(); }; -jasmine.Env.prototype.describe = function (description, specDefinitions) { - var suite = new jasmine.Suite(this, description, specDefinitions, this.currentSuite); +jasmine.Env.prototype.describe = function(description, specDefinitions) { + var suite = new jasmine.Suite(this, description, specDefinitions, this.currentSuite); - var parentSuite = this.currentSuite; - if (parentSuite) { - parentSuite.add(suite); - } else { - this.currentRunner_.add(suite); - } + var parentSuite = this.currentSuite; + if (parentSuite) { + parentSuite.add(suite); + } else { + this.currentRunner_.add(suite); + } - this.currentSuite = suite; + this.currentSuite = suite; - var declarationError = null; - try { - specDefinitions.call(suite); - } catch (e) { - if (window.console) { - console.log(e.stack || e, "error"); - } + var declarationError = null; + try { + specDefinitions.call(suite); + } catch(e) { + declarationError = e; + } - declarationError = e; - } + if (declarationError) { + this.it("encountered a declaration exception", function() { + throw declarationError; + }); + } - this.currentSuite = parentSuite; + this.currentSuite = parentSuite; - if (declarationError) { - this.it("encountered a declaration exception", function () { - throw declarationError; - }); - } - - return suite; + return suite; }; -jasmine.Env.prototype.beforeEach = function (beforeEachFunction) { - if (this.currentSuite) { - this.currentSuite.beforeEach(beforeEachFunction); - } else { - this.currentRunner_.beforeEach(beforeEachFunction); - } +jasmine.Env.prototype.beforeEach = function(beforeEachFunction) { + if (this.currentSuite) { + this.currentSuite.beforeEach(beforeEachFunction); + } else { + this.currentRunner_.beforeEach(beforeEachFunction); + } }; jasmine.Env.prototype.currentRunner = function () { - return this.currentRunner_; + return this.currentRunner_; }; -jasmine.Env.prototype.afterEach = function (afterEachFunction) { - if (this.currentSuite) { - this.currentSuite.afterEach(afterEachFunction); - } else { - this.currentRunner_.afterEach(afterEachFunction); - } +jasmine.Env.prototype.afterEach = function(afterEachFunction) { + if (this.currentSuite) { + this.currentSuite.afterEach(afterEachFunction); + } else { + this.currentRunner_.afterEach(afterEachFunction); + } }; -jasmine.Env.prototype.xdescribe = function (desc, specDefinitions) { - return { - execute: function () { - } - }; +jasmine.Env.prototype.xdescribe = function(desc, specDefinitions) { + return { + execute: function() { + } + }; }; -jasmine.Env.prototype.it = function (description, func) { - var spec = new jasmine.Spec(this, this.currentSuite, description); - this.currentSuite.add(spec); - this.currentSpec = spec; +jasmine.Env.prototype.it = function(description, func) { + var spec = new jasmine.Spec(this, this.currentSuite, description); + this.currentSuite.add(spec); + this.currentSpec = spec; - if (func) { - spec.runs(func); - } + if (func) { + spec.runs(func); + } - return spec; + return spec; }; -jasmine.Env.prototype.xit = function (desc, func) { - return { - id: this.nextSpecId(), - runs: function () { - } - }; +jasmine.Env.prototype.xit = function(desc, func) { + return { + id: this.nextSpecId(), + runs: function() { + } + }; }; -jasmine.Env.prototype.compareObjects_ = function (a, b, mismatchKeys, mismatchValues) { - if (a.__Jasmine_been_here_before__ === b && b.__Jasmine_been_here_before__ === a) { - return true; - } +jasmine.Env.prototype.compareObjects_ = function(a, b, mismatchKeys, mismatchValues) { + if (a.__Jasmine_been_here_before__ === b && b.__Jasmine_been_here_before__ === a) { + return true; + } - a.__Jasmine_been_here_before__ = b; - b.__Jasmine_been_here_before__ = a; + a.__Jasmine_been_here_before__ = b; + b.__Jasmine_been_here_before__ = a; - var hasKey = function (obj, keyName) { - return obj != null && obj[keyName] !== jasmine.undefined; - }; + var hasKey = function(obj, keyName) { + return obj !== null && obj[keyName] !== jasmine.undefined; + }; - for (var property in b) { - if (!hasKey(a, property) && hasKey(b, property)) { - mismatchKeys.push("expected has key '" + property + "', but missing from actual."); - } + for (var property in b) { + if (!hasKey(a, property) && hasKey(b, property)) { + mismatchKeys.push("expected has key '" + property + "', but missing from actual."); } - for (property in a) { - if (!hasKey(b, property) && hasKey(a, property)) { - mismatchKeys.push("expected missing key '" + property + "', but present in actual."); - } + } + for (property in a) { + if (!hasKey(b, property) && hasKey(a, property)) { + mismatchKeys.push("expected missing key '" + property + "', but present in actual."); } - for (property in b) { - if (property == '__Jasmine_been_here_before__') continue; - if (!this.equals_(a[property], b[property], mismatchKeys, mismatchValues)) { - mismatchValues.push("'" + property + "' was '" + (b[property] ? jasmine.util.htmlEscape(b[property].toString()) : b[property]) + "' in expected, but was '" + (a[property] ? jasmine.util.htmlEscape(a[property].toString()) : a[property]) + "' in actual."); - } + } + for (property in b) { + if (property == '__Jasmine_been_here_before__') continue; + if (!this.equals_(a[property], b[property], mismatchKeys, mismatchValues)) { + mismatchValues.push("'" + property + "' was '" + (b[property] ? jasmine.util.htmlEscape(b[property].toString()) : b[property]) + "' in expected, but was '" + (a[property] ? jasmine.util.htmlEscape(a[property].toString()) : a[property]) + "' in actual."); } + } - if (jasmine.isArray_(a) && jasmine.isArray_(b) && a.length != b.length) { - mismatchValues.push("arrays were not the same length"); - } + if (jasmine.isArray_(a) && jasmine.isArray_(b) && a.length != b.length) { + mismatchValues.push("arrays were not the same length"); + } - delete a.__Jasmine_been_here_before__; - delete b.__Jasmine_been_here_before__; - return (mismatchKeys.length == 0 && mismatchValues.length == 0); + delete a.__Jasmine_been_here_before__; + delete b.__Jasmine_been_here_before__; + return (mismatchKeys.length === 0 && mismatchValues.length === 0); }; -jasmine.Env.prototype.equals_ = function (a, b, mismatchKeys, mismatchValues) { - mismatchKeys = mismatchKeys || []; - mismatchValues = mismatchValues || []; +jasmine.Env.prototype.equals_ = function(a, b, mismatchKeys, mismatchValues) { + mismatchKeys = mismatchKeys || []; + mismatchValues = mismatchValues || []; - for (var i = 0; i < this.equalityTesters_.length; i++) { - var equalityTester = this.equalityTesters_[i]; - var result = equalityTester(a, b, this, mismatchKeys, mismatchValues); - if (result !== jasmine.undefined) return result; - } + for (var i = 0; i < this.equalityTesters_.length; i++) { + var equalityTester = this.equalityTesters_[i]; + var result = equalityTester(a, b, this, mismatchKeys, mismatchValues); + if (result !== jasmine.undefined) return result; + } - if (a === b) return true; + if (a === b) return true; - if (a === jasmine.undefined || a === null || b === jasmine.undefined || b === null) { - return (a == jasmine.undefined && b == jasmine.undefined); - } + if (a === jasmine.undefined || a === null || b === jasmine.undefined || b === null) { + return (a == jasmine.undefined && b == jasmine.undefined); + } - if (jasmine.isDomNode(a) && jasmine.isDomNode(b)) { - return a === b; - } + if (jasmine.isDomNode(a) && jasmine.isDomNode(b)) { + return a === b; + } - if (a instanceof Date && b instanceof Date) { - return a.getTime() == b.getTime(); - } + if (a instanceof Date && b instanceof Date) { + return a.getTime() == b.getTime(); + } - if (a instanceof jasmine.Matchers.Any) { - return a.matches(b); - } + if (a.jasmineMatches) { + return a.jasmineMatches(b); + } - if (b instanceof jasmine.Matchers.Any) { - return b.matches(a); - } + if (b.jasmineMatches) { + return b.jasmineMatches(a); + } - if (jasmine.isString_(a) && jasmine.isString_(b)) { - return (a == b); - } + if (a instanceof jasmine.Matchers.ObjectContaining) { + return a.matches(b); + } - if (jasmine.isNumber_(a) && jasmine.isNumber_(b)) { - return (a == b); - } + if (b instanceof jasmine.Matchers.ObjectContaining) { + return b.matches(a); + } - if (typeof a === "object" && typeof b === "object") { - return this.compareObjects_(a, b, mismatchKeys, mismatchValues); - } + if (jasmine.isString_(a) && jasmine.isString_(b)) { + return (a == b); + } + + if (jasmine.isNumber_(a) && jasmine.isNumber_(b)) { + return (a == b); + } - //Straight check - return (a === b); + if (typeof a === "object" && typeof b === "object") { + return this.compareObjects_(a, b, mismatchKeys, mismatchValues); + } + + //Straight check + return (a === b); }; -jasmine.Env.prototype.contains_ = function (haystack, needle) { - if (jasmine.isArray_(haystack)) { - for (var i = 0; i < haystack.length; i++) { - if (this.equals_(haystack[i], needle)) return true; - } - return false; +jasmine.Env.prototype.contains_ = function(haystack, needle) { + if (jasmine.isArray_(haystack)) { + for (var i = 0; i < haystack.length; i++) { + if (this.equals_(haystack[i], needle)) return true; } - return haystack.indexOf(needle) >= 0; + return false; + } + return haystack.indexOf(needle) >= 0; }; -jasmine.Env.prototype.addEqualityTester = function (equalityTester) { - this.equalityTesters_.push(equalityTester); +jasmine.Env.prototype.addEqualityTester = function(equalityTester) { + this.equalityTesters_.push(equalityTester); }; /** No-op base class for Jasmine reporters. * * @constructor */ -jasmine.Reporter = function () { +jasmine.Reporter = function() { }; //noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.reportRunnerStarting = function (runner) { +jasmine.Reporter.prototype.reportRunnerStarting = function(runner) { }; //noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.reportRunnerResults = function (runner) { +jasmine.Reporter.prototype.reportRunnerResults = function(runner) { }; //noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.reportSuiteResults = function (suite) { +jasmine.Reporter.prototype.reportSuiteResults = function(suite) { }; //noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.reportSpecStarting = function (spec) { +jasmine.Reporter.prototype.reportSpecStarting = function(spec) { }; //noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.reportSpecResults = function (spec) { +jasmine.Reporter.prototype.reportSpecResults = function(spec) { }; //noinspection JSUnusedLocalSymbols -jasmine.Reporter.prototype.log = function (str) { +jasmine.Reporter.prototype.log = function(str) { }; /** @@ -965,123 +1013,120 @@ jasmine.Reporter.prototype.log = function (str) { * @param {Function} func * @param {jasmine.Spec} spec */ -jasmine.Block = function (env, func, spec) { - this.env = env; - this.func = func; - this.spec = spec; +jasmine.Block = function(env, func, spec) { + this.env = env; + this.func = func; + this.spec = spec; }; -jasmine.Block.prototype.execute = function (onComplete) { - try { - this.func.apply(this.spec); - } catch (e) { - if (window.console) { - console.error(e.stack); - } - this.spec.fail(e); - } - onComplete(); +jasmine.Block.prototype.execute = function(onComplete) { + try { + this.func.apply(this.spec); + } catch (e) { + this.spec.fail(e); + } + onComplete(); }; /** JavaScript API reporter. * * @constructor */ -jasmine.JsApiReporter = function () { - this.started = false; - this.finished = false; - this.suites_ = []; - this.results_ = {}; +jasmine.JsApiReporter = function() { + this.started = false; + this.finished = false; + this.suites_ = []; + this.results_ = {}; }; -jasmine.JsApiReporter.prototype.reportRunnerStarting = function (runner) { - this.started = true; - var suites = runner.topLevelSuites(); - for (var i = 0; i < suites.length; i++) { - var suite = suites[i]; - this.suites_.push(this.summarize_(suite)); - } +jasmine.JsApiReporter.prototype.reportRunnerStarting = function(runner) { + this.started = true; + var suites = runner.topLevelSuites(); + for (var i = 0; i < suites.length; i++) { + var suite = suites[i]; + this.suites_.push(this.summarize_(suite)); + } }; -jasmine.JsApiReporter.prototype.suites = function () { - return this.suites_; +jasmine.JsApiReporter.prototype.suites = function() { + return this.suites_; }; -jasmine.JsApiReporter.prototype.summarize_ = function (suiteOrSpec) { - var isSuite = suiteOrSpec instanceof jasmine.Suite; - var summary = { - id: suiteOrSpec.id, - name: suiteOrSpec.description, - type: isSuite ? 'suite' : 'spec', - children: [] - }; - - if (isSuite) { - var children = suiteOrSpec.children(); - for (var i = 0; i < children.length; i++) { - summary.children.push(this.summarize_(children[i])); - } +jasmine.JsApiReporter.prototype.summarize_ = function(suiteOrSpec) { + var isSuite = suiteOrSpec instanceof jasmine.Suite; + var summary = { + id: suiteOrSpec.id, + name: suiteOrSpec.description, + type: isSuite ? 'suite' : 'spec', + children: [] + }; + + if (isSuite) { + var children = suiteOrSpec.children(); + for (var i = 0; i < children.length; i++) { + summary.children.push(this.summarize_(children[i])); } - return summary; + } + return summary; }; -jasmine.JsApiReporter.prototype.results = function () { - return this.results_; +jasmine.JsApiReporter.prototype.results = function() { + return this.results_; }; -jasmine.JsApiReporter.prototype.resultsForSpec = function (specId) { - return this.results_[specId]; +jasmine.JsApiReporter.prototype.resultsForSpec = function(specId) { + return this.results_[specId]; }; //noinspection JSUnusedLocalSymbols -jasmine.JsApiReporter.prototype.reportRunnerResults = function (runner) { - this.finished = true; +jasmine.JsApiReporter.prototype.reportRunnerResults = function(runner) { + this.finished = true; }; //noinspection JSUnusedLocalSymbols -jasmine.JsApiReporter.prototype.reportSuiteResults = function (suite) { +jasmine.JsApiReporter.prototype.reportSuiteResults = function(suite) { }; //noinspection JSUnusedLocalSymbols -jasmine.JsApiReporter.prototype.reportSpecResults = function (spec) { - this.results_[spec.id] = { - messages: spec.results().getItems(), - result: spec.results().failedCount > 0 ? "failed" : "passed" - }; +jasmine.JsApiReporter.prototype.reportSpecResults = function(spec) { + this.results_[spec.id] = { + messages: spec.results().getItems(), + result: spec.results().failedCount > 0 ? "failed" : "passed" + }; }; //noinspection JSUnusedLocalSymbols -jasmine.JsApiReporter.prototype.log = function (str) { -}; - -jasmine.JsApiReporter.prototype.resultsForSpecs = function (specIds) { - var results = {}; - for (var i = 0; i < specIds.length; i++) { - var specId = specIds[i]; - results[specId] = this.summarizeResult_(this.results_[specId]); - } - return results; -}; - -jasmine.JsApiReporter.prototype.summarizeResult_ = function (result) { - var summaryMessages = []; - var messagesLength = result.messages.length; - for (var messageIndex = 0; messageIndex < messagesLength; messageIndex++) { - var resultMessage = result.messages[messageIndex]; - summaryMessages.push({ - text: resultMessage.type == 'log' ? resultMessage.toString() : jasmine.undefined, - passed: resultMessage.passed ? resultMessage.passed() : true, - type: resultMessage.type, - message: resultMessage.message, - trace: { - stack: resultMessage.passed && !resultMessage.passed() ? resultMessage.trace.stack : jasmine.undefined - } - }); - } +jasmine.JsApiReporter.prototype.log = function(str) { +}; + +jasmine.JsApiReporter.prototype.resultsForSpecs = function(specIds){ + var results = {}; + for (var i = 0; i < specIds.length; i++) { + var specId = specIds[i]; + results[specId] = this.summarizeResult_(this.results_[specId]); + } + return results; +}; + +jasmine.JsApiReporter.prototype.summarizeResult_ = function(result){ + var summaryMessages = []; + var messagesLength = result.messages.length; + for (var messageIndex = 0; messageIndex < messagesLength; messageIndex++) { + var resultMessage = result.messages[messageIndex]; + summaryMessages.push({ + text: resultMessage.type == 'log' ? resultMessage.toString() : jasmine.undefined, + passed: resultMessage.passed ? resultMessage.passed() : true, + type: resultMessage.type, + message: resultMessage.message, + trace: { + stack: resultMessage.passed && !resultMessage.passed() ? resultMessage.trace.stack : jasmine.undefined + } + }); + } - return { - result: result.result, - messages: summaryMessages - }; + return { + result : result.result, + messages : summaryMessages + }; }; /** @@ -1090,83 +1135,83 @@ jasmine.JsApiReporter.prototype.summarizeResult_ = function (result) { * @param actual * @param {jasmine.Spec} spec */ -jasmine.Matchers = function (env, actual, spec, opt_isNot) { - this.env = env; - this.actual = actual; - this.spec = spec; - this.isNot = opt_isNot || false; - this.reportWasCalled_ = false; +jasmine.Matchers = function(env, actual, spec, opt_isNot) { + this.env = env; + this.actual = actual; + this.spec = spec; + this.isNot = opt_isNot || false; + this.reportWasCalled_ = false; }; // todo: @deprecated as of Jasmine 0.11, remove soon [xw] -jasmine.Matchers.pp = function (str) { - throw new Error("jasmine.Matchers.pp() is no longer supported, please use jasmine.pp() instead!"); +jasmine.Matchers.pp = function(str) { + throw new Error("jasmine.Matchers.pp() is no longer supported, please use jasmine.pp() instead!"); }; // todo: @deprecated Deprecated as of Jasmine 0.10. Rewrite your custom matchers to return true or false. [xw] -jasmine.Matchers.prototype.report = function (result, failing_message, details) { - throw new Error("As of jasmine 0.11, custom matchers must be implemented differently -- please see jasmine docs"); +jasmine.Matchers.prototype.report = function(result, failing_message, details) { + throw new Error("As of jasmine 0.11, custom matchers must be implemented differently -- please see jasmine docs"); }; -jasmine.Matchers.wrapInto_ = function (prototype, matchersClass) { - for (var methodName in prototype) { - if (methodName == 'report') continue; - var orig = prototype[methodName]; - matchersClass.prototype[methodName] = jasmine.Matchers.matcherFn_(methodName, orig); - } +jasmine.Matchers.wrapInto_ = function(prototype, matchersClass) { + for (var methodName in prototype) { + if (methodName == 'report') continue; + var orig = prototype[methodName]; + matchersClass.prototype[methodName] = jasmine.Matchers.matcherFn_(methodName, orig); + } }; -jasmine.Matchers.matcherFn_ = function (matcherName, matcherFunction) { - return function () { - var matcherArgs = jasmine.util.argsToArray(arguments); - var result = matcherFunction.apply(this, arguments); +jasmine.Matchers.matcherFn_ = function(matcherName, matcherFunction) { + return function() { + var matcherArgs = jasmine.util.argsToArray(arguments); + var result = matcherFunction.apply(this, arguments); - if (this.isNot) { - result = !result; - } + if (this.isNot) { + result = !result; + } - if (this.reportWasCalled_) return result; - - var message; - if (!result) { - if (this.message) { - message = this.message.apply(this, arguments); - if (jasmine.isArray_(message)) { - message = message[this.isNot ? 1 : 0]; - } - } else { - var englishyPredicate = matcherName.replace(/[A-Z]/g, function (s) { - return ' ' + s.toLowerCase(); - }); - message = "Expected " + jasmine.pp(this.actual) + (this.isNot ? " not " : " ") + englishyPredicate; - if (matcherArgs.length > 0) { - for (var i = 0; i < matcherArgs.length; i++) { - if (i > 0) message += ","; - message += " " + jasmine.pp(matcherArgs[i]); - } - } - message += "."; - } + if (this.reportWasCalled_) return result; + + var message; + if (!result) { + if (this.message) { + message = this.message.apply(this, arguments); + if (jasmine.isArray_(message)) { + message = message[this.isNot ? 1 : 0]; } - var expectationResult = new jasmine.ExpectationResult({ - matcherName: matcherName, - passed: result, - expected: matcherArgs.length > 1 ? matcherArgs : matcherArgs[0], - actual: this.actual, - message: message - }); - this.spec.addMatcherResult(expectationResult); - return jasmine.undefined; - }; + } else { + var englishyPredicate = matcherName.replace(/[A-Z]/g, function(s) { return ' ' + s.toLowerCase(); }); + message = "Expected " + jasmine.pp(this.actual) + (this.isNot ? " not " : " ") + englishyPredicate; + if (matcherArgs.length > 0) { + for (var i = 0; i < matcherArgs.length; i++) { + if (i > 0) message += ","; + message += " " + jasmine.pp(matcherArgs[i]); + } + } + message += "."; + } + } + var expectationResult = new jasmine.ExpectationResult({ + matcherName: matcherName, + passed: result, + expected: matcherArgs.length > 1 ? matcherArgs : matcherArgs[0], + actual: this.actual, + message: message + }); + this.spec.addMatcherResult(expectationResult); + return jasmine.undefined; + }; }; + + /** * toBe: compares the actual to the expected using === * @param expected */ -jasmine.Matchers.prototype.toBe = function (expected) { - return this.actual === expected; +jasmine.Matchers.prototype.toBe = function(expected) { + return this.actual === expected; }; /** @@ -1174,8 +1219,8 @@ jasmine.Matchers.prototype.toBe = function (expected) { * @param expected * @deprecated as of 1.0. Use not.toBe() instead. */ -jasmine.Matchers.prototype.toNotBe = function (expected) { - return this.actual !== expected; +jasmine.Matchers.prototype.toNotBe = function(expected) { + return this.actual !== expected; }; /** @@ -1183,17 +1228,17 @@ jasmine.Matchers.prototype.toNotBe = function (expected) { * * @param expected */ -jasmine.Matchers.prototype.toEqual = function (expected) { - return this.env.equals_(this.actual, expected); +jasmine.Matchers.prototype.toEqual = function(expected) { + return this.env.equals_(this.actual, expected); }; /** * toNotEqual: compares the actual to the expected using the ! of jasmine.Matchers.toEqual * @param expected - * @deprecated as of 1.0. Use not.toNotEqual() instead. + * @deprecated as of 1.0. Use not.toEqual() instead. */ -jasmine.Matchers.prototype.toNotEqual = function (expected) { - return !this.env.equals_(this.actual, expected); +jasmine.Matchers.prototype.toNotEqual = function(expected) { + return !this.env.equals_(this.actual, expected); }; /** @@ -1202,8 +1247,8 @@ jasmine.Matchers.prototype.toNotEqual = function (expected) { * * @param expected */ -jasmine.Matchers.prototype.toMatch = function (expected) { - return new RegExp(expected).test(this.actual); +jasmine.Matchers.prototype.toMatch = function(expected) { + return new RegExp(expected).test(this.actual); }; /** @@ -1211,67 +1256,67 @@ jasmine.Matchers.prototype.toMatch = function (expected) { * @param expected * @deprecated as of 1.0. Use not.toMatch() instead. */ -jasmine.Matchers.prototype.toNotMatch = function (expected) { - return !(new RegExp(expected).test(this.actual)); +jasmine.Matchers.prototype.toNotMatch = function(expected) { + return !(new RegExp(expected).test(this.actual)); }; /** * Matcher that compares the actual to jasmine.undefined. */ -jasmine.Matchers.prototype.toBeDefined = function () { - return (this.actual !== jasmine.undefined); +jasmine.Matchers.prototype.toBeDefined = function() { + return (this.actual !== jasmine.undefined); }; /** * Matcher that compares the actual to jasmine.undefined. */ -jasmine.Matchers.prototype.toBeUndefined = function () { - return (this.actual === jasmine.undefined); +jasmine.Matchers.prototype.toBeUndefined = function() { + return (this.actual === jasmine.undefined); }; /** * Matcher that compares the actual to null. */ -jasmine.Matchers.prototype.toBeNull = function () { - return (this.actual === null); +jasmine.Matchers.prototype.toBeNull = function() { + return (this.actual === null); }; /** * Matcher that boolean not-nots the actual. */ -jasmine.Matchers.prototype.toBeTruthy = function () { - return !!this.actual; +jasmine.Matchers.prototype.toBeTruthy = function() { + return !!this.actual; }; /** * Matcher that boolean nots the actual. */ -jasmine.Matchers.prototype.toBeFalsy = function () { - return !this.actual; +jasmine.Matchers.prototype.toBeFalsy = function() { + return !this.actual; }; /** * Matcher that checks to see if the actual, a Jasmine spy, was called. */ -jasmine.Matchers.prototype.toHaveBeenCalled = function () { - if (arguments.length > 0) { - throw new Error('toHaveBeenCalled does not take arguments, use toHaveBeenCalledWith'); - } +jasmine.Matchers.prototype.toHaveBeenCalled = function() { + if (arguments.length > 0) { + throw new Error('toHaveBeenCalled does not take arguments, use toHaveBeenCalledWith'); + } - if (!jasmine.isSpy(this.actual)) { - throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); - } + if (!jasmine.isSpy(this.actual)) { + throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); + } - this.message = function () { - return [ - "Expected spy " + this.actual.identity + " to have been called.", - "Expected spy " + this.actual.identity + " not to have been called." - ]; - }; + this.message = function() { + return [ + "Expected spy " + this.actual.identity + " to have been called.", + "Expected spy " + this.actual.identity + " not to have been called." + ]; + }; - return this.actual.wasCalled; + return this.actual.wasCalled; }; /** @deprecated Use expect(xxx).toHaveBeenCalled() instead */ @@ -1282,23 +1327,23 @@ jasmine.Matchers.prototype.wasCalled = jasmine.Matchers.prototype.toHaveBeenCall * * @deprecated Use expect(xxx).not.toHaveBeenCalled() instead */ -jasmine.Matchers.prototype.wasNotCalled = function () { - if (arguments.length > 0) { - throw new Error('wasNotCalled does not take arguments'); - } +jasmine.Matchers.prototype.wasNotCalled = function() { + if (arguments.length > 0) { + throw new Error('wasNotCalled does not take arguments'); + } - if (!jasmine.isSpy(this.actual)) { - throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); - } + if (!jasmine.isSpy(this.actual)) { + throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); + } - this.message = function () { - return [ - "Expected spy " + this.actual.identity + " to not have been called.", - "Expected spy " + this.actual.identity + " to have been called." - ]; - }; + this.message = function() { + return [ + "Expected spy " + this.actual.identity + " to not have been called.", + "Expected spy " + this.actual.identity + " to have been called." + ]; + }; - return !this.actual.wasCalled; + return !this.actual.wasCalled; }; /** @@ -1307,47 +1352,47 @@ jasmine.Matchers.prototype.wasNotCalled = function () { * @example * */ -jasmine.Matchers.prototype.toHaveBeenCalledWith = function () { - var expectedArgs = jasmine.util.argsToArray(arguments); - if (!jasmine.isSpy(this.actual)) { - throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); +jasmine.Matchers.prototype.toHaveBeenCalledWith = function() { + var expectedArgs = jasmine.util.argsToArray(arguments); + if (!jasmine.isSpy(this.actual)) { + throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); + } + this.message = function() { + if (this.actual.callCount === 0) { + // todo: what should the failure message for .not.toHaveBeenCalledWith() be? is this right? test better. [xw] + return [ + "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.", + "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but it was." + ]; + } else { + return [ + "Expected spy " + this.actual.identity + " to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall), + "Expected spy " + this.actual.identity + " not to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall) + ]; } - this.message = function () { - if (this.actual.callCount == 0) { - // todo: what should the failure message for .not.toHaveBeenCalledWith() be? is this right? test better. [xw] - return [ - "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was never called.", - "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was." - ]; - } else { - return [ - "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall), - "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but was called with " + jasmine.pp(this.actual.argsForCall) - ]; - } - }; + }; - return this.env.contains_(this.actual.argsForCall, expectedArgs); + return this.env.contains_(this.actual.argsForCall, expectedArgs); }; /** @deprecated Use expect(xxx).toHaveBeenCalledWith() instead */ jasmine.Matchers.prototype.wasCalledWith = jasmine.Matchers.prototype.toHaveBeenCalledWith; /** @deprecated Use expect(xxx).not.toHaveBeenCalledWith() instead */ -jasmine.Matchers.prototype.wasNotCalledWith = function () { - var expectedArgs = jasmine.util.argsToArray(arguments); - if (!jasmine.isSpy(this.actual)) { - throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); - } - - this.message = function () { - return [ - "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was", - "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was" - ] - }; +jasmine.Matchers.prototype.wasNotCalledWith = function() { + var expectedArgs = jasmine.util.argsToArray(arguments); + if (!jasmine.isSpy(this.actual)) { + throw new Error('Expected a spy, but got ' + jasmine.pp(this.actual) + '.'); + } + + this.message = function() { + return [ + "Expected spy not to have been called with " + jasmine.pp(expectedArgs) + " but it was", + "Expected spy to have been called with " + jasmine.pp(expectedArgs) + " but it was" + ]; + }; - return !this.env.contains_(this.actual.argsForCall, expectedArgs); + return !this.env.contains_(this.actual.argsForCall, expectedArgs); }; /** @@ -1355,26 +1400,43 @@ jasmine.Matchers.prototype.wasNotCalledWith = function () { * * @param {Object} expected */ -jasmine.Matchers.prototype.toContain = function (expected) { - return this.env.contains_(this.actual, expected); +jasmine.Matchers.prototype.toContain = function(expected) { + return this.env.contains_(this.actual, expected); }; /** * Matcher that checks that the expected item is NOT an element in the actual Array. * * @param {Object} expected - * @deprecated as of 1.0. Use not.toNotContain() instead. + * @deprecated as of 1.0. Use not.toContain() instead. */ -jasmine.Matchers.prototype.toNotContain = function (expected) { - return !this.env.contains_(this.actual, expected); +jasmine.Matchers.prototype.toNotContain = function(expected) { + return !this.env.contains_(this.actual, expected); +}; + +jasmine.Matchers.prototype.toBeLessThan = function(expected) { + return this.actual < expected; }; -jasmine.Matchers.prototype.toBeLessThan = function (expected) { - return this.actual < expected; +jasmine.Matchers.prototype.toBeGreaterThan = function(expected) { + return this.actual > expected; }; -jasmine.Matchers.prototype.toBeGreaterThan = function (expected) { - return this.actual > expected; +/** + * Matcher that checks that the expected item is equal to the actual item + * up to a given level of decimal precision (default 2). + * + * @param {Number} expected + * @param {Number} precision + */ +jasmine.Matchers.prototype.toBeCloseTo = function(expected, precision) { + if (!(precision === 0)) { + precision = precision || 2; + } + var multiplier = Math.pow(10, precision); + var actual = Math.round(this.actual * multiplier); + expected = Math.round(expected * multiplier); + return expected == actual; }; /** @@ -1382,123 +1444,335 @@ jasmine.Matchers.prototype.toBeGreaterThan = function (expected) { * * @param {String} expected */ -jasmine.Matchers.prototype.toThrow = function (expected) { - var result = false; - var exception; - if (typeof this.actual != 'function') { - throw new Error('Actual is not a function'); +jasmine.Matchers.prototype.toThrow = function(expected) { + var result = false; + var exception; + if (typeof this.actual != 'function') { + throw new Error('Actual is not a function'); + } + try { + this.actual(); + } catch (e) { + exception = e; + } + if (exception) { + result = (expected === jasmine.undefined || this.env.equals_(exception.message || exception, expected.message || expected)); + } + + var not = this.isNot ? "not " : ""; + + this.message = function() { + if (exception && (expected === jasmine.undefined || !this.env.equals_(exception.message || exception, expected.message || expected))) { + return ["Expected function " + not + "to throw", expected ? expected.message || expected : "an exception", ", but it threw", exception.message || exception].join(' '); + } else { + return "Expected function to throw an exception."; } - try { - this.actual(); - } catch (e) { - exception = e; + }; + + return result; +}; + +jasmine.Matchers.Any = function(expectedClass) { + this.expectedClass = expectedClass; +}; + +jasmine.Matchers.Any.prototype.jasmineMatches = function(other) { + if (this.expectedClass == String) { + return typeof other == 'string' || other instanceof String; + } + + if (this.expectedClass == Number) { + return typeof other == 'number' || other instanceof Number; + } + + if (this.expectedClass == Function) { + return typeof other == 'function' || other instanceof Function; + } + + if (this.expectedClass == Object) { + return typeof other == 'object'; + } + + return other instanceof this.expectedClass; +}; + +jasmine.Matchers.Any.prototype.jasmineToString = function() { + return ''; +}; + +jasmine.Matchers.ObjectContaining = function (sample) { + this.sample = sample; +}; + +jasmine.Matchers.ObjectContaining.prototype.jasmineMatches = function(other, mismatchKeys, mismatchValues) { + mismatchKeys = mismatchKeys || []; + mismatchValues = mismatchValues || []; + + var env = jasmine.getEnv(); + + var hasKey = function(obj, keyName) { + return obj != null && obj[keyName] !== jasmine.undefined; + }; + + for (var property in this.sample) { + if (!hasKey(other, property) && hasKey(this.sample, property)) { + mismatchKeys.push("expected has key '" + property + "', but missing from actual."); } - if (exception) { - result = (expected === jasmine.undefined || this.env.equals_(exception.message || exception, expected.message || expected)); + else if (!env.equals_(this.sample[property], other[property], mismatchKeys, mismatchValues)) { + mismatchValues.push("'" + property + "' was '" + (other[property] ? jasmine.util.htmlEscape(other[property].toString()) : other[property]) + "' in expected, but was '" + (this.sample[property] ? jasmine.util.htmlEscape(this.sample[property].toString()) : this.sample[property]) + "' in actual."); } + } - var not = this.isNot ? "not " : ""; + return (mismatchKeys.length === 0 && mismatchValues.length === 0); +}; - this.message = function () { - if (exception && (expected === jasmine.undefined || !this.env.equals_(exception.message || exception, expected.message || expected))) { - return ["Expected function " + not + "to throw", expected ? expected.message || expected : " an exception", ", but it threw", exception.message || exception].join(' '); - } else { - return "Expected function to throw an exception."; - } - }; +jasmine.Matchers.ObjectContaining.prototype.jasmineToString = function () { + return ""; +}; +// Mock setTimeout, clearTimeout +// Contributed by Pivotal Computer Systems, www.pivotalsf.com + +jasmine.FakeTimer = function() { + this.reset(); - return result; + var self = this; + self.setTimeout = function(funcToCall, millis) { + self.timeoutsMade++; + self.scheduleFunction(self.timeoutsMade, funcToCall, millis, false); + return self.timeoutsMade; + }; + + self.setInterval = function(funcToCall, millis) { + self.timeoutsMade++; + self.scheduleFunction(self.timeoutsMade, funcToCall, millis, true); + return self.timeoutsMade; + }; + + self.clearTimeout = function(timeoutKey) { + self.scheduledFunctions[timeoutKey] = jasmine.undefined; + }; + + self.clearInterval = function(timeoutKey) { + self.scheduledFunctions[timeoutKey] = jasmine.undefined; + }; + +}; + +jasmine.FakeTimer.prototype.reset = function() { + this.timeoutsMade = 0; + this.scheduledFunctions = {}; + this.nowMillis = 0; }; -jasmine.Matchers.Any = function (expectedClass) { - this.expectedClass = expectedClass; +jasmine.FakeTimer.prototype.tick = function(millis) { + var oldMillis = this.nowMillis; + var newMillis = oldMillis + millis; + this.runFunctionsWithinRange(oldMillis, newMillis); + this.nowMillis = newMillis; }; -jasmine.Matchers.Any.prototype.matches = function (other) { - if (this.expectedClass == String) { - return typeof other == 'string' || other instanceof String; +jasmine.FakeTimer.prototype.runFunctionsWithinRange = function(oldMillis, nowMillis) { + var scheduledFunc; + var funcsToRun = []; + for (var timeoutKey in this.scheduledFunctions) { + scheduledFunc = this.scheduledFunctions[timeoutKey]; + if (scheduledFunc != jasmine.undefined && + scheduledFunc.runAtMillis >= oldMillis && + scheduledFunc.runAtMillis <= nowMillis) { + funcsToRun.push(scheduledFunc); + this.scheduledFunctions[timeoutKey] = jasmine.undefined; } + } - if (this.expectedClass == Number) { - return typeof other == 'number' || other instanceof Number; + if (funcsToRun.length > 0) { + funcsToRun.sort(function(a, b) { + return a.runAtMillis - b.runAtMillis; + }); + for (var i = 0; i < funcsToRun.length; ++i) { + try { + var funcToRun = funcsToRun[i]; + this.nowMillis = funcToRun.runAtMillis; + funcToRun.funcToCall(); + if (funcToRun.recurring) { + this.scheduleFunction(funcToRun.timeoutKey, + funcToRun.funcToCall, + funcToRun.millis, + true); + } + } catch(e) { + } } + this.runFunctionsWithinRange(oldMillis, nowMillis); + } +}; + +jasmine.FakeTimer.prototype.scheduleFunction = function(timeoutKey, funcToCall, millis, recurring) { + this.scheduledFunctions[timeoutKey] = { + runAtMillis: this.nowMillis + millis, + funcToCall: funcToCall, + recurring: recurring, + timeoutKey: timeoutKey, + millis: millis + }; +}; - if (this.expectedClass == Function) { - return typeof other == 'function' || other instanceof Function; +/** + * @namespace + */ +jasmine.Clock = { + defaultFakeTimer: new jasmine.FakeTimer(), + + reset: function() { + jasmine.Clock.assertInstalled(); + jasmine.Clock.defaultFakeTimer.reset(); + }, + + tick: function(millis) { + jasmine.Clock.assertInstalled(); + jasmine.Clock.defaultFakeTimer.tick(millis); + }, + + runFunctionsWithinRange: function(oldMillis, nowMillis) { + jasmine.Clock.defaultFakeTimer.runFunctionsWithinRange(oldMillis, nowMillis); + }, + + scheduleFunction: function(timeoutKey, funcToCall, millis, recurring) { + jasmine.Clock.defaultFakeTimer.scheduleFunction(timeoutKey, funcToCall, millis, recurring); + }, + + useMock: function() { + if (!jasmine.Clock.isInstalled()) { + var spec = jasmine.getEnv().currentSpec; + spec.after(jasmine.Clock.uninstallMock); + + jasmine.Clock.installMock(); } + }, + + installMock: function() { + jasmine.Clock.installed = jasmine.Clock.defaultFakeTimer; + }, + + uninstallMock: function() { + jasmine.Clock.assertInstalled(); + jasmine.Clock.installed = jasmine.Clock.real; + }, - if (this.expectedClass == Object) { - return typeof other == 'object'; + real: { + setTimeout: jasmine.getGlobal().setTimeout, + clearTimeout: jasmine.getGlobal().clearTimeout, + setInterval: jasmine.getGlobal().setInterval, + clearInterval: jasmine.getGlobal().clearInterval + }, + + assertInstalled: function() { + if (!jasmine.Clock.isInstalled()) { + throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()"); } + }, + + isInstalled: function() { + return jasmine.Clock.installed == jasmine.Clock.defaultFakeTimer; + }, + + installed: null +}; +jasmine.Clock.installed = jasmine.Clock.real; - return other instanceof this.expectedClass; +//else for IE support +jasmine.getGlobal().setTimeout = function(funcToCall, millis) { + if (jasmine.Clock.installed.setTimeout.apply) { + return jasmine.Clock.installed.setTimeout.apply(this, arguments); + } else { + return jasmine.Clock.installed.setTimeout(funcToCall, millis); + } }; -jasmine.Matchers.Any.prototype.toString = function () { - return ''; +jasmine.getGlobal().setInterval = function(funcToCall, millis) { + if (jasmine.Clock.installed.setInterval.apply) { + return jasmine.Clock.installed.setInterval.apply(this, arguments); + } else { + return jasmine.Clock.installed.setInterval(funcToCall, millis); + } +}; + +jasmine.getGlobal().clearTimeout = function(timeoutKey) { + if (jasmine.Clock.installed.clearTimeout.apply) { + return jasmine.Clock.installed.clearTimeout.apply(this, arguments); + } else { + return jasmine.Clock.installed.clearTimeout(timeoutKey); + } +}; + +jasmine.getGlobal().clearInterval = function(timeoutKey) { + if (jasmine.Clock.installed.clearTimeout.apply) { + return jasmine.Clock.installed.clearInterval.apply(this, arguments); + } else { + return jasmine.Clock.installed.clearInterval(timeoutKey); + } }; /** * @constructor */ -jasmine.MultiReporter = function () { - this.subReporters_ = []; +jasmine.MultiReporter = function() { + this.subReporters_ = []; }; jasmine.util.inherit(jasmine.MultiReporter, jasmine.Reporter); -jasmine.MultiReporter.prototype.addReporter = function (reporter) { - this.subReporters_.push(reporter); -}; - -(function () { - var functionNames = [ - "reportRunnerStarting", - "reportRunnerResults", - "reportSuiteResults", - "reportSpecStarting", - "reportSpecResults", - "log" - ]; - for (var i = 0; i < functionNames.length; i++) { - var functionName = functionNames[i]; - jasmine.MultiReporter.prototype[functionName] = (function (functionName) { - return function () { - for (var j = 0; j < this.subReporters_.length; j++) { - var subReporter = this.subReporters_[j]; - if (subReporter[functionName]) { - subReporter[functionName].apply(subReporter, arguments); - } - } - }; - })(functionName); - } +jasmine.MultiReporter.prototype.addReporter = function(reporter) { + this.subReporters_.push(reporter); +}; + +(function() { + var functionNames = [ + "reportRunnerStarting", + "reportRunnerResults", + "reportSuiteResults", + "reportSpecStarting", + "reportSpecResults", + "log" + ]; + for (var i = 0; i < functionNames.length; i++) { + var functionName = functionNames[i]; + jasmine.MultiReporter.prototype[functionName] = (function(functionName) { + return function() { + for (var j = 0; j < this.subReporters_.length; j++) { + var subReporter = this.subReporters_[j]; + if (subReporter[functionName]) { + subReporter[functionName].apply(subReporter, arguments); + } + } + }; + })(functionName); + } })(); /** * Holds results for a set of Jasmine spec. Allows for the results array to hold another jasmine.NestedResults * * @constructor */ -jasmine.NestedResults = function () { - /** - * The total count of results - */ - this.totalCount = 0; - /** - * Number of passed results - */ - this.passedCount = 0; - /** - * Number of failed results - */ - this.failedCount = 0; - /** - * Was this suite/spec skipped? - */ - this.skipped = false; - /** - * @ignore - */ - this.items_ = []; +jasmine.NestedResults = function() { + /** + * The total count of results + */ + this.totalCount = 0; + /** + * Number of passed results + */ + this.passedCount = 0; + /** + * Number of failed results + */ + this.failedCount = 0; + /** + * Was this suite/spec skipped? + */ + this.skipped = false; + /** + * @ignore + */ + this.items_ = []; }; /** @@ -1506,58 +1780,58 @@ jasmine.NestedResults = function () { * * @param result */ -jasmine.NestedResults.prototype.rollupCounts = function (result) { - this.totalCount += result.totalCount; - this.passedCount += result.passedCount; - this.failedCount += result.failedCount; +jasmine.NestedResults.prototype.rollupCounts = function(result) { + this.totalCount += result.totalCount; + this.passedCount += result.passedCount; + this.failedCount += result.failedCount; }; /** * Adds a log message. * @param values Array of message parts which will be concatenated later. */ -jasmine.NestedResults.prototype.log = function (values) { - this.items_.push(new jasmine.MessageResult(values)); +jasmine.NestedResults.prototype.log = function(values) { + this.items_.push(new jasmine.MessageResult(values)); }; /** * Getter for the results: message & results. */ -jasmine.NestedResults.prototype.getItems = function () { - return this.items_; +jasmine.NestedResults.prototype.getItems = function() { + return this.items_; }; /** * Adds a result, tracking counts (total, passed, & failed) * @param {jasmine.ExpectationResult|jasmine.NestedResults} result */ -jasmine.NestedResults.prototype.addResult = function (result) { - if (result.type != 'log') { - if (result.items_) { - this.rollupCounts(result); - } else { - this.totalCount++; - if (result.passed()) { - this.passedCount++; - } else { - this.failedCount++; - } - } +jasmine.NestedResults.prototype.addResult = function(result) { + if (result.type != 'log') { + if (result.items_) { + this.rollupCounts(result); + } else { + this.totalCount++; + if (result.passed()) { + this.passedCount++; + } else { + this.failedCount++; + } } - this.items_.push(result); + } + this.items_.push(result); }; /** * @returns {Boolean} True if everything below passed */ -jasmine.NestedResults.prototype.passed = function () { - return this.passedCount === this.totalCount; +jasmine.NestedResults.prototype.passed = function() { + return this.passedCount === this.totalCount; }; /** * Base class for pretty printing for expectation results. */ -jasmine.PrettyPrinter = function () { - this.ppNestLevel_ = 0; +jasmine.PrettyPrinter = function() { + this.ppNestLevel_ = 0; }; /** @@ -1565,56 +1839,57 @@ jasmine.PrettyPrinter = function () { * * @param value */ -jasmine.PrettyPrinter.prototype.format = function (value) { - if (this.ppNestLevel_ > 40) { - throw new Error('jasmine.PrettyPrinter: format() nested too deeply!'); - } - - this.ppNestLevel_++; - try { - if (value === jasmine.undefined) { - this.emitScalar('undefined'); - } else if (value === null) { - this.emitScalar('null'); - } else if (value === jasmine.getGlobal()) { - this.emitScalar(''); - } else if (value instanceof jasmine.Matchers.Any) { - this.emitScalar(value.toString()); - } else if (typeof value === 'string') { - this.emitString(value); - } else if (jasmine.isSpy(value)) { - this.emitScalar("spy on " + value.identity); - } else if (value instanceof RegExp) { - this.emitScalar(value.toString()); - } else if (typeof value === 'function') { - this.emitScalar('Function'); - } else if (typeof value.nodeType === 'number') { - this.emitScalar('HTMLNode'); - } else if (value instanceof Date) { - this.emitScalar('Date(' + value + ')'); - } else if (value.__Jasmine_been_here_before__) { - this.emitScalar(''); - } else if (jasmine.isArray_(value) || typeof value == 'object') { - value.__Jasmine_been_here_before__ = true; - if (jasmine.isArray_(value)) { - this.emitArray(value); - } else { - this.emitObject(value); - } - delete value.__Jasmine_been_here_before__; - } else { - this.emitScalar(value.toString()); - } - } finally { - this.ppNestLevel_--; +jasmine.PrettyPrinter.prototype.format = function(value) { + if (this.ppNestLevel_ > 40) { + throw new Error('jasmine.PrettyPrinter: format() nested too deeply!'); + } + + this.ppNestLevel_++; + try { + if (value === jasmine.undefined) { + this.emitScalar('undefined'); + } else if (value === null) { + this.emitScalar('null'); + } else if (value === jasmine.getGlobal()) { + this.emitScalar(''); + } else if (value.jasmineToString) { + this.emitScalar(value.jasmineToString()); + } else if (typeof value === 'string') { + this.emitString(value); + } else if (jasmine.isSpy(value)) { + this.emitScalar("spy on " + value.identity); + } else if (value instanceof RegExp) { + this.emitScalar(value.toString()); + } else if (typeof value === 'function') { + this.emitScalar('Function'); + } else if (typeof value.nodeType === 'number') { + this.emitScalar('HTMLNode'); + } else if (value instanceof Date) { + this.emitScalar('Date(' + value + ')'); + } else if (value.__Jasmine_been_here_before__) { + this.emitScalar(''); + } else if (jasmine.isArray_(value) || typeof value == 'object') { + value.__Jasmine_been_here_before__ = true; + if (jasmine.isArray_(value)) { + this.emitArray(value); + } else { + this.emitObject(value); + } + delete value.__Jasmine_been_here_before__; + } else { + this.emitScalar(value.toString()); } + } finally { + this.ppNestLevel_--; + } }; -jasmine.PrettyPrinter.prototype.iterateObject = function (obj, fn) { - for (var property in obj) { - if (property == '__Jasmine_been_here_before__') continue; - fn(property, obj.__lookupGetter__ ? (obj.__lookupGetter__(property) != null) : false); - } +jasmine.PrettyPrinter.prototype.iterateObject = function(obj, fn) { + for (var property in obj) { + if (property == '__Jasmine_been_here_before__') continue; + fn(property, obj.__lookupGetter__ ? (obj.__lookupGetter__(property) !== jasmine.undefined && + obj.__lookupGetter__(property) !== null) : false); + } }; jasmine.PrettyPrinter.prototype.emitArray = jasmine.unimplementedMethod_; @@ -1622,155 +1897,155 @@ jasmine.PrettyPrinter.prototype.emitObject = jasmine.unimplementedMethod_; jasmine.PrettyPrinter.prototype.emitScalar = jasmine.unimplementedMethod_; jasmine.PrettyPrinter.prototype.emitString = jasmine.unimplementedMethod_; -jasmine.StringPrettyPrinter = function () { - jasmine.PrettyPrinter.call(this); +jasmine.StringPrettyPrinter = function() { + jasmine.PrettyPrinter.call(this); - this.string = ''; + this.string = ''; }; jasmine.util.inherit(jasmine.StringPrettyPrinter, jasmine.PrettyPrinter); -jasmine.StringPrettyPrinter.prototype.emitScalar = function (value) { - this.append(value); +jasmine.StringPrettyPrinter.prototype.emitScalar = function(value) { + this.append(value); }; -jasmine.StringPrettyPrinter.prototype.emitString = function (value) { - this.append("'" + value + "'"); +jasmine.StringPrettyPrinter.prototype.emitString = function(value) { + this.append("'" + value + "'"); }; -jasmine.StringPrettyPrinter.prototype.emitArray = function (array) { - this.append('[ '); - for (var i = 0; i < array.length; i++) { - if (i > 0) { - this.append(', '); - } - this.format(array[i]); +jasmine.StringPrettyPrinter.prototype.emitArray = function(array) { + this.append('[ '); + for (var i = 0; i < array.length; i++) { + if (i > 0) { + this.append(', '); } - this.append(' ]'); + this.format(array[i]); + } + this.append(' ]'); }; -jasmine.StringPrettyPrinter.prototype.emitObject = function (obj) { - var self = this; - this.append('{ '); - var first = true; +jasmine.StringPrettyPrinter.prototype.emitObject = function(obj) { + var self = this; + this.append('{ '); + var first = true; - this.iterateObject(obj, function (property, isGetter) { - if (first) { - first = false; - } else { - self.append(', '); - } + this.iterateObject(obj, function(property, isGetter) { + if (first) { + first = false; + } else { + self.append(', '); + } - self.append(property); - self.append(' : '); - if (isGetter) { - self.append(''); - } else { - self.format(obj[property]); - } - }); + self.append(property); + self.append(' : '); + if (isGetter) { + self.append(''); + } else { + self.format(obj[property]); + } + }); - this.append(' }'); + this.append(' }'); }; -jasmine.StringPrettyPrinter.prototype.append = function (value) { - this.string += value; +jasmine.StringPrettyPrinter.prototype.append = function(value) { + this.string += value; }; -jasmine.Queue = function (env) { - this.env = env; - this.blocks = []; - this.running = false; - this.index = 0; - this.offset = 0; - this.abort = false; +jasmine.Queue = function(env) { + this.env = env; + this.blocks = []; + this.running = false; + this.index = 0; + this.offset = 0; + this.abort = false; }; -jasmine.Queue.prototype.addBefore = function (block) { - this.blocks.unshift(block); +jasmine.Queue.prototype.addBefore = function(block) { + this.blocks.unshift(block); }; -jasmine.Queue.prototype.add = function (block) { - this.blocks.push(block); +jasmine.Queue.prototype.add = function(block) { + this.blocks.push(block); }; -jasmine.Queue.prototype.insertNext = function (block) { - this.blocks.splice((this.index + this.offset + 1), 0, block); - this.offset++; +jasmine.Queue.prototype.insertNext = function(block) { + this.blocks.splice((this.index + this.offset + 1), 0, block); + this.offset++; }; -jasmine.Queue.prototype.start = function (onComplete) { - this.running = true; - this.onComplete = onComplete; - this.next_(); +jasmine.Queue.prototype.start = function(onComplete) { + this.running = true; + this.onComplete = onComplete; + this.next_(); }; -jasmine.Queue.prototype.isRunning = function () { - return this.running; +jasmine.Queue.prototype.isRunning = function() { + return this.running; }; jasmine.Queue.LOOP_DONT_RECURSE = true; -jasmine.Queue.prototype.next_ = function () { - var self = this; - var goAgain = true; - - while (goAgain) { - goAgain = false; - - if (self.index < self.blocks.length && !this.abort) { - var calledSynchronously = true; - var completedSynchronously = false; - - var onComplete = function () { - if (jasmine.Queue.LOOP_DONT_RECURSE && calledSynchronously) { - completedSynchronously = true; - return; - } - - if (self.blocks[self.index].abort) { - self.abort = true; - } - - self.offset = 0; - self.index++; - - var now = new Date().getTime(); - if (self.env.updateInterval && now - self.env.lastUpdate > self.env.updateInterval) { - self.env.lastUpdate = now; - self.env.setTimeout(function () { - self.next_(); - }, 0); - } else { - if (jasmine.Queue.LOOP_DONT_RECURSE && completedSynchronously) { - goAgain = true; - } else { - self.next_(); - } - } - }; - self.blocks[self.index].execute(onComplete); - - calledSynchronously = false; - if (completedSynchronously) { - onComplete(); - } +jasmine.Queue.prototype.next_ = function() { + var self = this; + var goAgain = true; + + while (goAgain) { + goAgain = false; + + if (self.index < self.blocks.length && !this.abort) { + var calledSynchronously = true; + var completedSynchronously = false; + + var onComplete = function () { + if (jasmine.Queue.LOOP_DONT_RECURSE && calledSynchronously) { + completedSynchronously = true; + return; + } + + if (self.blocks[self.index].abort) { + self.abort = true; + } + self.offset = 0; + self.index++; + + var now = new Date().getTime(); + if (self.env.updateInterval && now - self.env.lastUpdate > self.env.updateInterval) { + self.env.lastUpdate = now; + self.env.setTimeout(function() { + self.next_(); + }, 0); } else { - self.running = false; - if (self.onComplete) { - self.onComplete(); - } + if (jasmine.Queue.LOOP_DONT_RECURSE && completedSynchronously) { + goAgain = true; + } else { + self.next_(); + } } + }; + self.blocks[self.index].execute(onComplete); + + calledSynchronously = false; + if (completedSynchronously) { + onComplete(); + } + + } else { + self.running = false; + if (self.onComplete) { + self.onComplete(); + } } + } }; -jasmine.Queue.prototype.results = function () { - var results = new jasmine.NestedResults(); - for (var i = 0; i < this.blocks.length; i++) { - if (this.blocks[i].results) { - results.addResult(this.blocks[i].results()); - } +jasmine.Queue.prototype.results = function() { + var results = new jasmine.NestedResults(); + for (var i = 0; i < this.blocks.length; i++) { + if (this.blocks[i].results) { + results.addResult(this.blocks[i].results()); } - return results; + } + return results; }; @@ -1780,79 +2055,76 @@ jasmine.Queue.prototype.results = function () { * @constructor * @param {jasmine.Env} env */ -jasmine.Runner = function (env) { - var self = this; - self.env = env; - self.queue = new jasmine.Queue(env); - self.before_ = []; - self.after_ = []; - self.suites_ = []; +jasmine.Runner = function(env) { + var self = this; + self.env = env; + self.queue = new jasmine.Queue(env); + self.before_ = []; + self.after_ = []; + self.suites_ = []; }; -jasmine.Runner.prototype.execute = function (onComplete) { - var self = this; - if (self.env.reporter.reportRunnerStarting) { - self.env.reporter.reportRunnerStarting(this); - } - self.queue.start(function () { - self.finishCallback(); - if (onComplete) { - onComplete.call(self); - } - }); +jasmine.Runner.prototype.execute = function() { + var self = this; + if (self.env.reporter.reportRunnerStarting) { + self.env.reporter.reportRunnerStarting(this); + } + self.queue.start(function () { + self.finishCallback(); + }); }; -jasmine.Runner.prototype.beforeEach = function (beforeEachFunction) { - beforeEachFunction.typeName = 'beforeEach'; - this.before_.splice(0, 0, beforeEachFunction); +jasmine.Runner.prototype.beforeEach = function(beforeEachFunction) { + beforeEachFunction.typeName = 'beforeEach'; + this.before_.splice(0,0,beforeEachFunction); }; -jasmine.Runner.prototype.afterEach = function (afterEachFunction) { - afterEachFunction.typeName = 'afterEach'; - this.after_.splice(0, 0, afterEachFunction); +jasmine.Runner.prototype.afterEach = function(afterEachFunction) { + afterEachFunction.typeName = 'afterEach'; + this.after_.splice(0,0,afterEachFunction); }; -jasmine.Runner.prototype.finishCallback = function () { - this.env.reporter.reportRunnerResults(this); +jasmine.Runner.prototype.finishCallback = function() { + this.env.reporter.reportRunnerResults(this); }; -jasmine.Runner.prototype.addSuite = function (suite) { - this.suites_.push(suite); +jasmine.Runner.prototype.addSuite = function(suite) { + this.suites_.push(suite); }; -jasmine.Runner.prototype.add = function (block) { - if (block instanceof jasmine.Suite) { - this.addSuite(block); - } - this.queue.add(block); +jasmine.Runner.prototype.add = function(block) { + if (block instanceof jasmine.Suite) { + this.addSuite(block); + } + this.queue.add(block); }; jasmine.Runner.prototype.specs = function () { - var suites = this.suites(); - var specs = []; - for (var i = 0; i < suites.length; i++) { - specs = specs.concat(suites[i].specs()); - } - return specs; + var suites = this.suites(); + var specs = []; + for (var i = 0; i < suites.length; i++) { + specs = specs.concat(suites[i].specs()); + } + return specs; }; -jasmine.Runner.prototype.suites = function () { - return this.suites_; +jasmine.Runner.prototype.suites = function() { + return this.suites_; }; -jasmine.Runner.prototype.topLevelSuites = function () { - var topLevelSuites = []; - for (var i = 0; i < this.suites_.length; i++) { - if (!this.suites_[i].parentSuite) { - topLevelSuites.push(this.suites_[i]); - } +jasmine.Runner.prototype.topLevelSuites = function() { + var topLevelSuites = []; + for (var i = 0; i < this.suites_.length; i++) { + if (!this.suites_[i].parentSuite) { + topLevelSuites.push(this.suites_[i]); } - return topLevelSuites; + } + return topLevelSuites; }; -jasmine.Runner.prototype.results = function () { - return this.queue.results(); +jasmine.Runner.prototype.results = function() { + return this.queue.results(); }; /** * Internal representation of a Jasmine specification, or test. @@ -1862,35 +2134,35 @@ jasmine.Runner.prototype.results = function () { * @param {jasmine.Suite} suite * @param {String} description */ -jasmine.Spec = function (env, suite, description) { - if (!env) { - throw new Error('jasmine.Env() required'); - } - if (!suite) { - throw new Error('jasmine.Suite() required'); - } - var spec = this; - spec.id = env.nextSpecId ? env.nextSpecId() : null; - spec.env = env; - spec.suite = suite; - spec.description = description; - spec.queue = new jasmine.Queue(env); +jasmine.Spec = function(env, suite, description) { + if (!env) { + throw new Error('jasmine.Env() required'); + } + if (!suite) { + throw new Error('jasmine.Suite() required'); + } + var spec = this; + spec.id = env.nextSpecId ? env.nextSpecId() : null; + spec.env = env; + spec.suite = suite; + spec.description = description; + spec.queue = new jasmine.Queue(env); - spec.afterCallbacks = []; - spec.spies_ = []; + spec.afterCallbacks = []; + spec.spies_ = []; - spec.results_ = new jasmine.NestedResults(); - spec.results_.description = description; - spec.matchersClass = null; + spec.results_ = new jasmine.NestedResults(); + spec.results_.description = description; + spec.matchersClass = null; }; -jasmine.Spec.prototype.getFullName = function () { - return this.suite.getFullName() + ' ' + this.description + '.'; +jasmine.Spec.prototype.getFullName = function() { + return this.suite.getFullName() + ' ' + this.description + '.'; }; -jasmine.Spec.prototype.results = function () { - return this.results_; +jasmine.Spec.prototype.results = function() { + return this.results_; }; /** @@ -1898,35 +2170,35 @@ jasmine.Spec.prototype.results = function () { * * Be careful not to leave calls to jasmine.log in production code. */ -jasmine.Spec.prototype.log = function () { - return this.results_.log(arguments); +jasmine.Spec.prototype.log = function() { + return this.results_.log(arguments); }; jasmine.Spec.prototype.runs = function (func) { - var block = new jasmine.Block(this.env, func, this); - this.addToQueue(block); - return this; + var block = new jasmine.Block(this.env, func, this); + this.addToQueue(block); + return this; }; jasmine.Spec.prototype.addToQueue = function (block) { - if (this.queue.isRunning()) { - this.queue.insertNext(block); - } else { - this.queue.add(block); - } + if (this.queue.isRunning()) { + this.queue.insertNext(block); + } else { + this.queue.add(block); + } }; /** * @param {jasmine.ExpectationResult} result */ -jasmine.Spec.prototype.addMatcherResult = function (result) { - this.results_.addResult(result); +jasmine.Spec.prototype.addMatcherResult = function(result) { + this.results_.addResult(result); }; -jasmine.Spec.prototype.expect = function (actual) { - var positive = new (this.getMatchersClass_())(this.env, actual, this); - positive.not = new (this.getMatchersClass_())(this.env, actual, this, true); - return positive; +jasmine.Spec.prototype.expect = function(actual) { + var positive = new (this.getMatchersClass_())(this.env, actual, this); + positive.not = new (this.getMatchersClass_())(this.env, actual, this, true); + return positive; }; /** @@ -1935,10 +2207,10 @@ jasmine.Spec.prototype.expect = function (actual) { * @deprecated Use waitsFor() instead * @param {Number} timeout milliseconds to wait */ -jasmine.Spec.prototype.waits = function (timeout) { - var waitsFunc = new jasmine.WaitsBlock(this.env, timeout, this); - this.addToQueue(waitsFunc); - return this; +jasmine.Spec.prototype.waits = function(timeout) { + var waitsFunc = new jasmine.WaitsBlock(this.env, timeout, this); + this.addToQueue(waitsFunc); + return this; }; /** @@ -1948,152 +2220,153 @@ jasmine.Spec.prototype.waits = function (timeout) { * @param {String} optional_timeoutMessage * @param {Number} optional_timeout */ -jasmine.Spec.prototype.waitsFor = function (latchFunction, optional_timeoutMessage, optional_timeout) { - var latchFunction_ = null; - var optional_timeoutMessage_ = null; - var optional_timeout_ = null; - - for (var i = 0; i < arguments.length; i++) { - var arg = arguments[i]; - switch (typeof arg) { - case 'function': - latchFunction_ = arg; - break; - case 'string': - optional_timeoutMessage_ = arg; - break; - case 'number': - optional_timeout_ = arg; - break; - } +jasmine.Spec.prototype.waitsFor = function(latchFunction, optional_timeoutMessage, optional_timeout) { + var latchFunction_ = null; + var optional_timeoutMessage_ = null; + var optional_timeout_ = null; + + for (var i = 0; i < arguments.length; i++) { + var arg = arguments[i]; + switch (typeof arg) { + case 'function': + latchFunction_ = arg; + break; + case 'string': + optional_timeoutMessage_ = arg; + break; + case 'number': + optional_timeout_ = arg; + break; } + } - var waitsForFunc = new jasmine.WaitsForBlock(this.env, optional_timeout_, latchFunction_, optional_timeoutMessage_, this); - this.addToQueue(waitsForFunc); - return this; + var waitsForFunc = new jasmine.WaitsForBlock(this.env, optional_timeout_, latchFunction_, optional_timeoutMessage_, this); + this.addToQueue(waitsForFunc); + return this; }; jasmine.Spec.prototype.fail = function (e) { - var expectationResult = new jasmine.ExpectationResult({ - passed: false, - message: e ? jasmine.util.formatException(e) : 'Exception' - }); - this.results_.addResult(expectationResult); + var expectationResult = new jasmine.ExpectationResult({ + passed: false, + message: e ? jasmine.util.formatException(e) : 'Exception', + trace: { stack: e.stack } + }); + this.results_.addResult(expectationResult); }; -jasmine.Spec.prototype.getMatchersClass_ = function () { - return this.matchersClass || this.env.matchersClass; +jasmine.Spec.prototype.getMatchersClass_ = function() { + return this.matchersClass || this.env.matchersClass; }; -jasmine.Spec.prototype.addMatchers = function (matchersPrototype) { - var parent = this.getMatchersClass_(); - var newMatchersClass = function () { - parent.apply(this, arguments); - }; - jasmine.util.inherit(newMatchersClass, parent); - jasmine.Matchers.wrapInto_(matchersPrototype, newMatchersClass); - this.matchersClass = newMatchersClass; +jasmine.Spec.prototype.addMatchers = function(matchersPrototype) { + var parent = this.getMatchersClass_(); + var newMatchersClass = function() { + parent.apply(this, arguments); + }; + jasmine.util.inherit(newMatchersClass, parent); + jasmine.Matchers.wrapInto_(matchersPrototype, newMatchersClass); + this.matchersClass = newMatchersClass; }; -jasmine.Spec.prototype.finishCallback = function () { - this.env.reporter.reportSpecResults(this); +jasmine.Spec.prototype.finishCallback = function() { + this.env.reporter.reportSpecResults(this); }; -jasmine.Spec.prototype.finish = function (onComplete) { - this.removeAllSpies(); - this.finishCallback(); - if (onComplete) { - onComplete(); - } +jasmine.Spec.prototype.finish = function(onComplete) { + this.removeAllSpies(); + this.finishCallback(); + if (onComplete) { + onComplete(); + } }; -jasmine.Spec.prototype.after = function (doAfter) { - if (this.queue.isRunning()) { - this.queue.add(new jasmine.Block(this.env, doAfter, this)); - } else { - this.afterCallbacks.unshift(doAfter); - } +jasmine.Spec.prototype.after = function(doAfter) { + if (this.queue.isRunning()) { + this.queue.add(new jasmine.Block(this.env, doAfter, this)); + } else { + this.afterCallbacks.unshift(doAfter); + } }; -jasmine.Spec.prototype.execute = function (onComplete) { - var spec = this; - if (!spec.env.specFilter(spec)) { - spec.results_.skipped = true; - spec.finish(onComplete); - return; - } +jasmine.Spec.prototype.execute = function(onComplete) { + var spec = this; + if (!spec.env.specFilter(spec)) { + spec.results_.skipped = true; + spec.finish(onComplete); + return; + } - this.env.reporter.reportSpecStarting(this); + this.env.reporter.reportSpecStarting(this); - spec.env.currentSpec = spec; + spec.env.currentSpec = spec; - spec.addBeforesAndAftersToQueue(); + spec.addBeforesAndAftersToQueue(); - spec.queue.start(function () { - spec.finish(onComplete); - }); + spec.queue.start(function () { + spec.finish(onComplete); + }); }; -jasmine.Spec.prototype.addBeforesAndAftersToQueue = function () { - var runner = this.env.currentRunner(); - var i; +jasmine.Spec.prototype.addBeforesAndAftersToQueue = function() { + var runner = this.env.currentRunner(); + var i; - for (var suite = this.suite; suite; suite = suite.parentSuite) { - for (i = 0; i < suite.before_.length; i++) { - this.queue.addBefore(new jasmine.Block(this.env, suite.before_[i], this)); - } - } - for (i = 0; i < runner.before_.length; i++) { - this.queue.addBefore(new jasmine.Block(this.env, runner.before_[i], this)); - } - for (i = 0; i < this.afterCallbacks.length; i++) { - this.queue.add(new jasmine.Block(this.env, this.afterCallbacks[i], this)); - } - for (suite = this.suite; suite; suite = suite.parentSuite) { - for (i = 0; i < suite.after_.length; i++) { - this.queue.add(new jasmine.Block(this.env, suite.after_[i], this)); - } + for (var suite = this.suite; suite; suite = suite.parentSuite) { + for (i = 0; i < suite.before_.length; i++) { + this.queue.addBefore(new jasmine.Block(this.env, suite.before_[i], this)); } - for (i = 0; i < runner.after_.length; i++) { - this.queue.add(new jasmine.Block(this.env, runner.after_[i], this)); + } + for (i = 0; i < runner.before_.length; i++) { + this.queue.addBefore(new jasmine.Block(this.env, runner.before_[i], this)); + } + for (i = 0; i < this.afterCallbacks.length; i++) { + this.queue.add(new jasmine.Block(this.env, this.afterCallbacks[i], this)); + } + for (suite = this.suite; suite; suite = suite.parentSuite) { + for (i = 0; i < suite.after_.length; i++) { + this.queue.add(new jasmine.Block(this.env, suite.after_[i], this)); } + } + for (i = 0; i < runner.after_.length; i++) { + this.queue.add(new jasmine.Block(this.env, runner.after_[i], this)); + } }; -jasmine.Spec.prototype.explodes = function () { - throw 'explodes function should not have been called'; +jasmine.Spec.prototype.explodes = function() { + throw 'explodes function should not have been called'; }; -jasmine.Spec.prototype.spyOn = function (obj, methodName, ignoreMethodDoesntExist) { - if (obj == jasmine.undefined) { - throw "spyOn could not find an object to spy upon for " + methodName + "()"; - } +jasmine.Spec.prototype.spyOn = function(obj, methodName, ignoreMethodDoesntExist) { + if (obj == jasmine.undefined) { + throw "spyOn could not find an object to spy upon for " + methodName + "()"; + } - if (!ignoreMethodDoesntExist && obj[methodName] === jasmine.undefined) { - throw methodName + '() method does not exist'; - } + if (!ignoreMethodDoesntExist && obj[methodName] === jasmine.undefined) { + throw methodName + '() method does not exist'; + } - if (!ignoreMethodDoesntExist && obj[methodName] && obj[methodName].isSpy) { - throw new Error(methodName + ' has already been spied upon'); - } + if (!ignoreMethodDoesntExist && obj[methodName] && obj[methodName].isSpy) { + throw new Error(methodName + ' has already been spied upon'); + } - var spyObj = jasmine.createSpy(methodName); + var spyObj = jasmine.createSpy(methodName); - this.spies_.push(spyObj); - spyObj.baseObj = obj; - spyObj.methodName = methodName; - spyObj.originalValue = obj[methodName]; + this.spies_.push(spyObj); + spyObj.baseObj = obj; + spyObj.methodName = methodName; + spyObj.originalValue = obj[methodName]; - obj[methodName] = spyObj; + obj[methodName] = spyObj; - return spyObj; + return spyObj; }; -jasmine.Spec.prototype.removeAllSpies = function () { - for (var i = 0; i < this.spies_.length; i++) { - var spy = this.spies_[i]; - spy.baseObj[spy.methodName] = spy.originalValue; - } - this.spies_ = []; +jasmine.Spec.prototype.removeAllSpies = function() { + for (var i = 0; i < this.spies_.length; i++) { + var spy = this.spies_[i]; + spy.baseObj[spy.methodName] = spy.originalValue; + } + this.spies_ = []; }; /** @@ -2105,91 +2378,93 @@ jasmine.Spec.prototype.removeAllSpies = function () { * @param {Function} specDefinitions * @param {jasmine.Suite} parentSuite */ -jasmine.Suite = function (env, description, specDefinitions, parentSuite) { - var self = this; - self.id = env.nextSuiteId ? env.nextSuiteId() : null; - self.description = description; - self.queue = new jasmine.Queue(env); - self.parentSuite = parentSuite; - self.env = env; - self.before_ = []; - self.after_ = []; - self.children_ = []; - self.suites_ = []; - self.specs_ = []; -}; - -jasmine.Suite.prototype.getFullName = function () { - var fullName = this.description; - for (var parentSuite = this.parentSuite; parentSuite; parentSuite = parentSuite.parentSuite) { - fullName = parentSuite.description + ' ' + fullName; - } - return fullName; +jasmine.Suite = function(env, description, specDefinitions, parentSuite) { + var self = this; + self.id = env.nextSuiteId ? env.nextSuiteId() : null; + self.description = description; + self.queue = new jasmine.Queue(env); + self.parentSuite = parentSuite; + self.env = env; + self.before_ = []; + self.after_ = []; + self.children_ = []; + self.suites_ = []; + self.specs_ = []; +}; + +jasmine.Suite.prototype.getFullName = function() { + var fullName = this.description; + for (var parentSuite = this.parentSuite; parentSuite; parentSuite = parentSuite.parentSuite) { + fullName = parentSuite.description + ' ' + fullName; + } + return fullName; +}; + +jasmine.Suite.prototype.finish = function(onComplete) { + this.env.reporter.reportSuiteResults(this); + this.finished = true; + if (typeof(onComplete) == 'function') { + onComplete(); + } }; -jasmine.Suite.prototype.finish = function (onComplete) { - this.env.reporter.reportSuiteResults(this); - this.finished = true; - if (typeof(onComplete) == 'function') { - onComplete(); - } +jasmine.Suite.prototype.beforeEach = function(beforeEachFunction) { + beforeEachFunction.typeName = 'beforeEach'; + this.before_.unshift(beforeEachFunction); }; -jasmine.Suite.prototype.beforeEach = function (beforeEachFunction) { - beforeEachFunction.typeName = 'beforeEach'; - this.before_.unshift(beforeEachFunction); +jasmine.Suite.prototype.afterEach = function(afterEachFunction) { + afterEachFunction.typeName = 'afterEach'; + this.after_.unshift(afterEachFunction); }; -jasmine.Suite.prototype.afterEach = function (afterEachFunction) { - afterEachFunction.typeName = 'afterEach'; - this.after_.unshift(afterEachFunction); +jasmine.Suite.prototype.results = function() { + return this.queue.results(); }; -jasmine.Suite.prototype.results = function () { - return this.queue.results(); +jasmine.Suite.prototype.add = function(suiteOrSpec) { + this.children_.push(suiteOrSpec); + if (suiteOrSpec instanceof jasmine.Suite) { + this.suites_.push(suiteOrSpec); + this.env.currentRunner().addSuite(suiteOrSpec); + } else { + this.specs_.push(suiteOrSpec); + } + this.queue.add(suiteOrSpec); }; -jasmine.Suite.prototype.add = function (suiteOrSpec) { - this.children_.push(suiteOrSpec); - if (suiteOrSpec instanceof jasmine.Suite) { - this.suites_.push(suiteOrSpec); - this.env.currentRunner().addSuite(suiteOrSpec); - } else { - this.specs_.push(suiteOrSpec); - } - this.queue.add(suiteOrSpec); +jasmine.Suite.prototype.specs = function() { + return this.specs_; }; -jasmine.Suite.prototype.specs = function () { - return this.specs_; +jasmine.Suite.prototype.suites = function() { + return this.suites_; }; -jasmine.Suite.prototype.suites = function () { - return this.suites_; +jasmine.Suite.prototype.children = function() { + return this.children_; }; -jasmine.Suite.prototype.children = function () { - return this.children_; +jasmine.Suite.prototype.execute = function(onComplete) { + var self = this; + this.queue.start(function () { + self.finish(onComplete); + }); }; - -jasmine.Suite.prototype.execute = function (onComplete) { - var self = this; - this.queue.start(function () { - self.finish(onComplete); - }); -}; -jasmine.WaitsBlock = function (env, timeout, spec) { - this.timeout = timeout; - jasmine.Block.call(this, env, null, spec); +jasmine.WaitsBlock = function(env, timeout, spec) { + this.timeout = timeout; + jasmine.Block.call(this, env, null, spec); }; jasmine.util.inherit(jasmine.WaitsBlock, jasmine.Block); jasmine.WaitsBlock.prototype.execute = function (onComplete) { - //this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...'); - this.env.setTimeout(function () { - onComplete(); - }, this.timeout); + if (jasmine.VERBOSE) { + this.env.reporter.log('>> Jasmine waiting for ' + this.timeout + ' ms...'); + } + this.env.setTimeout(function () { + onComplete(); + }, this.timeout); }; /** * A block which waits for some condition to become true, with timeout. @@ -2202,239 +2477,57 @@ jasmine.WaitsBlock.prototype.execute = function (onComplete) { * @param {String} message The message to display if the desired condition hasn't been met within the given time period. * @param {jasmine.Spec} spec The Jasmine spec. */ -jasmine.WaitsForBlock = function (env, timeout, latchFunction, message, spec) { - this.timeout = timeout || env.defaultTimeoutInterval; - this.latchFunction = latchFunction; - this.message = message; - this.totalTimeSpentWaitingForLatch = 0; - jasmine.Block.call(this, env, null, spec); +jasmine.WaitsForBlock = function(env, timeout, latchFunction, message, spec) { + this.timeout = timeout || env.defaultTimeoutInterval; + this.latchFunction = latchFunction; + this.message = message; + this.totalTimeSpentWaitingForLatch = 0; + jasmine.Block.call(this, env, null, spec); }; jasmine.util.inherit(jasmine.WaitsForBlock, jasmine.Block); jasmine.WaitsForBlock.TIMEOUT_INCREMENT = 10; -jasmine.WaitsForBlock.prototype.execute = function (onComplete) { - //this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen')); - var latchFunctionResult; - try { - latchFunctionResult = this.latchFunction.apply(this.spec); - } catch (e) { - this.spec.fail(e); - onComplete(); - return; - } - - if (latchFunctionResult) { - onComplete(); - } else if (this.totalTimeSpentWaitingForLatch >= this.timeout) { - var message = 'timed out after ' + this.timeout + ' msec waiting for ' + (this.message || 'something to happen'); - this.spec.fail({ - name: 'timeout', - message: message - }); - - this.abort = true; - onComplete(); - } else { - this.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT; - var self = this; - this.env.setTimeout(function () { - self.execute(onComplete); - }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT); - } -}; -// Mock setTimeout, clearTimeout -// Contributed by Pivotal Computer Systems, www.pivotalsf.com +jasmine.WaitsForBlock.prototype.execute = function(onComplete) { + if (jasmine.VERBOSE) { + this.env.reporter.log('>> Jasmine waiting for ' + (this.message || 'something to happen')); + } + var latchFunctionResult; + try { + latchFunctionResult = this.latchFunction.apply(this.spec); + } catch (e) { + this.spec.fail(e); + onComplete(); + return; + } -jasmine.FakeTimer = function () { - this.reset(); + if (latchFunctionResult) { + onComplete(); + } else if (this.totalTimeSpentWaitingForLatch >= this.timeout) { + var message = 'timed out after ' + this.timeout + ' msec waiting for ' + (this.message || 'something to happen'); + this.spec.fail({ + name: 'timeout', + message: message + }); + this.abort = true; + onComplete(); + } else { + this.totalTimeSpentWaitingForLatch += jasmine.WaitsForBlock.TIMEOUT_INCREMENT; var self = this; - self.setTimeout = function (funcToCall, millis) { - self.timeoutsMade++; - self.scheduleFunction(self.timeoutsMade, funcToCall, millis, false); - return self.timeoutsMade; - }; - - self.setInterval = function (funcToCall, millis) { - self.timeoutsMade++; - self.scheduleFunction(self.timeoutsMade, funcToCall, millis, true); - return self.timeoutsMade; - }; - - self.clearTimeout = function (timeoutKey) { - self.scheduledFunctions[timeoutKey] = jasmine.undefined; - }; - - self.clearInterval = function (timeoutKey) { - self.scheduledFunctions[timeoutKey] = jasmine.undefined; - }; - + this.env.setTimeout(function() { + self.execute(onComplete); + }, jasmine.WaitsForBlock.TIMEOUT_INCREMENT); + } }; -jasmine.FakeTimer.prototype.reset = function () { - this.timeoutsMade = 0; - this.scheduledFunctions = {}; - this.nowMillis = 0; +jasmine.version_= { + "major": 1, + "minor": 2, + "build": 0, + "revision": 1337005947 }; -jasmine.FakeTimer.prototype.tick = function (millis) { - var oldMillis = this.nowMillis; - var newMillis = oldMillis + millis; - this.runFunctionsWithinRange(oldMillis, newMillis); - this.nowMillis = newMillis; -}; - -jasmine.FakeTimer.prototype.runFunctionsWithinRange = function (oldMillis, nowMillis) { - var scheduledFunc; - var funcsToRun = []; - for (var timeoutKey in this.scheduledFunctions) { - scheduledFunc = this.scheduledFunctions[timeoutKey]; - if (scheduledFunc != jasmine.undefined && - scheduledFunc.runAtMillis >= oldMillis && - scheduledFunc.runAtMillis <= nowMillis) { - funcsToRun.push(scheduledFunc); - this.scheduledFunctions[timeoutKey] = jasmine.undefined; - } - } - - if (funcsToRun.length > 0) { - funcsToRun.sort(function (a, b) { - return a.runAtMillis - b.runAtMillis; - }); - for (var i = 0; i < funcsToRun.length; ++i) { - try { - var funcToRun = funcsToRun[i]; - this.nowMillis = funcToRun.runAtMillis; - funcToRun.funcToCall(); - if (funcToRun.recurring) { - this.scheduleFunction(funcToRun.timeoutKey, - funcToRun.funcToCall, - funcToRun.millis, - true); - } - } catch (e) { - } - } - this.runFunctionsWithinRange(oldMillis, nowMillis); - } -}; - -jasmine.FakeTimer.prototype.scheduleFunction = function (timeoutKey, funcToCall, millis, recurring) { - this.scheduledFunctions[timeoutKey] = { - runAtMillis: this.nowMillis + millis, - funcToCall: funcToCall, - recurring: recurring, - timeoutKey: timeoutKey, - millis: millis - }; -}; - -/** - * @namespace - */ -jasmine.Clock = { - defaultFakeTimer: new jasmine.FakeTimer(), - - reset: function () { - jasmine.Clock.assertInstalled(); - jasmine.Clock.defaultFakeTimer.reset(); - }, - - tick: function (millis) { - jasmine.Clock.assertInstalled(); - jasmine.Clock.defaultFakeTimer.tick(millis); - }, - - runFunctionsWithinRange: function (oldMillis, nowMillis) { - jasmine.Clock.defaultFakeTimer.runFunctionsWithinRange(oldMillis, nowMillis); - }, - - scheduleFunction: function (timeoutKey, funcToCall, millis, recurring) { - jasmine.Clock.defaultFakeTimer.scheduleFunction(timeoutKey, funcToCall, millis, recurring); - }, - - useMock: function () { - if (!jasmine.Clock.isInstalled()) { - var spec = jasmine.getEnv().currentSpec; - spec.after(jasmine.Clock.uninstallMock); - - jasmine.Clock.installMock(); - } - }, - - installMock: function () { - jasmine.Clock.installed = jasmine.Clock.defaultFakeTimer; - }, - - uninstallMock: function () { - jasmine.Clock.assertInstalled(); - jasmine.Clock.installed = jasmine.Clock.real; - }, - - real: { - setTimeout: jasmine.getGlobal().setTimeout, - clearTimeout: jasmine.getGlobal().clearTimeout, - setInterval: jasmine.getGlobal().setInterval, - clearInterval: jasmine.getGlobal().clearInterval - }, - - assertInstalled: function () { - if (!jasmine.Clock.isInstalled()) { - throw new Error("Mock clock is not installed, use jasmine.Clock.useMock()"); - } - }, - - isInstalled: function () { - return jasmine.Clock.installed == jasmine.Clock.defaultFakeTimer; - }, - - installed: null -}; -jasmine.Clock.installed = jasmine.Clock.real; - -//else for IE support -jasmine.getGlobal().setTimeout = function (funcToCall, millis) { - if (jasmine.Clock.installed.setTimeout.apply) { - return jasmine.Clock.installed.setTimeout.apply(this, arguments); - } else { - return jasmine.Clock.installed.setTimeout(funcToCall, millis); - } -}; - -jasmine.getGlobal().setInterval = function (funcToCall, millis) { - if (jasmine.Clock.installed.setInterval.apply) { - return jasmine.Clock.installed.setInterval.apply(this, arguments); - } else { - return jasmine.Clock.installed.setInterval(funcToCall, millis); - } -}; - -jasmine.getGlobal().clearTimeout = function (timeoutKey) { - if (jasmine.Clock.installed.clearTimeout.apply) { - return jasmine.Clock.installed.clearTimeout.apply(this, arguments); - } else { - return jasmine.Clock.installed.clearTimeout(timeoutKey); - } -}; - -jasmine.getGlobal().clearInterval = function (timeoutKey) { - if (jasmine.Clock.installed.clearTimeout.apply) { - return jasmine.Clock.installed.clearInterval.apply(this, arguments); - } else { - return jasmine.Clock.installed.clearInterval(timeoutKey); - } -}; - - -jasmine.version_ = { - "major": 1, - "minor": 0, - "build": 1, - "revision": 1286311016 -}; - - jasmine.kissyNext = function (failedCount) { if (!failedCount && parent != window) { if ('postMessage' in parent) { @@ -2443,4 +2536,4 @@ jasmine.kissyNext = function (failedCount) { parent.name = 'next'; } } -} \ No newline at end of file +}; diff --git a/tools/jasmine/node/reporter.js b/tools/jasmine/node/reporter.js new file mode 100644 index 0000000000..405adc9648 --- /dev/null +++ b/tools/jasmine/node/reporter.js @@ -0,0 +1,288 @@ +// +// Imports +// +var util; +try { + util = require('util') +} catch (e) { + util = require('sys') +} + +if (!jasmineNode) { + var jasmineNode = {}; +} + +// +// Helpers +// +function noop() { +} + +jasmineNode.ANSIColors = { + pass: function () { + return '\033[32m'; + }, // Green + fail: function () { + return '\033[31m'; + }, // Red + neutral: function () { + return '\033[0m'; + } // Normal +}; + +jasmineNode.NoColors = { + pass: function () { + return ''; + }, + fail: function () { + return ''; + }, + neutral: function () { + return ''; + } +}; + +jasmineNode.TerminalReporter = function (config) { + this.print_ = config.print || util.print; + this.color_ = config.color ? jasmineNode.ANSIColors : jasmineNode.NoColors; + + this.started_ = false; + this.finished_ = false; + + this.callback_ = config.onComplete || false + + this.suites_ = []; + this.specResults_ = {}; + this.failures_ = []; +} + +jasmineNode.TerminalReporter.prototype = { + reportRunnerStarting: function (runner) { + this.started_ = true; + this.startedAt = new Date(); + var suites = runner.topLevelSuites(); + for (var i = 0; i < suites.length; i++) { + var suite = suites[i]; + this.suites_.push(this.summarize_(suite)); + } + }, + + summarize_: function (suiteOrSpec) { + var isSuite = suiteOrSpec instanceof jasmine.Suite; + + // We could use a separate object for suite and spec + var summary = { + id: suiteOrSpec.id, + name: suiteOrSpec.description, + type: isSuite ? 'suite' : 'spec', + suiteNestingLevel: 0, + children: [] + }; + + if (isSuite) { + var calculateNestingLevel = function (examinedSuite) { + var nestingLevel = 0; + while (examinedSuite.parentSuite !== null) { + nestingLevel += 1; + examinedSuite = examinedSuite.parentSuite; + } + return nestingLevel; + }; + + summary.suiteNestingLevel = calculateNestingLevel(suiteOrSpec); + + var children = suiteOrSpec.children(); + for (var i = 0; i < children.length; i++) { + summary.children.push(this.summarize_(children[i])); + } + } + + return summary; + }, + + // This is heavily influenced by Jasmine's Html/Trivial Reporter + reportRunnerResults: function (runner) { + this.reportFailures_(); + + var results = runner.results(); + var resultColor = (results.failedCount > 0) ? this.color_.fail() : this.color_.pass(); + + var specs = runner.specs(); + var specCount = specs.length; + + var message = "\n\nFinished in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + " seconds"; + this.printLine_(message); + + // This is what jasmine-html.js has + //message = "" + specCount + " spec" + ( specCount === 1 ? "" : "s" ) + ", " + results.failedCount + " failure" + ((results.failedCount === 1) ? "" : "s"); + + this.printLine_(this.stringWithColor_(this.printRunnerResults_(runner), resultColor)); + + this.finished_ = true; + if (this.callback_) { + this.callback_(runner); + } + }, + + reportFailures_: function () { + if (this.failures_.length === 0) { + return; + } + + var indent = ' ', failure; + this.printLine_('\n'); + + this.print_('Failures:'); + + for (var i = 0; i < this.failures_.length; i++) { + failure = this.failures_[i]; + this.printLine_('\n'); + this.printLine_(' ' + (i + 1) + ') ' + failure.spec); + this.printLine_(' Message:'); + this.printLine_(' ' + this.stringWithColor_(failure.message, this.color_.fail())); + this.printLine_(' Stacktrace:'); + this.print_(' ' + failure.stackTrace); + } + }, + + reportSuiteResults: function (suite) { + // Not used in this context + }, + + reportSpecResults: function (spec) { + var result = spec.results(); + var msg = ''; + if (result.passed()) { + msg = this.stringWithColor_('.', this.color_.pass()); + // } else if (result.skipped) { TODO: Research why "result.skipped" returns false when "xit" is called on a spec? + // msg = (colors) ? (ansi.yellow + '*' + ansi.none) : '*'; + } else { + msg = this.stringWithColor_('F', this.color_.fail()); + this.addFailureToFailures_(spec); + } + this.spec_results += msg; + this.print_(msg); + }, + + addFailureToFailures_: function (spec) { + var result = spec.results(); + var failureItem = null; + + var items_length = result.items_.length; + for (var i = 0; i < items_length; i++) { + if (result.items_[i].passed_ === false) { + failureItem = result.items_[i]; + var failure = { + spec: spec.description, + message: failureItem.message, + stackTrace: failureItem.trace.stack + } + + this.failures_.push(failure); + } + } + }, + + printRunnerResults_: function (runner) { + var results = runner.results(); + var specs = runner.specs(); + var msg = ''; + msg += specs.length + ' test' + ((specs.length === 1) ? '' : 's') + ', '; + msg += results.totalCount + ' assertion' + ((results.totalCount === 1) ? '' : 's') + ', '; + msg += results.failedCount + ' failure' + ((results.failedCount === 1) ? '' : 's') + '\n'; + return msg; + }, + + // Helper Methods // + stringWithColor_: function (stringValue, color) { + return (color || this.color_.neutral()) + stringValue + this.color_.neutral(); + }, + + printLine_: function (stringValue) { + this.print_(stringValue); + this.print_('\n'); + } +}; + +// *************************************************************** +// TerminalVerboseReporter uses the TerminalReporter's constructor +// *************************************************************** +jasmineNode.TerminalVerboseReporter = function (config) { + jasmineNode.TerminalReporter.call(this, config); + // The extra field in this object + this.indent_ = 0; +} + + +jasmineNode.TerminalVerboseReporter.prototype = { + reportSpecResults: function (spec) { + if (spec.results().failedCount > 0) { + this.addFailureToFailures_(spec); + } + + this.specResults_[spec.id] = { + messages: spec.results().getItems(), + result: spec.results().failedCount > 0 ? 'failed' : 'passed' + }; + }, + + reportRunnerResults: function (runner) { + var messages = new Array(); + this.buildMessagesFromResults_(messages, this.suites_); + + var messages_length = messages.length; + for (var i = 0; i < messages_length - 1; i++) { + this.printLine_(messages[i]); + } + + this.print_(messages[messages_length - 1]); + + // Call the parent object's method + jasmineNode.TerminalReporter.prototype.reportRunnerResults.call(this, runner); + }, + + buildMessagesFromResults_: function (messages, results) { + var element, specResult, specIndentSpaces, msg = ''; + + var results_length = results.length; + for (var i = 0; i < results_length; i++) { + element = results[i]; + + if (element.type === 'spec') { + specResult = this.specResults_[element.id.toString()]; + + specIndentSpaces = this.indent_ + 2; + if (specResult.result === 'passed') { + msg = this.stringWithColor_(this.indentMessage_(element.name, specIndentSpaces), this.color_.pass()); + } else { + msg = this.stringWithColor_(this.indentMessage_(element.name, specIndentSpaces), this.color_.fail()); + } + + messages.push(msg); + } else { + this.indent_ = element.suiteNestingLevel * 2; + + messages.push(''); + messages.push(this.indentMessage_(element.name, this.indent_)); + } + + this.buildMessagesFromResults_(messages, element.children); + } + }, + + indentMessage_: function (message, indentCount) { + var _indent = ''; + for (var i = 0; i < indentCount; i++) { + _indent += ' '; + } + return (_indent + message); + } +}; + +// Inherit from TerminalReporter +jasmineNode.TerminalVerboseReporter.prototype.__proto__ = jasmineNode.TerminalReporter.prototype; + +// +// Exports +// +exports.jasmineNode = jasmineNode; \ No newline at end of file