Merge lp:~methanal-developers/methanal/improve-mock-dom-framework into lp:methanal

[Jonathan Jacobs]

[Tristan Seligmann (mithrandi)]

review: Approve

=== modified file 'methanal/js/Methanal/Tests/TestUtil.js'
--- methanal/js/Methanal/Tests/TestUtil.js	2010-01-05 09:52:20 +0000
+++ methanal/js/Methanal/Tests/TestUtil.js	2010-02-23 10:46:13 +0000
@@ -599,11 +599,12 @@
 Divmod.UnitTest.TestCase.subclass(
     Methanal.Tests.TestUtil, 'TestThrobber').methods(
     function _createThrobber(self, toggleDisplay) {
-        var idNodes = {
-            'throbber': Methanal.Tests.Util.MockNode('foo')};
-        var widget = Methanal.Tests.Util.MockWidget(idNodes);
-        var throbber = Methanal.Util.Throbber(widget, toggleDisplay);
-        return throbber;
+        var widget = Nevow.Athena.Widget(
+            Nevow.Test.WidgetUtil.makeWidgetNode());
+        var throbberNode = Methanal.Tests.Util.makeWidgetChildNode(
+            widget, 'img', 'throbber');
+        document.body.appendChild(widget.node);
+        return Methanal.Util.Throbber(widget, toggleDisplay);
     },
 
 
@@ -612,7 +613,7 @@
      */
     function test_create(self) {
         var throbber = self._createThrobber();
-        self.assertIdentical(throbber.node.name, 'foo');
+        self.assertIdentical(throbber.node.tagName, 'IMG');
     },
 
 

=== modified file 'methanal/js/Methanal/Tests/Util.js'
--- methanal/js/Methanal/Tests/Util.js	2010-01-09 13:30:59 +0000
+++ methanal/js/Methanal/Tests/Util.js	2010-02-23 10:46:13 +0000
@@ -1,5 +1,6 @@
 // import Divmod.Runtime
 // import Divmod.UnitTest
+// import Nevow.Test.WidgetUtil
 
 
 
@@ -22,40 +23,6 @@
 
 
 /**
- * A mock of a DOM node.
- */
-Divmod.Class.subclass(Methanal.Tests.Util, 'MockNode').methods(
-    function __init__(self, name) {
-        self.name = name;
-        self.style = {};
-    });
-
-
-
-/**
- * A mock of L{Nevow.Athena.Widget}.
- */
-Divmod.Class.subclass(Methanal.Tests.Util, 'MockWidget').methods(
-    function __init__(self, idNodes) {
-        self.node = Methanal.Tests.Util.MockNode('widget');
-        if (!idNodes) {
-            idNodes = {};
-        }
-        self._idNodes = idNodes;
-    },
-
-
-    function nodeById(self, id) {
-        var node = self._idNodes[id];
-        if (!node) {
-            throw Divmod.Runtime.NodeNotFound('Node not found');
-        }
-        return node;
-    });
-
-
-
-/**
  * Create a new child DOM element for a widget.
  *
  * @type  widget: L{Nevow.Athena.Widget}