diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/scansion/basic_message.scs | 2 | ||||
| -rw-r--r-- | spec/scansion/basic_roster.scs | 2 | ||||
| -rw-r--r-- | spec/scansion/issue978-multi.scs | 4 | ||||
| -rw-r--r-- | spec/scansion/muc_password-trunk.scs | 141 | ||||
| -rw-r--r-- | spec/scansion/muc_password.scs | 10 | ||||
| -rw-r--r-- | spec/scansion/pubsub_advanced.scs | 5 |
6 files changed, 9 insertions, 155 deletions
diff --git a/spec/scansion/basic_message.scs b/spec/scansion/basic_message.scs index f01d8925..56d03a51 100644 --- a/spec/scansion/basic_message.scs +++ b/spec/scansion/basic_message.scs @@ -78,7 +78,7 @@ Juliet's phone receives: Juliet's phone receives: <message from="${Romeo's full JID}" type="chat"> <body>Hello Juliet, are you there?</body> - <delay xmlns='urn:xmpp:delay' from='localhost' /> + <delay xmlns='urn:xmpp:delay' from='localhost' stamp='{scansion:any}' /> </message> # Romeo sends another bare-JID message, it should be delivered diff --git a/spec/scansion/basic_roster.scs b/spec/scansion/basic_roster.scs index 2655639a..17ad2280 100644 --- a/spec/scansion/basic_roster.scs +++ b/spec/scansion/basic_roster.scs @@ -25,7 +25,7 @@ Romeo sends: Romeo receives: <iq type="result" id="roster1"> - <query xmlns="jabber:iq:roster"/> + <query ver='{scansion:any}' xmlns="jabber:iq:roster"/> </iq> Romeo disconnects diff --git a/spec/scansion/issue978-multi.scs b/spec/scansion/issue978-multi.scs index 340f2b27..4f606319 100644 --- a/spec/scansion/issue978-multi.scs +++ b/spec/scansion/issue978-multi.scs @@ -21,7 +21,7 @@ Romeo sends: Romeo receives: <presence from='room@conference.localhost/Romeo'> - <x xmlns='http://jabber.org/protocol/muc#user'> + <x xmlns='http://jabber.org/protocol/muc#user' scansion:strict='false'> <status code='201'/> <item jid="${Romeo's full JID}" affiliation='owner' role='moderator'/> <status code='110'/> @@ -86,7 +86,7 @@ Juliet's phone receives: Romeo receives: <presence from='room@conference.localhost/Juliet'> - <x xmlns='http://jabber.org/protocol/muc#user'> + <x xmlns='http://jabber.org/protocol/muc#user' scansion:strict='false'> <item affiliation='none' jid="${Juliet's phone's full JID}" role='participant'/> <item affiliation='none' jid="${Juliet's full JID}" role='participant'/> </x> diff --git a/spec/scansion/muc_password-trunk.scs b/spec/scansion/muc_password-trunk.scs deleted file mode 100644 index 0a343b91..00000000 --- a/spec/scansion/muc_password-trunk.scs +++ /dev/null @@ -1,141 +0,0 @@ -[Client] Romeo - jid: user@localhost - password: password - -[Client] Juliet - jid: user2@localhost - password: password - ------ - -Romeo connects - -Romeo sends: - <presence to="room@conference.localhost/Romeo"> - <x xmlns="http://jabber.org/protocol/muc"/> - </presence> - -Romeo receives: - <presence from='room@conference.localhost/Romeo'> - <x xmlns='http://jabber.org/protocol/muc#user'> - <status code='201'/> - <item jid="${Romeo's full JID}" affiliation='owner' role='moderator'/> - <status code='110'/> - </x> - </presence> - -Romeo receives: - <message type='groupchat' from='room@conference.localhost'><subject/></message> - -# Submit config form -Romeo sends: - <iq id='config1' to='room@conference.localhost' type='set'> - <query xmlns='http://jabber.org/protocol/muc#owner'> - <x xmlns='jabber:x:data' type='submit'> - <field var='FORM_TYPE'> - <value>http://jabber.org/protocol/muc#roomconfig</value> - </field> - <field var='muc#roomconfig_roomsecret'> - <value>cauldronburn</value> - </field> - </x> - </query> - </iq> - -Romeo receives: - <iq id="config1" from="room@conference.localhost" type="result"> - </iq> - -# Juliet connects, and tries to join the room (password-protected) -Juliet connects - -Juliet sends: - <presence to="room@conference.localhost/Juliet"> - <x xmlns="http://jabber.org/protocol/muc"/> - </presence> - -Juliet receives: - <presence from="room@conference.localhost/Juliet" type="error"> - <error type="auth"> - <not-authorized xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> - </error> - </presence> - -# Retry with the correct password -Juliet sends: - <presence to="room@conference.localhost/Juliet"> - <x xmlns="http://jabber.org/protocol/muc"> - <password>cauldronburn</password> - </x> - </presence> - -Juliet receives: - <presence from="room@conference.localhost/Romeo" /> - -Juliet receives: - <presence from="room@conference.localhost/Juliet" /> - -Juliet receives: - <message type='groupchat' from='room@conference.localhost'><subject/></message> - -Romeo receives: - <presence from="room@conference.localhost/Juliet" /> - -# Ok, now Juliet leaves, and Romeo unsets the password - -Juliet sends: - <presence type="unavailable" to="room@conference.localhost"/> - -Romeo receives: - <presence type="unavailable" from="room@conference.localhost/Juliet"/> - -Juliet receives: - <presence type="unavailable" from="room@conference.localhost/Juliet"/> - -# Remove room password -Romeo sends: - <iq id='config2' to='room@conference.localhost' type='set'> - <query xmlns='http://jabber.org/protocol/muc#owner'> - <x xmlns='jabber:x:data' type='submit'> - <field var='FORM_TYPE'> - <value>http://jabber.org/protocol/muc#roomconfig</value> - </field> - <field var='muc#roomconfig_roomsecret'> - </field> - </x> - </query> - </iq> - -# Config change success -Romeo receives: - <iq id="config2" from="room@conference.localhost" type="result"> - </iq> - -# Notification of room configuration update -Romeo receives: - <message type='groupchat' from='room@conference.localhost'> - <x xmlns='http://jabber.org/protocol/muc#user'> - <status code='104'/> - </x> - </message> - -# Juliet tries to join (should succeed) -Juliet sends: - <presence to="room@conference.localhost/Juliet"> - <x xmlns="http://jabber.org/protocol/muc"/> - </presence> - -# Notification of Romeo's presence in the room -Juliet receives: - <presence from="room@conference.localhost/Romeo" /> - -Juliet receives: - <presence from="room@conference.localhost/Juliet" /> - -# Room topic -Juliet receives: - <message type='groupchat' from='room@conference.localhost'><subject/></message> - -Romeo receives: - <presence from="room@conference.localhost/Juliet" /> - diff --git a/spec/scansion/muc_password.scs b/spec/scansion/muc_password.scs index 813265a5..bff6fece 100644 --- a/spec/scansion/muc_password.scs +++ b/spec/scansion/muc_password.scs @@ -1,10 +1,3 @@ -# MUC password test -# Ensures that setting and unsetting a MUC password works, and that the password is -# required to join a password-protected room. - -## prosody-0.9 result: fails because of missing 201 status code (related to issue #328) -## prosody-0.10 result: fails because of missing 201 status code (related to issue #328) - [Client] Romeo jid: user@localhost password: password @@ -63,7 +56,7 @@ Juliet sends: Juliet receives: <presence from="room@conference.localhost/Juliet" type="error"> - <error type="auth"> + <error type="auth" code="401"> <not-authorized xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> </error> </presence> @@ -108,7 +101,6 @@ Romeo sends: <value>http://jabber.org/protocol/muc#roomconfig</value> </field> <field var='muc#roomconfig_roomsecret'> - <value></value> </field> </x> </query> diff --git a/spec/scansion/pubsub_advanced.scs b/spec/scansion/pubsub_advanced.scs index b7b96a22..866c459b 100644 --- a/spec/scansion/pubsub_advanced.scs +++ b/spec/scansion/pubsub_advanced.scs @@ -90,7 +90,9 @@ Balthasar sends: Balthasar receives: <iq type="result" id='aff1' from='pubsub.localhost'> <pubsub xmlns="http://jabber.org/protocol/pubsub#owner"> - <affiliations node="princely_musings"/> + <affiliations node="princely_musings"> + <affiliation affiliation='owner' jid='admin@localhost' xmlns='http://jabber.org/protocol/pubsub#owner'/> + </affiliations> </pubsub> </iq> @@ -98,6 +100,7 @@ Balthasar sends: <iq type="set" id='aff2' to='pubsub.localhost'> <pubsub xmlns="http://jabber.org/protocol/pubsub#owner"> <affiliations node="princely_musings"> + <affiliation affiliation='owner' jid='admin@localhost' xmlns='http://jabber.org/protocol/pubsub#owner'/> <affiliation jid="${Romeo's JID}" affiliation="publisher"/> </affiliations> </pubsub> |