Merge http://github.com/angular/angular.js into angular

Conflicts:
	.gitignore

1 files changed, 12 insertions, 0 deletions

diff --git a/test/ConsoleTest.js b/test/ConsoleTest.js
new file mode 100644
index 00000000..3e09267b
--- /dev/null
+++ b/test/ConsoleTest.js
@@ -0,0 +1,12 @@
+ConsoleTest = TestCase('ConsoleTest');
+
+ConsoleTest.prototype.XtestConsoleWrite = function(){
+  var consoleNode = jqLite("<div></div>")[0];
+  consoleLog("error", ["Hello", "world"]);
+  assertEquals(jqLite(consoleNode)[0].nodeName, 'DIV');
+  assertEquals(jqLite(consoleNode).text(), 'Hello world');
+  assertEquals(jqLite(consoleNode.childNodes[0])[0].className, 'error');
+  consoleLog("error",["Bye"]);
+  assertEquals(jqLite(consoleNode).text(), 'Hello worldBye');
+  consoleNode = null;
+};