# HG changeset patch # User Matthew Wild # Date 1536587924 -3600 # Node ID decdaaf78f32cc9b57c416afd26d7e1f63600ca0 # Parent b5fc11475b5d6853e939980b3e8c0d63f6ae81ed spec/scansion: Multiple fixes to make all tests pass in latest (c35386e4b456) scansion diff -r b5fc11475b5d -r decdaaf78f32 spec/scansion/basic_message.scs --- a/spec/scansion/basic_message.scs Sun Sep 09 19:34:59 2018 +0200 +++ b/spec/scansion/basic_message.scs Mon Sep 10 14:58:44 2018 +0100 @@ -78,7 +78,7 @@ Juliet's phone receives: Hello Juliet, are you there? - + # Romeo sends another bare-JID message, it should be delivered diff -r b5fc11475b5d -r decdaaf78f32 spec/scansion/basic_roster.scs --- a/spec/scansion/basic_roster.scs Sun Sep 09 19:34:59 2018 +0200 +++ b/spec/scansion/basic_roster.scs Mon Sep 10 14:58:44 2018 +0100 @@ -25,7 +25,7 @@ Romeo receives: - + Romeo disconnects diff -r b5fc11475b5d -r decdaaf78f32 spec/scansion/issue978-multi.scs --- a/spec/scansion/issue978-multi.scs Sun Sep 09 19:34:59 2018 +0200 +++ b/spec/scansion/issue978-multi.scs Mon Sep 10 14:58:44 2018 +0100 @@ -21,7 +21,7 @@ Romeo receives: - + @@ -86,7 +86,7 @@ Romeo receives: - + diff -r b5fc11475b5d -r decdaaf78f32 spec/scansion/muc_password-trunk.scs --- a/spec/scansion/muc_password-trunk.scs Sun Sep 09 19:34:59 2018 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,141 +0,0 @@ -[Client] Romeo - jid: user@localhost - password: password - -[Client] Juliet - jid: user2@localhost - password: password - ------ - -Romeo connects - -Romeo sends: - - - - -Romeo receives: - - - - - - - - -Romeo receives: - - -# Submit config form -Romeo sends: - - - - - http://jabber.org/protocol/muc#roomconfig - - - cauldronburn - - - - - -Romeo receives: - - - -# Juliet connects, and tries to join the room (password-protected) -Juliet connects - -Juliet sends: - - - - -Juliet receives: - - - - - - -# Retry with the correct password -Juliet sends: - - - cauldronburn - - - -Juliet receives: - - -Juliet receives: - - -Juliet receives: - - -Romeo receives: - - -# Ok, now Juliet leaves, and Romeo unsets the password - -Juliet sends: - - -Romeo receives: - - -Juliet receives: - - -# Remove room password -Romeo sends: - - - - - http://jabber.org/protocol/muc#roomconfig - - - - - - - -# Config change success -Romeo receives: - - - -# Notification of room configuration update -Romeo receives: - - - - - - -# Juliet tries to join (should succeed) -Juliet sends: - - - - -# Notification of Romeo's presence in the room -Juliet receives: - - -Juliet receives: - - -# Room topic -Juliet receives: - - -Romeo receives: - - diff -r b5fc11475b5d -r decdaaf78f32 spec/scansion/muc_password.scs --- a/spec/scansion/muc_password.scs Sun Sep 09 19:34:59 2018 +0200 +++ b/spec/scansion/muc_password.scs Mon Sep 10 14:58:44 2018 +0100 @@ -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 receives: - +

@@ -108,7 +101,6 @@ http://jabber.org/protocol/muc#roomconfig - diff -r b5fc11475b5d -r decdaaf78f32 spec/scansion/pubsub_advanced.scs --- a/spec/scansion/pubsub_advanced.scs Sun Sep 09 19:34:59 2018 +0200 +++ b/spec/scansion/pubsub_advanced.scs Mon Sep 10 14:58:44 2018 +0100 @@ -90,7 +90,9 @@ Balthasar receives: - + + + @@ -98,6 +100,7 @@ +