Changeset 27:a9704141033a in ralphm-patches for pubsub-create-configure.patch

Timestamp:

Jan 2, 2010, 3:32:52 PM (11 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Ensure all modified code has unittests, add setOptions to PubSubClient?.

File:

• pubsub-create-configure.patch (modified) (14 diffs)

pubsub-create-configure.patch

@@ -1 @@
-diff -r d64e96596c50 -r 8425a88d49f5 wokkel/pubsub.py
---- a/wokkel/pubsub.py  Wed Dec 30 21:41:55 2009 +0100
-+++ b/wokkel/pubsub.py  Wed Dec 30 21:42:27 2009 +0100
+Add support for configuration options in node creation requests
+
+diff -r 259252e5664b wokkel/pubsub.py
+--- a/wokkel/pubsub.py  Sat Jan 02 14:28:16 2010 +0100
++++ b/wokkel/pubsub.py  Sat Jan 02 15:27:24 2010 +0100
 @@ -234,7 +234,7 @@
          'optionsSet': ['nodeOrEmpty', 'jid', 'options'],
@@ -26 +28 @@
 +                        self.options = form
 +                    else:
-+                        raise BadRequest(text="Unexpected form type %r" %
++                        raise BadRequest(text=u"Unexpected form type '%s'" %
 +                                              form.formType)
 +                else:
@@ -45 +47 @@
      def _parse_itemIdentifiers(self, verbElement):
          """
-@@ -602,7 +629,8 @@
+@@ -607,7 +634,8 @@
          pass
  
@@ -55 +57 @@
          Create a publish subscribe node.
  
-@@ -610,12 +638,20 @@
+@@ -615,12 +643,20 @@
          @type service: L{JID}
          @param nodeIdentifier: Optional suggestion for the id of the node.
@@ -68 +70 @@
  
 +        if options:
-+            form = data_form.Form(formType='result',
++            form = data_form.Form(formType='submit',
 +                                  formNamespace=NS_PUBSUB_NODE_CONFIG)
 +            form.makeFields(options)
@@ -76 +78 @@
              try:
                  new_node = iq.pubsub.create["node"]
-@@ -887,8 +923,6 @@
-             d = self.getNodes(requestor, target)
-         else:
-             d = defer.succeed([])
--            
--
- 
-         d.addCallback(lambda nodes: [disco.DiscoItem(target, node)
-                                      for node in nodes])
-@@ -998,6 +1032,12 @@
+@@ -1001,6 +1037,12 @@
          form.typeCheck(fieldDefs, filterUnknown=True)
  
@@ -98 +91 @@
          if request.nodeType not in ('leaf', 'collection'):
              raise error.StanzaError('not-acceptable')
-diff -r d64e96596c50 -r 8425a88d49f5 wokkel/test/test_pubsub.py
---- a/wokkel/test/test_pubsub.py        Wed Dec 30 21:41:55 2009 +0100
-+++ b/wokkel/test/test_pubsub.py        Wed Dec 30 21:42:27 2009 +0100
+diff -r 259252e5664b wokkel/test/test_pubsub.py
+--- a/wokkel/test/test_pubsub.py        Sat Jan 02 14:28:16 2010 +0100
++++ b/wokkel/test/test_pubsub.py        Sat Jan 02 15:27:24 2010 +0100
 @@ -19,7 +19,7 @@
  from wokkel.test.helpers import TestableRequestHandlerMixin, XmlStreamStub
@@ -110 +103 @@
  NS_PUBSUB_EVENT = 'http://jabber.org/protocol/pubsub#event'
  NS_PUBSUB_OWNER = 'http://jabber.org/protocol/pubsub#owner'
-@@ -271,6 +271,40 @@
+@@ -271,6 +271,41 @@
          return d
  
@@ -141 +134 @@
 +        # check that it has a configuration form
 +        form = data_form.findForm(children[0], NS_PUBSUB_NODE_CONFIG)
-+        self.assertNotIdentical(None, form)
++        self.assertEqual('submit', form.formType)
++
 +
 +        response = toResponse(iq, 'result')
@@ -151 +145 @@
          """
          Test sending delete request.
-@@ -935,6 +969,7 @@
+@@ -936,6 +971,7 @@
          self.assertEqual(JID('user@example.org'), request.sender)
          self.assertEqual(JID('pubsub.example.org'), request.recipient)
@@ -159 +153 @@
  
      def test_fromElementCreateInstant(self):
-@@ -955,6 +990,78 @@
+@@ -956,6 +992,109 @@
          self.assertIdentical(None, request.nodeIdentifier)
  
@@ -235 +229 @@
 +
 +
++    def test_fromElementCreateConfigureBadFormType(self):
++        """
++        The form of a node creation request should have the right type.
++        """
++
++        xml = """
++        <iq type='set' to='pubsub.example.org'
++                       from='user@example.org'>
++          <pubsub xmlns='http://jabber.org/protocol/pubsub'>
++            <create node='mynode'/>
++            <configure>
++              <x xmlns='jabber:x:data' type='result'>
++                <field var='FORM_TYPE' type='hidden'>
++                  <value>http://jabber.org/protocol/pubsub#node_config</value>
++                </field>
++                <field var='pubsub#access_model'><value>open</value></field>
++                <field var='pubsub#persist_items'><value>0</value></field>
++              </x>
++            </configure>
++          </pubsub>
++        </iq>
++        """
++
++        err = self.assertRaises(error.StanzaError,
++                                pubsub.PubSubRequest.fromElement,
++                                parseXml(xml))
++        self.assertEqual('bad-request', err.condition)
++        self.assertEqual("Unexpected form type 'result'", err.text)
++        self.assertEqual(None, err.appCondition)
++
++
      def test_fromElementDefault(self):
          """
          Test parsing a request for the default node configuration.
-@@ -1741,6 +1848,52 @@
+@@ -1080,7 +1219,7 @@
+ 
+     def test_fromElementConfigureSetBadFormType(self):
+         """
+-        On a node configuration set request unknown fields should be ignored.
++        The form of a node configuraton set request should have the right type.
+         """
+ 
+         xml = """
+@@ -1743,6 +1882,52 @@
          return d
  
@@ -291 +325 @@
          """
          A default request should result in
-@@ -1774,7 +1927,7 @@
+@@ -1776,7 +1961,7 @@
              self.assertEqual(NS_PUBSUB_OWNER, element.uri)
              self.assertEqual(NS_PUBSUB_OWNER, element.default.uri)
@@ -300 +334 @@
          self.resource.getConfigurationOptions = getConfigurationOptions
          self.resource.default = default
-@@ -1903,7 +2056,7 @@
+@@ -1905,7 +2090,7 @@
              self.assertEqual(NS_PUBSUB_OWNER, element.uri)
              self.assertEqual(NS_PUBSUB_OWNER, element.configure.uri)