Merge branch 'develop' into xep_0050_updates

# Conflicts:
#	tests/test_stream_xep_0050.py
This commit is contained in:
Robert Robinson
2015-09-18 13:35:28 -06:00
2 changed files with 17 additions and 1 deletions

View File

@@ -120,6 +120,7 @@ class TestAdHocCommands(SleekTest):
def handle_form(form, session):
results.append(form.get_values()['foo'])
session['payload'] = None
form = self.xmpp['xep_0004'].makeForm('form')
form.addField(var='foo', ftype='text-single', label='Foo')
@@ -192,6 +193,7 @@ class TestAdHocCommands(SleekTest):
def handle_step2(form, session):
results.append(form.get_values()['bar'])
session['payload'] = None
def handle_step1(form, session):
results.append(form.get_values()['foo'])
@@ -427,6 +429,7 @@ class TestAdHocCommands(SleekTest):
def handle_form(forms, session):
for form in forms:
results.append(form.get_values()['FORM_TYPE'])
session['payload'] = None
form1 = self.xmpp['xep_0004'].makeForm('form')
form1.addField(var='FORM_TYPE', ftype='hidden', value='form_1')