Skip to content

Commit

Permalink
Added tmbundle link+archive to website
Browse files Browse the repository at this point in the history
  • Loading branch information
drnic committed Feb 24, 2008
1 parent 4cf3b6b commit d0457ed
Show file tree
Hide file tree
Showing 28 changed files with 204 additions and 141 deletions.
6 changes: 3 additions & 3 deletions lib/jstest.rb
Expand Up @@ -193,9 +193,9 @@ def fail_silently
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

Expand Down Expand Up @@ -288,7 +288,7 @@ def initialize(name=:test, port=4711)
@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
Expand Down
2 changes: 1 addition & 1 deletion script/rstakeout
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion src/ajax.js
Expand Up @@ -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
Expand Down
35 changes: 18 additions & 17 deletions src/assertions.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) {
Expand Down Expand Up @@ -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++) {
Expand All @@ -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++) {
Expand All @@ -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++) {
Expand All @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand All @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions src/common.js
@@ -1,4 +1,4 @@
var DrNicTest = {
var JsUnitTest = {
Unit: {},
inspect: function(object) {
try {
Expand Down Expand Up @@ -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 = '';
Expand Down Expand Up @@ -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) };
Expand Down
2 changes: 1 addition & 1 deletion src/jsunittest.js
Expand Up @@ -12,4 +12,4 @@ var JsUnitTest = {
<%= include 'assertions.js' %>
<%= include 'runner.js', 'test_case.js' %>

Test = DrNicTest
Test = JsUnitTest
26 changes: 13 additions & 13 deletions src/logger.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>' +
Expand All @@ -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'});
Expand All @@ -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/>");
};

8 changes: 4 additions & 4 deletions src/message_template.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('');
Expand Down
16 changes: 8 additions & 8 deletions src/prototype/event.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 {
Expand All @@ -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 {
Expand All @@ -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);
Expand All @@ -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;
};
12 changes: 6 additions & 6 deletions src/prototype/template.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] || '';
Expand All @@ -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)(#\{(.*?)\})/;

0 comments on commit d0457ed

Please sign in to comment.