tasks/tmbundle.rake website/images/logo_bundle.png website/tmbundle/JavaScript Unit Testing.tmbundle.tar.gz @@ -193,9 +193,9 @@ end class WEBrick::HTTPRequest def to_json headers = [] - each { |k, v| headers.push "#{k.DrNicTest.inspect}: #{v.DrNicTest.inspect}" } + each { |k, v| headers.push "#{k.inspect}: #{v.inspect}" } headers = "{" << headers.join(', ') << "}" - %({ "headers": #{headers}, "body": #{body.DrNicTest.inspect}, "method": #{request_method.DrNicTest.inspect} }) + %({ "headers": #{headers}, "body": #{body.inspect}, "method": #{request_method.inspect} }) end end @@ -288,7 +288,7 @@ class JavaScriptTestTask < ::Rake::TaskLib @server.mount("/response", BasicServlet) @server.mount("/slow", SlowServlet) @server.mount("/down", DownServlet) - @server.mount("/DrNicTest.inspect", InspectionServlet) + @server.mount("/inspect", InspectionServlet) yield self if block_given? define end lib/jstest.rb @@ -37,7 +37,7 @@ end # setting up growlnotify. def growl(title, msg, img, pri=0, sticky="") - system "growlnotify -n autotest --image ~/.autotest_images/#{img} -p #{pri} -m #{msg.DrNicTest.inspect} #{title} #{sticky}" + system "growlnotify -n autotest --image ~/.autotest_images/#{img} -p #{pri} -m #{msg.inspect} #{title} #{sticky}" end def self.growl_fail(output) script/rstakeout @@ -3,7 +3,7 @@ // All of which are outline in the comments, below // From John Resig's book Pro JavaScript Techniques // published by Apress, 2006-8 -DrNicTest.ajax = function( options ) { +JsUnitTest.ajax = function( options ) { // Load the options object with defaults, if no // values were provided by the user src/ajax.js @@ -1,8 +1,8 @@ -DrNicTest.Unit.Assertions = { +JsUnitTest.Unit.Assertions = { buildMessage: function(message, template) { - var args = DrNicTest.arrayfromargs(arguments).slice(2); + var args = JsUnitTest.arrayfromargs(arguments).slice(2); return (message ? message + '\n' : '') + - new DrNicTest.Unit.MessageTemplate(template).evaluate(args); + new JsUnitTest.Unit.MessageTemplate(template).evaluate(args); }, flunk: function(message) { @@ -32,8 +32,8 @@ DrNicTest.Unit.Assertions = { assertEnumEqual: function(expected, actual, message) { message = this.buildMessage(message || 'assertEnumEqual', 'expected <?>, actual: <?>', expected, actual); - var expected_array = DrNicTest.flattenArray(expected); - var actual_array = DrNicTest.flattenArray(actual); + var expected_array = JsUnitTest.flattenArray(expected); + var actual_array = JsUnitTest.flattenArray(actual); this.assertBlock(message, function() { if (expected_array.length == actual_array.length) { for (var i=0; i < expected_array.length; i++) { @@ -47,8 +47,8 @@ DrNicTest.Unit.Assertions = { assertEnumNotEqual: function(expected, actual, message) { message = this.buildMessage(message || 'assertEnumNotEqual', '<?> was the same as <?>', expected, actual); - var expected_array = DrNicTest.flattenArray(expected); - var actual_array = DrNicTest.flattenArray(actual); + var expected_array = JsUnitTest.flattenArray(expected); + var actual_array = JsUnitTest.flattenArray(actual); this.assertBlock(message, function() { if (expected_array.length == actual_array.length) { for (var i=0; i < expected_array.length; i++) { @@ -62,8 +62,8 @@ DrNicTest.Unit.Assertions = { assertHashEqual: function(expected, actual, message) { message = this.buildMessage(message || 'assertHashEqual', 'expected <?>, actual: <?>', expected, actual); - var expected_array = DrNicTest.flattenArray(DrNicTest.hashToSortedArray(expected)); - var actual_array = DrNicTest.flattenArray(DrNicTest.hashToSortedArray(actual)); + var expected_array = JsUnitTest.flattenArray(JsUnitTest.hashToSortedArray(expected)); + var actual_array = JsUnitTest.flattenArray(JsUnitTest.hashToSortedArray(actual)); var block = function() { if (expected_array.length == actual_array.length) { for (var i=0; i < expected_array.length; i++) { @@ -78,8 +78,8 @@ DrNicTest.Unit.Assertions = { assertHashNotEqual: function(expected, actual, message) { message = this.buildMessage(message || 'assertHashNotEqual', '<?> was the same as <?>', expected, actual); - var expected_array = DrNicTest.flattenArray(DrNicTest.hashToSortedArray(expected)); - var actual_array = DrNicTest.flattenArray(DrNicTest.hashToSortedArray(actual)); + var expected_array = JsUnitTest.flattenArray(JsUnitTest.hashToSortedArray(expected)); + var actual_array = JsUnitTest.flattenArray(JsUnitTest.hashToSortedArray(actual)); // from now we recursively zip & compare nested arrays var block = function() { if (expected_array.length == actual_array.length) { @@ -145,7 +145,7 @@ DrNicTest.Unit.Assertions = { assertHidden: function(element, message) { message = this.buildMessage(message || 'assertHidden', '? isn\'t hidden.', element); - this.assertBlock(message, function() { return element.style.display == 'none' }); + this.assertBlock(message, function() { return !element.style.display || element.style.display == 'none' }); }, assertInstanceOf: function(expected, actual, message) { @@ -188,10 +188,11 @@ DrNicTest.Unit.Assertions = { }, _isVisible: function(element) { - element = DrNicTest.$(element); + element = JsUnitTest.$(element); if(!element.parentNode) return true; this.assertNotNull(element); - if(element.style && element.style.display == 'none') + // if(element.style && (!element.style.display || element.style.display == 'none')) + if(element.style && (element.style.display == 'none')) return false; return arguments.callee.call(this, element.parentNode); @@ -208,7 +209,7 @@ DrNicTest.Unit.Assertions = { }, assertElementsMatch: function() { - var pass = true, expressions = DrNicTest.arrayfromargs(arguments); + var pass = true, expressions = JsUnitTest.arrayfromargs(arguments); var elements = expressions.shift(); if (elements.length != expressions.length) { message = this.buildMessage('assertElementsMatch', 'size mismatch: ? elements, ? expressions (?).', elements.length, expressions.length, expressions); @@ -217,8 +218,8 @@ DrNicTest.Unit.Assertions = { } for (var i=0; i < expressions.length; i++) { var expression = expressions[i]; - var element = DrNicTest.$(elements[i]); - if (DrNicTest.selectorMatch(expression, element)) { + var element = JsUnitTest.$(elements[i]); + if (JsUnitTest.selectorMatch(expression, element)) { pass = true; break; } src/assertions.js @@ -1,4 +1,4 @@ -var DrNicTest = { +var JsUnitTest = { Unit: {}, inspect: function(object) { try { @@ -36,7 +36,7 @@ var DrNicTest = { while (source.length > 0) { if (match = source.match(pattern)) { result += source.slice(0, match.index); - result += DrNicTest.String.interpret(replacement(match)); + result += JsUnitTest.String.interpret(replacement(match)); source = source.slice(match.index + match[0].length); } else { result += source, source = ''; @@ -184,7 +184,7 @@ var DrNicTest = { } }; -DrNicTest.gsub.prepareReplacement = function(replacement) { +JsUnitTest.gsub.prepareReplacement = function(replacement) { if (typeof replacement == "function") return replacement; var template = new Template(replacement); return function(match) { return template.evaluate(match) }; src/common.js @@ -12,4 +12,4 @@ var JsUnitTest = { <%= include 'assertions.js' %> <%= include 'runner.js', 'test_case.js' %> -Test = DrNicTest \ No newline at end of file +Test = JsUnitTest \ No newline at end of file src/jsunittest.js @@ -1,51 +1,51 @@ -DrNicTest.Unit.Logger = function(element) { - this.element = DrNicTest.$(element); +JsUnitTest.Unit.Logger = function(element) { + this.element = JsUnitTest.$(element); if (this.element) this._createLogTable(); }; -DrNicTest.Unit.Logger.prototype.start = function(testName) { +JsUnitTest.Unit.Logger.prototype.start = function(testName) { if (!this.element) return; var tbody = this.element.getElementsByTagName('tbody')[0]; tbody.innerHTML = tbody.innerHTML + '<tr><td>' + testName + '</td><td></td><td></td></tr>'; }; -DrNicTest.Unit.Logger.prototype.setStatus = function(status) { +JsUnitTest.Unit.Logger.prototype.setStatus = function(status) { var logline = this.getLastLogLine(); logline.className = status; var statusCell = logline.getElementsByTagName('td')[1]; statusCell.innerHTML = status; }; -DrNicTest.Unit.Logger.prototype.finish = function(status, summary) { +JsUnitTest.Unit.Logger.prototype.finish = function(status, summary) { if (!this.element) return; this.setStatus(status); this.message(summary); }; -DrNicTest.Unit.Logger.prototype.message = function(message) { +JsUnitTest.Unit.Logger.prototype.message = function(message) { if (!this.element) return; var cell = this.getMessageCell(); cell.innerHTML = this._toHTML(message); }; -DrNicTest.Unit.Logger.prototype.summary = function(summary) { +JsUnitTest.Unit.Logger.prototype.summary = function(summary) { if (!this.element) return; var div = this.element.getElementsByTagName('div')[0]; div.innerHTML = this._toHTML(summary); }; -DrNicTest.Unit.Logger.prototype.getLastLogLine = function() { +JsUnitTest.Unit.Logger.prototype.getLastLogLine = function() { var tbody = this.element.getElementsByTagName('tbody')[0]; var loglines = tbody.getElementsByTagName('tr'); return loglines[loglines.length - 1]; }; -DrNicTest.Unit.Logger.prototype.getMessageCell = function() { +JsUnitTest.Unit.Logger.prototype.getMessageCell = function() { var logline = this.getLastLogLine(); return logline.getElementsByTagName('td')[2]; }; -DrNicTest.Unit.Logger.prototype._createLogTable = function() { +JsUnitTest.Unit.Logger.prototype._createLogTable = function() { var html = '<div class="logsummary">running...</div>' + '<table class="logtable">' + '<thead><tr><th>Status</th><th>Test</th><th>Message</th></tr></thead>' + @@ -54,7 +54,7 @@ DrNicTest.Unit.Logger.prototype._createLogTable = function() { this.element.innerHTML = html; }; -DrNicTest.Unit.Logger.prototype.appendActionButtons = function(actions) { +JsUnitTest.Unit.Logger.prototype.appendActionButtons = function(actions) { // actions = $H(actions); // if (!actions.any()) return; // var div = new Element("div", {className: 'action_buttons'}); @@ -66,7 +66,7 @@ DrNicTest.Unit.Logger.prototype.appendActionButtons = function(actions) { // this.getMessageCell().insert(div); }; -DrNicTest.Unit.Logger.prototype._toHTML = function(txt) { - return DrNicTest.escapeHTML(txt).replace(/\n/g,"<br/>"); +JsUnitTest.Unit.Logger.prototype._toHTML = function(txt) { + return JsUnitTest.escapeHTML(txt).replace(/\n/g,"<br/>"); }; src/logger.js @@ -1,16 +1,16 @@ -DrNicTest.Unit.MessageTemplate = function(string) { +JsUnitTest.Unit.MessageTemplate = function(string) { var parts = []; - var str = DrNicTest.scan((string || ''), /(?=[^\\])\?|(?:\\\?|[^\?])+/, function(part) { + var str = JsUnitTest.scan((string || ''), /(?=[^\\])\?|(?:\\\?|[^\?])+/, function(part) { parts.push(part[0]); }); this.parts = parts; }; -DrNicTest.Unit.MessageTemplate.prototype.evaluate = function(params) { +JsUnitTest.Unit.MessageTemplate.prototype.evaluate = function(params) { var results = []; for (var i=0; i < this.parts.length; i++) { var part = this.parts[i]; - var result = (part == '?') ? DrNicTest.inspect(params.shift()) : part.replace(/\\\?/, '?'); + var result = (part == '?') ? JsUnitTest.inspect(params.shift()) : part.replace(/\\\?/, '?'); results.push(result); }; return results.join(''); src/message_template.js @@ -1,11 +1,11 @@ -DrNicTest.Event = {}; +JsUnitTest.Event = {}; // written by Dean Edwards, 2005 // with input from Tino Zijdel, Matthias Miller, Diego Perini // namespaced by Dr Nic Williams 2008 // http://dean.edwards.name/weblog/2005/10/add-event/ // http://dean.edwards.name/weblog/2005/10/add-event2/ -DrNicTest.Event.addEvent = function(element, type, handler) { +JsUnitTest.Event.addEvent = function(element, type, handler) { if (element.addEventListener) { element.addEventListener(type, handler, false); } else { @@ -29,9 +29,9 @@ DrNicTest.Event.addEvent = function(element, type, handler) { } }; // a counter used to create unique IDs -DrNicTest.Event.addEvent.guid = 1; +JsUnitTest.Event.addEvent.guid = 1; -DrNicTest.Event.removeEvent = function(element, type, handler) { +JsUnitTest.Event.removeEvent = function(element, type, handler) { if (element.removeEventListener) { element.removeEventListener(type, handler, false); } else { @@ -42,7 +42,7 @@ DrNicTest.Event.removeEvent = function(element, type, handler) { } }; -DrNicTest.Event.handleEvent = function(event) { +JsUnitTest.Event.handleEvent = function(event) { var returnValue = true; // grab the event object (IE uses a global event object) event = event || fixEvent(((this.ownerDocument || this.document || this).parentWindow || window).event); @@ -58,15 +58,15 @@ DrNicTest.Event.handleEvent = function(event) { return returnValue; }; -DrNicTest.Event.fixEvent = function(event) { +JsUnitTest.Event.fixEvent = function(event) { // add W3C standard event methods event.preventDefault = fixEvent.preventDefault; event.stopPropagation = fixEvent.stopPropagation; return event; }; -DrNicTest.Event.fixEvent.preventDefault = function() { +JsUnitTest.Event.fixEvent.preventDefault = function() { this.returnValue = false; }; -DrNicTest.Event.fixEvent.stopPropagation = function() { +JsUnitTest.Event.fixEvent.stopPropagation = function() { this.cancelBubble = true; }; src/prototype/event.js @@ -1,13 +1,13 @@ -DrNicTest.Template = function(template, pattern) { +JsUnitTest.Template = function(template, pattern) { this.template = template; //template.toString(); - this.pattern = pattern || DrNicTest.Template.Pattern; + this.pattern = pattern || JsUnitTest.Template.Pattern; }; -DrNicTest.Template.prototype.evaluate = function(object) { +JsUnitTest.Template.prototype.evaluate = function(object) { if (typeof object.toTemplateReplacements == "function") object = object.toTemplateReplacements(); - return DrNicTest.gsub(this.template, this.pattern, function(match) { + return JsUnitTest.gsub(this.template, this.pattern, function(match) { if (object == null) return ''; var before = match[1] || ''; @@ -26,8 +26,8 @@ DrNicTest.Template.prototype.evaluate = function(object) { match = pattern.exec(expr); } - return before + DrNicTest.String.interpret(ctx); + return before + JsUnitTest.String.interpret(ctx); }); } -DrNicTest.Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/; +JsUnitTest.Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/; src/prototype/template.js @@ -1,25 +1,25 @@ -DrNicTest.Unit.Runner = function(testcases) { +JsUnitTest.Unit.Runner = function(testcases) { var argumentOptions = arguments[1] || {}; var options = this.options = {}; options.testLog = ('testLog' in argumentOptions) ? argumentOptions.testLog : 'testlog'; options.resultsURL = this.queryParams.resultsURL; - options.testLog = DrNicTest.$(options.testLog); + options.testLog = JsUnitTest.$(options.testLog); this.tests = this.getTests(testcases); this.currentTest = 0; - this.logger = new DrNicTest.Unit.Logger(options.testLog); + this.logger = new JsUnitTest.Unit.Logger(options.testLog); var self = this; - DrNicTest.Event.addEvent(window, "load", function() { + JsUnitTest.Event.addEvent(window, "load", function() { setTimeout(function() { self.runTests(); }, 0.1); }); }; -DrNicTest.Unit.Runner.prototype.queryParams = DrNicTest.toQueryParams(); +JsUnitTest.Unit.Runner.prototype.queryParams = JsUnitTest.toQueryParams(); -DrNicTest.Unit.Runner.prototype.portNumber = function() { +JsUnitTest.Unit.Runner.prototype.portNumber = function() { if (window.location.search.length > 0) { var matches = window.location.search.match(/\:(\d{3,5})\//); if (matches) { @@ -29,7 +29,7 @@ DrNicTest.Unit.Runner.prototype.portNumber = function() { return null; }; -DrNicTest.Unit.Runner.prototype.getTests = function(testcases) { +JsUnitTest.Unit.Runner.prototype.getTests = function(testcases) { var tests = [], options = this.options; if (this.queryParams.tests) tests = this.queryParams.tests.split(','); else if (options.tests) tests = options.tests; @@ -44,13 +44,13 @@ DrNicTest.Unit.Runner.prototype.getTests = function(testcases) { var test = tests[i]; if (testcases[test]) results.push( - new DrNicTest.Unit.Testcase(test, testcases[test], testcases.setup, testcases.teardown) + new JsUnitTest.Unit.Testcase(test, testcases[test], testcases.setup, testcases.teardown) ); }; return results; }; -DrNicTest.Unit.Runner.prototype.getResult = function() { +JsUnitTest.Unit.Runner.prototype.getResult = function() { var results = { tests: this.tests.length, assertions: 0, @@ -67,7 +67,7 @@ DrNicTest.Unit.Runner.prototype.getResult = function() { return results; }; -DrNicTest.Unit.Runner.prototype.postResults = function() { +JsUnitTest.Unit.Runner.prototype.postResults = function() { if (this.options.resultsURL) { // new Ajax.Request(this.options.resultsURL, // { method: 'get', parameters: this.getResult(), asynchronous: false }); @@ -76,14 +76,14 @@ DrNicTest.Unit.Runner.prototype.postResults = function() { url += "assertions="+ results.assertions + "&"; url += "failures=" + results.failures + "&"; url += "errors=" + results.errors; - DrNicTest.ajax({ + JsUnitTest.ajax({ url: url, type: 'GET' }) } }; -DrNicTest.Unit.Runner.prototype.runTests = function() { +JsUnitTest.Unit.Runner.prototype.runTests = function() { var test = this.tests[this.currentTest], actions; if (!test) return this.finish(); @@ -106,11 +106,11 @@ DrNicTest.Unit.Runner.prototype.runTests = function() { this.runTests(); }; -DrNicTest.Unit.Runner.prototype.finish = function() { +JsUnitTest.Unit.Runner.prototype.finish = function() { this.postResults(); this.logger.summary(this.summary()); }; -DrNicTest.Unit.Runner.prototype.summary = function() { - return new DrNicTest.Template('#{tests} tests, #{assertions} assertions, #{failures} failures, #{errors} errors').evaluate(this.getResult()); +JsUnitTest.Unit.Runner.prototype.summary = function() { + return new JsUnitTest.Template('#{tests} tests, #{assertions} assertions, #{failures} failures, #{errors} errors').evaluate(this.getResult()); }; src/runner.js @@ -1,4 +1,4 @@ -DrNicTest.Unit.Testcase = function(name, test, setup, teardown) { +JsUnitTest.Unit.Testcase = function(name, test, setup, teardown) { this.name = name; this.test = test || function() {}; this.setup = setup || function() {}; @@ -6,27 +6,27 @@ DrNicTest.Unit.Testcase = function(name, test, setup, teardown) { this.messages = []; this.actions = {}; }; -// import DrNicTest.Unit.Assertions +// import JsUnitTest.Unit.Assertions -for (method in DrNicTest.Unit.Assertions) { - DrNicTest.Unit.Testcase.prototype[method] = DrNicTest.Unit.Assertions[method]; +for (method in JsUnitTest.Unit.Assertions) { + JsUnitTest.Unit.Testcase.prototype[method] = JsUnitTest.Unit.Assertions[method]; } -DrNicTest.Unit.Testcase.prototype.isWaiting = false; -DrNicTest.Unit.Testcase.prototype.timeToWait = 1000; -DrNicTest.Unit.Testcase.prototype.assertions = 0; -DrNicTest.Unit.Testcase.prototype.failures = 0; -DrNicTest.Unit.Testcase.prototype.errors = 0; -// DrNicTest.Unit.Testcase.prototype.isRunningFromRake = window.location.port == 4711; -DrNicTest.Unit.Testcase.prototype.isRunningFromRake = window.location.port; +JsUnitTest.Unit.Testcase.prototype.isWaiting = false; +JsUnitTest.Unit.Testcase.prototype.timeToWait = 1000; +JsUnitTest.Unit.Testcase.prototype.assertions = 0; +JsUnitTest.Unit.Testcase.prototype.failures = 0; +JsUnitTest.Unit.Testcase.prototype.errors = 0; +// JsUnitTest.Unit.Testcase.prototype.isRunningFromRake = window.location.port == 4711; +JsUnitTest.Unit.Testcase.prototype.isRunningFromRake = window.location.port; -DrNicTest.Unit.Testcase.prototype.wait = function(time, nextPart) { +JsUnitTest.Unit.Testcase.prototype.wait = function(time, nextPart) { this.isWaiting = true; this.test = nextPart; this.timeToWait = time; }; -DrNicTest.Unit.Testcase.prototype.run = function(rethrow) { +JsUnitTest.Unit.Testcase.prototype.run = function(rethrow) { try { try { if (!this.isWaiting) this.setup(); @@ -44,17 +44,17 @@ DrNicTest.Unit.Testcase.prototype.run = function(rethrow) { } }; -DrNicTest.Unit.Testcase.prototype.summary = function() { +JsUnitTest.Unit.Testcase.prototype.summary = function() { var msg = '#{assertions} assertions, #{failures} failures, #{errors} errors\n'; - return new DrNicTest.Template(msg).evaluate(this) + + return new JsUnitTest.Template(msg).evaluate(this) + this.messages.join("\n"); }; -DrNicTest.Unit.Testcase.prototype.pass = function() { +JsUnitTest.Unit.Testcase.prototype.pass = function() { this.assertions++; }; -DrNicTest.Unit.Testcase.prototype.fail = function(message) { +JsUnitTest.Unit.Testcase.prototype.fail = function(message) { this.failures++; var line = ""; try { @@ -65,23 +65,23 @@ DrNicTest.Unit.Testcase.prototype.fail = function(message) { this.messages.push("Failure: " + message + (line ? " Line #" + line : "")); }; -DrNicTest.Unit.Testcase.prototype.info = function(message) { +JsUnitTest.Unit.Testcase.prototype.info = function(message) { this.messages.push("Info: " + message); }; -DrNicTest.Unit.Testcase.prototype.error = function(error, test) { +JsUnitTest.Unit.Testcase.prototype.error = function(error, test) { this.errors++; this.actions['retry with throw'] = function() { test.run(true) }; - this.messages.push(error.name + ": "+ error.message + "(" + DrNicTest.inspect(error) + ")"); + this.messages.push(error.name + ": "+ error.message + "(" + JsUnitTest.inspect(error) + ")"); }; -DrNicTest.Unit.Testcase.prototype.status = function() { +JsUnitTest.Unit.Testcase.prototype.status = function() { if (this.failures > 0) return 'failed'; if (this.errors > 0) return 'error'; return 'passed'; }; -DrNicTest.Unit.Testcase.prototype.benchmark = function(operation, iterations) { +JsUnitTest.Unit.Testcase.prototype.benchmark = function(operation, iterations) { var startAt = new Date(); (iterations || 1).times(operation); var timeTaken = ((new Date())-startAt); src/test_case.js @@ -9,8 +9,8 @@ task :release => [:clean, :dist, :package] do |t| pkg = "pkg/#{name}-#{version}" if $DEBUG then - puts "release_id = rf.add_release #{rubyforge_name.DrNicTest.inspect}, #{name.DrNicTest.inspect}, #{version.DrNicTest.inspect}, \"#{pkg}.tgz\"" - puts "rf.add_file #{rubyforge_name.DrNicTest.inspect}, #{name.DrNicTest.inspect}, release_id, \"#{pkg}.gem\"" + puts "release_id = rf.add_release #{rubyforge_name.inspect}, #{name.inspect}, #{version.inspect}, \"#{pkg}.tgz\"" + puts "rf.add_file #{rubyforge_name.inspect}, #{name.inspect}, release_id, \"#{pkg}.gem\"" end rf = RubyForge.new tasks/deploy.rake @@ -16,8 +16,10 @@ EOS @website_config end -desc 'Generate website files' -task :website_generate => [:ruby_env, :dist, :website_package] do +desc 'Generate website files + associated packages + bundles' +task :website_build => [:ruby_env, :dist, :website_package, "bundle:import", :website_generate] + +task :website_generate => :ruby_env do (Dir['website/**/*.txt'] - Dir['website/version*.txt']).each do |txt| sh %{ #{RUBY_APP} script/txt2html #{txt} > #{txt.gsub(/txt$/,'html')} } end @@ -48,4 +50,4 @@ task :website_upload do end desc 'Generate and upload website files' -task :website => [:website_generate, :website_upload] +task :website => [:website_build, :website_upload] tasks/website.rake @@ -45,7 +45,7 @@ Event.simulateMouse = function(element, eventName) { document.body.appendChild(this.mark); if(this.step) - alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.DrNicTest.inspect(options)); + alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options)); $(element).dispatchEvent(oEvent); }; @@ -78,7 +78,7 @@ Event.simulateKeys = function(element, command) { var Test = { Unit: { - DrNicTest.inspect: Object.DrNicTest.inspect // security exception workaround + inspect: Object.inspect // security exception workaround } }; @@ -244,7 +244,7 @@ Test.Unit.MessageTemplate = Class.create({ evaluate: function(params) { return this.parts.map(function(part) { - return part == '?' ? Test.Unit.DrNicTest.inspect(params.shift()) : part.replace(/\\\?/, '?'); + return part == '?' ? Test.Unit.inspect(params.shift()) : part.replace(/\\\?/, '?'); }).join(''); } }); @@ -535,7 +535,7 @@ Test.Unit.Testcase = Class.create(Test.Unit.Assertions, { error: function(error, test) { this.errors++; this.actions['retry with throw'] = function() { test.run(true) }; - this.messages.push(error.name + ": "+ error.message + "(" + Test.Unit.DrNicTest.inspect(error) + ")"); + this.messages.push(error.name + ": "+ error.message + "(" + Test.Unit.inspect(error) + ")"); }, status: function() { test/assets/unittest.js @@ -53,11 +53,11 @@ } } - new DrNicTest.Unit.Runner({ + new JsUnitTest.Unit.Runner({ setup: function() { - this.testcss1 = DrNicTest.$('testcss1'); - this.testcss1_span = DrNicTest.$('testcss1_span'); - this.tlist = DrNicTest.$('tlist'); + this.testcss1 = JsUnitTest.$('testcss1'); + this.testcss1_span = JsUnitTest.$('testcss1_span'); + this.tlist = JsUnitTest.$('tlist'); }, testIsRunningFromRake: function() { with(this) { @@ -193,7 +193,7 @@ }); - new DrNicTest.Unit.Runner({ + new JsUnitTest.Unit.Runner({ testDummy: function() { with(this) { assert(true); }}, test/functional/jsunittest_test.html @@ -7,7 +7,7 @@ <script src="../assets/jsunittest.js" type="text/javascript"></script> <script src="../../src/assertions.js" type="text/javascript"></script> <script type="text/javascript" charset="utf-8"> - var Test = DrNicTest; + var Test = JsUnitTest; </script> <link rel="stylesheet" href="../assets/unittest.css" type="text/css" /> test/unit/assertions_test.html @@ -6,7 +6,7 @@ <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <script src="../assets/jsunittest.js" type="text/javascript"></script> <script type="text/javascript" charset="utf-8"> - var Test = DrNicTest; + var Test = JsUnitTest; </script> <link rel="stylesheet" href="../assets/unittest.css" type="text/css" /> </head> @@ -34,17 +34,17 @@ new Test.Unit.Runner({ testScan: function() {with(this) { var source = 'foo boo boz', results = []; - var str = DrNicTest.scan(source, /[o]+/, function(match) { + var str = JsUnitTest.scan(source, /[o]+/, function(match) { results.push(match[0].length); }); assertEnumEqual([2, 2, 1], results); - assertEqual(source, DrNicTest.scan(source, /x/, fail)); + assertEqual(source, JsUnitTest.scan(source, /x/, fail)); assert(typeof str == 'string'); }}, // hash to sorted array testHashToSortedArray: function() { with(this) { var expected = [ ['a', 1], ['b', 2], ['zzz', 0]]; - var actual = DrNicTest.hashToSortedArray({zzz:0, b:2, a:1}); + var actual = JsUnitTest.hashToSortedArray({zzz:0, b:2, a:1}); assertEnumEqual(expected, actual); }}, @@ -52,7 +52,7 @@ testFlatten: function() { with(this) { var original = [ ['a', 1], ['b', 2], ['zzz', [1,2,3]]]; var expected = [ 'a', 1, 'b', 2, 'zzz', 1, 2, 3]; - var actual = DrNicTest.flattenArray(original); + var actual = JsUnitTest.flattenArray(original); assertEnumEqual(expected, actual); }}, test/unit/common_test.html @@ -6,7 +6,7 @@ <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <script src="../assets/jsunittest.js" type="text/javascript"></script> <script type="text/javascript" charset="utf-8"> - var Test = DrNicTest; + var Test = JsUnitTest; </script> <script src="../../src/logger.js" type="text/javascript"></script> @@ -38,8 +38,8 @@ new Test.Unit.Runner({ // replace this with your real tests setup: function() { - this.logger = new DrNicTest.Unit.Logger('testlog_test'); - this.testlog_test = DrNicTest.$('testlog_test'); + this.logger = new JsUnitTest.Unit.Logger('testlog_test'); + this.testlog_test = JsUnitTest.$('testlog_test'); this.tbody = this.testlog_test.getElementsByTagName('tbody')[0]; }, test/unit/logger_test.html @@ -6,7 +6,7 @@ <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <script src="../assets/jsunittest.js" type="text/javascript"></script> <script type="text/javascript" charset="utf-8"> - var Test = DrNicTest; + var Test = JsUnitTest; </script> <script src="../../src/message_template.js" type="text/javascript"></script> test/unit/message_template_test.html @@ -6,7 +6,7 @@ <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <script src="../assets/jsunittest.js" type="text/javascript"></script> <script type="text/javascript" charset="utf-8"> - var Test = DrNicTest; + var Test = JsUnitTest; </script> <script src="../../src/prototype/template.js" type="text/javascript" charset="utf-8"></script> <script src="../../src/prototype/event.js" type="text/javascript" charset="utf-8"></script> @@ -38,18 +38,18 @@ new Test.Unit.Runner({ // replace this with your real tests setup: function() { - DrNicTest.Unit.Testcase = function() {}; - DrNicTest.Unit.Testcase.prototype.run = function() {}; - DrNicTest.Unit.Testcase.prototype.status = function() { return "passed" }; - DrNicTest.Unit.Testcase.prototype.summary = function() { return "summary" }; - DrNicTest.Unit.Testcase.prototype.assertions = 1; - DrNicTest.Unit.Testcase.prototype.failures = 0; - DrNicTest.Unit.Testcase.prototype.errors = 0; - DrNicTest.Unit.Logger = function() {}; - DrNicTest.Unit.Logger.prototype.start = function() {}; - DrNicTest.Unit.Logger.prototype.finish = function() {}; - DrNicTest.Unit.Logger.prototype.summary = function() {}; - this.runner = new DrNicTest.Unit.Runner({ + JsUnitTest.Unit.Testcase = function() {}; + JsUnitTest.Unit.Testcase.prototype.run = function() {}; + JsUnitTest.Unit.Testcase.prototype.status = function() { return "passed" }; + JsUnitTest.Unit.Testcase.prototype.summary = function() { return "summary" }; + JsUnitTest.Unit.Testcase.prototype.assertions = 1; + JsUnitTest.Unit.Testcase.prototype.failures = 0; + JsUnitTest.Unit.Testcase.prototype.errors = 0; + JsUnitTest.Unit.Logger = function() {}; + JsUnitTest.Unit.Logger.prototype.start = function() {}; + JsUnitTest.Unit.Logger.prototype.finish = function() {}; + JsUnitTest.Unit.Logger.prototype.summary = function() {}; + this.runner = new JsUnitTest.Unit.Runner({ testDoNothing : function() {}, testDoNothing2 : function() {} }); test/unit/runner_test.html @@ -6,7 +6,7 @@ <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <script src="../assets/jsunittest.js" type="text/javascript"></script> <script type="text/javascript" charset="utf-8"> - var Test = DrNicTest; + var Test = JsUnitTest; </script> <script src="../../src/prototype/template.js" type="text/javascript"></script> @@ -36,20 +36,20 @@ new Test.Unit.Runner({ // Library testLibrary: function() { with(this) { - assert(DrNicTest.Template); - assert(new DrNicTest.Template("")); + assert(JsUnitTest.Template); + assert(new JsUnitTest.Template("")); }}, // Empty string testEmptyString: function() { with(this) { - assertEqual('', new DrNicTest.Template("").evaluate("asd")); + assertEqual('', new JsUnitTest.Template("").evaluate("asd")); }}, testInterpolate: function() {with(this) { var subject = { name: 'Stephan' }; var pattern = /(^|.|\r|\n)(#\((.*?)\))/; - assertEqual('#{name}: Stephan', new DrNicTest.Template('\\#{name}: #{name}').evaluate(subject)); - assertEqual('#(name): Stephan', new DrNicTest.Template('\\#(name): #(name)', pattern).evaluate(subject)); + assertEqual('#{name}: Stephan', new JsUnitTest.Template('\\#{name}: #{name}').evaluate(subject)); + assertEqual('#(name): Stephan', new JsUnitTest.Template('\\#(name): #(name)', pattern).evaluate(subject)); }}, test/unit/template_test.html @@ -6,7 +6,7 @@ <meta http-equiv="content-type" content="text/html; charset=utf-8" /> <script src="../assets/jsunittest.js" type="text/javascript"></script> <script type="text/javascript" charset="utf-8"> - var Test = DrNicTest; + var Test = JsUnitTest; </script> <script src="../../src/assertions.js" type="text/javascript" charset="utf-8"></script> <script src="../../src/test_case.js" type="text/javascript"></script> @@ -37,7 +37,7 @@ new Test.Unit.Runner({ // replace this with your real tests setup: function() { - this.testcase = new DrNicTest.Unit.Testcase("name"); + this.testcase = new JsUnitTest.Unit.Testcase("name"); }, // Initial test/unit/test_case_test.html @@ -42,6 +42,12 @@ <p>This is based off unittest.js from <a href="http://prototypejs.org">prototypejs</a>, except this library has no dependency on prototype.js so there is no chance your code-under-test can conflict with prototype.js or that you might accidently use a prototype.js helper for a library that will be deployed independently off prototypejs.</p> + <p>There is also a TextMate bundle with snippets for creating the runner and assertions.</p> + + + <p><a href="tmbundle/JavaScript Unit Testing.tmbundle.tar.gz"><img src="images/logo_bundle.png" width="50" height="51" alt="Logo Bundle" border=0></a> &#8211; click to download. More information below.</p> + + <h2>Downloading</h2> @@ -80,11 +86,27 @@ example_test.html <p><img src="images/passing_prototypejs_unittest_tests.jpg" width="709" height="573" alt="Passing Prototypejs Unittest Tests"></p> + <h2>TextMate bundle</h2> + + + <p><a href="tmbundle/JavaScript Unit Testing.tmbundle.tar.gz"><img src="images/logo_bundle.png" width="50" height="51" alt="Logo Bundle" border=0></a> &#8211; click to download</p> + + + <ul> + <li>Mac <span class="caps">OSX</span>: Download, unarchive and open with Finder to install into TextMate</li> + <li>Windows (E Text Editor): Don&#8217;t know. Can someone let me know what the installation instructions are for new/update bundles?</li> + </ul> + + + <p>The source for the bundle is available via git: <a href="http://github.com/drnic/javascript-unittest-tmbundle/tree/master">http://github.com/drnic/javascript-unittest-tmbundle/tree/master</a></p> + + <h2>How to do JavaScript unit testing</h2> <ul> - <li><a href="http://newjs.rubyforge.org">newjs</a> &#8211; started new JavaScript projects with in-built test suite</li> + <li><a href="http://peepcode.com">PeepCode: JavaScript Unit Testing</a> &#8211; coming soon from Dr Nic</li> + <li><a href="http://newjs.rubyforge.org">newjs</a> &#8211; started new JavaScript projects with in-built test suite</li> <li><a href="http://drnicwilliams.com/2008/01/04/autotesting-javascript-in-rails/">Autotest for Javascript</a> &#8211; ideas on a script/js_autotest script (built-in to newjs)</li> </ul> @@ -125,7 +147,7 @@ example_test.html <p>Comments are welcome. Send an email to <a href="mailto:drnicwilliams@gmail.com">Dr Nic Williams</a> via the <a href="http://groups.google.com/group/drnic-javascript-projects">forum</a></p> <p class="coda"> - <a href="drnicwilliams@gmail.com">Dr Nic Williams</a>, 20th February 2008<br> + <a href="drnicwilliams@gmail.com">Dr Nic Williams</a>, 21st February 2008<br> Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a> </p> </div> website/index.html @@ -6,6 +6,10 @@ This JavaScript project provides a one-file JavaScript test suite. This is based off unittest.js from "prototypejs":http://prototypejs.org, except this library has no dependency on prototype.js so there is no chance your code-under-test can conflict with prototype.js or that you might accidently use a prototype.js helper for a library that will be deployed independently off prototypejs. +There is also a TextMate bundle with snippets for creating the runner and assertions. + +<a href="tmbundle/JavaScript Unit Testing.tmbundle.tar.gz"><img src="images/logo_bundle.png" width="50" height="51" alt="Logo Bundle" border=0></a> - click to download. More information below. + h2. Downloading Get the latest here: <a href="dist/jsunittest.js">jsunittest.js</a> @@ -33,8 +37,18 @@ h2. Same API as unittest.js <img src="images/passing_prototypejs_unittest_tests.jpg" width="709" height="573" alt="Passing Prototypejs Unittest Tests"> +h2. TextMate bundle + +<a href="tmbundle/JavaScript Unit Testing.tmbundle.tar.gz"><img src="images/logo_bundle.png" width="50" height="51" alt="Logo Bundle" border=0></a> - click to download + +* Mac OSX: Download, unarchive and open with Finder to install into TextMate +* Windows (E Text Editor): Don't know. Can someone let me know what the installation instructions are for new/update bundles? + +The source for the bundle is available via git: <a href="http://github.com/drnic/javascript-unittest-tmbundle/tree/master">http://github.com/drnic/javascript-unittest-tmbundle/tree/master</a> + h2. How to do JavaScript unit testing +* "PeepCode: JavaScript Unit Testing":http://peepcode.com - coming soon from Dr Nic * "newjs":http://newjs.rubyforge.org - started new JavaScript projects with in-built test suite * "Autotest for Javascript":http://drnicwilliams.com/2008/01/04/autotesting-javascript-in-rails/ - ideas on a script/js_autotest script (built-in to newjs) website/index.txt 4cf3b6bce9016471fec3aab43d7815a9bd4d751d Dr Nic drnicwilliams@gmail.com http://github.com/drnic/jsunittest/commit/d0457eda676ba6ddf821bd583120a54522465da0 d0457eda676ba6ddf821bd583120a54522465da0 2008-02-23T17:39:47-08:00 2008-02-23T17:39:47-08:00 Added tmbundle link+archive to website 5e0bd7cf47347a1dacea0a1bc496668a436b3a4d Dr Nic drnicwilliams@gmail.com