Changeset 161:aecf77f1bb1f

Timestamp:

Jan 8, 2012, 9:26:03 AM (10 years ago)

Author:

Ralph Meijer <ralphm@…>

Branch:

default

Message:

Allow empty MUC configuration forms to be sent.

Location:

wokkel

Files:

• muc.py (modified) (3 diffs)
• test/test_muc.py (modified) (2 diffs)

wokkel/muc.py

@@ -104 +104 @@
             # This is a request for the configuration form.
             form = None
-        elif not self.options:
+        elif self.options is False:
             form = data_form.Form(formType='cancel')
         else:
@@ -757 +757 @@
         @type options: C{dict}
         """
+        if options is None:
+            options = False
         request = RegisterRequest(recipient=roomJID, options=options)
         return self.request(request)
@@ -838 +840 @@
         @type roomJID: L{jid.JID}
 
-        @param options: A mapping of field names to values, or C{None} to cancel.
+        @param options: A mapping of field names to values, or C{None} to
+            cancel.
         @type options: C{dict}
         """
-        if not options:
+        if options is None:
             options = False
         request = ConfigureRequest(recipient=roomJID, options=options)

wokkel/test/test_muc.py

@@ -880 +880 @@
 
 
+    def test_registerCancel(self):
+        """
+        Cancelling a registration request sends a cancel form.
+        """
+
+        d = self.protocol.register(self.roomJID, None)
+
+        iq = self.stub.output[-1]
+
+        query = "/iq/query[@xmlns='%s']" % muc.NS_REGISTER
+        nodes = xpath.queryForNodes(query, iq)
+        self.assertNotIdentical(None, nodes, 'Invalid registration request')
+
+        form = data_form.findForm(nodes[0], muc.NS_MUC_REGISTER)
+        self.assertNotIdentical(None, form, 'Missing registration form')
+        self.assertEquals('cancel', form.formType)
+
+        response = toResponse(iq, 'result')
+        self.stub.send(response)
+        return d
+
+
     def test_voice(self):
         """
@@ -1024 +1046 @@
 
 
+    def test_configureEmpty(self):
+        """
+        Accept default configuration by sending an empty form.
+        """
+
+        values = {}
+
+        d = self.protocol.configure(self.roomJID, values)
+
+        iq = self.stub.output[-1]
+
+        query = "/iq/query[@xmlns='%s']" % (muc.NS_MUC_OWNER)
+        nodes = xpath.queryForNodes(query, iq)
+
+        form = data_form.findForm(nodes[0], muc.NS_MUC_CONFIG)
+        self.assertNotIdentical(None, form, 'Missing configuration form')
+        self.assertEquals('submit', form.formType)
+
+        response = toResponse(iq, 'result')
+        self.stub.send(response)
+        return d
+
+
     def test_configureCancel(self):
         """