Changeset 52:118fafcc5c5b for wokkel

Timestamp:

Apr 7, 2009, 11:55:53 AM (13 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Convert:

svn:b33ecbfc-034c-dc11-8662-000475d9059e/trunk@164

Message:

Fix regression in returning node meta data.

Author: ralphm.
Fixes #42.

Location:

wokkel

Files:

• pubsub.py (modified) (1 diff)
• test/test_pubsub.py (modified) (3 diffs)

wokkel/pubsub.py

@@ -568 +568 @@
                     form.addField(data_form.Field.fromDict(metaDatum))
 
-                info.append(form.toElement())
+                info.append(form)
 
         d = self.getNodeInfo(requestor, target, nodeIdentifier or '')

wokkel/test/test_pubsub.py

@@ -14 +14 @@
 from twisted.words.protocols.jabber.jid import JID
 
-from wokkel import data_form, iwokkel, pubsub, shim
+from wokkel import data_form, disco, iwokkel, pubsub, shim
 from wokkel.test.helpers import TestableRequestHandlerMixin, XmlStreamStub
 
@@ -27 +27 @@
 NS_PUBSUB_EVENT = 'http://jabber.org/protocol/pubsub#event'
 NS_PUBSUB_OWNER = 'http://jabber.org/protocol/pubsub#owner'
+NS_PUBSUB_META_DATA = 'http://jabber.org/protocol/pubsub#meta-data'
 
 def calledAsync(fn):
@@ -517 +518 @@
         def getNodeInfo(requestor, target, nodeIdentifier):
             return defer.succeed(None)
+
+        self.service.getNodeInfo = getNodeInfo
+        d = self.service.getDiscoInfo(JID('user@example.org/home'),
+                                      JID('pubsub.example.org'), '')
+        d.addCallback(cb)
+        return d
+
+
+    def test_getDiscoInfoNodeType(self):
+        """
+        Test getDiscoInfo with node type.
+        """
+        def cb(info):
+            discoInfo = disco.DiscoInfo()
+            for item in info:
+                discoInfo.append(item)
+            self.assertIn(('pubsub', 'collection'), discoInfo.identities)
+
+        def getNodeInfo(requestor, target, nodeIdentifier):
+            return defer.succeed({'type': 'collection',
+                                  'meta-data': {}})
+
+        self.service.getNodeInfo = getNodeInfo
+        d = self.service.getDiscoInfo(JID('user@example.org/home'),
+                                      JID('pubsub.example.org'), '')
+        d.addCallback(cb)
+        return d
+
+
+    def test_getDiscoInfoMetaData(self):
+        """
+        Test getDiscoInfo with returned meta data.
+        """
+        def cb(info):
+            discoInfo = disco.DiscoInfo()
+            for item in info:
+                discoInfo.append(item)
+
+            self.assertIn(('pubsub', 'leaf'), discoInfo.identities)
+            self.assertIn(NS_PUBSUB_META_DATA, discoInfo.extensions)
+            form = discoInfo.extensions[NS_PUBSUB_META_DATA]
+            self.assertIn('pubsub#node_type', form.fields)
+
+        def getNodeInfo(requestor, target, nodeIdentifier):
+            metaData = [{'var': 'pubsub#persist_items',
+                         'label': 'Persist items to storage',
+                         'value': True}]
+            return defer.succeed({'type': 'leaf', 'meta-data': metaData})
 
         self.service.getNodeInfo = getNodeInfo