summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Fritz <fritzy@netflint.net>2011-08-30 23:03:04 -0700
committerNathan Fritz <fritzy@netflint.net>2011-08-30 23:03:04 -0700
commitb70565720fe7d83fdb5de880607a48a37c126d89 (patch)
tree55ccd0caf4a561ffa2114bc7b474342cfb44d8c1
parent4699bdff6046e37d9fe4a8c1e29923e239126908 (diff)
downloadslixmpp-b70565720fe7d83fdb5de880607a48a37c126d89.tar.gz
slixmpp-b70565720fe7d83fdb5de880607a48a37c126d89.tar.bz2
slixmpp-b70565720fe7d83fdb5de880607a48a37c126d89.tar.xz
slixmpp-b70565720fe7d83fdb5de880607a48a37c126d89.zip
fixed test further... but now I have an out of order problem
-rw-r--r--sleekxmpp/plugins/xep_0060/stanza/pubsub.py3
-rw-r--r--tests/test_stanza_xep_0060.py10
2 files changed, 12 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0060/stanza/pubsub.py b/sleekxmpp/plugins/xep_0060/stanza/pubsub.py
index 4967e1a7..d2da8ec9 100644
--- a/sleekxmpp/plugins/xep_0060/stanza/pubsub.py
+++ b/sleekxmpp/plugins/xep_0060/stanza/pubsub.py
@@ -247,7 +247,8 @@ class PublishOptions(ElementBase):
namespace = 'http://jabber.org/protocol/pubsub'
name = 'publish-options'
plugin_attrib = 'publish_options'
- interfaces = set(('publish_options'))
+ interfaces = set(('publish_options',))
+ is_extension = True
plugin_attrib_map = {}
plugin_tag_map = {}
diff --git a/tests/test_stanza_xep_0060.py b/tests/test_stanza_xep_0060.py
index 2427b787..5d5c843a 100644
--- a/tests/test_stanza_xep_0060.py
+++ b/tests/test_stanza_xep_0060.py
@@ -213,6 +213,9 @@ class TestPubsubStanzas(SleekTest):
item2['payload'] = payload2
iq['pubsub']['publish'].append(item)
iq['pubsub']['publish'].append(item2)
+ form = xep_0004.Form()
+ form.addField('pubsub#description', ftype='text-single', value='this thing is awesome')
+ iq['pubsub']['publish_options'] = form
self.check(iq, """
<iq id="0">
@@ -231,6 +234,13 @@ class TestPubsubStanzas(SleekTest):
</thinger2>
</item>
</publish>
+ <publish-options>
+ <x xmlns="jabber:x:data" type="submit">
+ <field var="pubsub#description">
+ <value>this thing is awesome</value>
+ </field>
+ </x>
+ </publish-options>
</pubsub>
</iq>""")