@@ -156,6 +156,7 @@ print = function(txt) { Ruby.puts(txt); }; return makeNode( this._dom.createElement(name.toLowerCase()) ); }, getElementsByTagName: function(name){ + Ruby.puts(this._dom); return new DOMNodeList( this._dom.getElementsByTagName( name.toLowerCase()) ); }, js/johnson/browser/env.js @@ -2,7 +2,7 @@ console = { indentation: 0, indent: function() { for(i=0;i<this.indentation - 1;i++) Ruby.print(" "); - if(this.indentation > 0) Ruby.print("- ") + if(this.indentation > 0) Ruby.print("- "); }, group: function(msg) { this.info(msg); @@ -174,4 +174,19 @@ jspec.matchers["be_instanceof"] = { "to be an instance of " + jspec.print_object(target) + ", but was " + jspec.print_object(target.constructor); } +} + +jspec.matchers["have_constructor"] = { + describe: function(self, target, not) { + return jspec.print_object(self) + " should " + (not ? "not " : "") + + "have " + jspec.print_object(target) + " as its constructor"; + }, + matches: function(self, target) { + return self instanceof target; + }, + failure_message: function(self, target, not) { + return "Expected " + jspec.print_object(self) + (not ? "not " : "") + + "to have " + jspec.print_object(target) + ", as its constructor but was " + + jspec.print_object(target.constructor); + } } \ No newline at end of file test/jspec/jspec.js @@ -7,7 +7,12 @@ jspec.describe("awesomeness", function() { window.location = fileLocation; Johnson.waitForThreads(); expect(window.location).to("==", uriLocation); - expect(document).to("be_instanceof", DOMDocument); - expect(document.childNodes).to("be_instanceof", Array); + expect(document).to("have_constructor", DOMDocument); + document.body; + document.body; + document.body; + // expect(document.body).to("have_constructor", DOMNode); }); -}); \ No newline at end of file +}); + +; \ No newline at end of file test/jspec/simple_spec.js d7e38f0a1a1e777ca2370838fc6a7f8dc0b05b92 Yehuda Katz wycats@gmail.com http://github.com/jbarnette/johnson/commit/8f379af3241e2b6cb791eec868d41be20d736255 8f379af3241e2b6cb791eec868d41be20d736255 2008-05-31T17:46:16-07:00 2008-05-31T17:46:16-07:00 It's not over till it's over br0. a48c9430cfee04b85259f18aa99f14325d40befe Yehuda Katz wycats@gmail.com