From daf6be19219e2f33c0b8bb3db909614b4ec0b1f1 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 10 Sep 2018 14:58:44 +0100 Subject: spec/scansion: Multiple fixes to make all tests pass in latest (c35386e4b456) scansion --- spec/scansion/basic_message.scs | 2 +- spec/scansion/basic_roster.scs | 2 +- spec/scansion/issue978-multi.scs | 4 +- spec/scansion/muc_password-trunk.scs | 141 ----------------------------------- spec/scansion/muc_password.scs | 10 +-- spec/scansion/pubsub_advanced.scs | 5 +- 6 files changed, 9 insertions(+), 155 deletions(-) delete mode 100644 spec/scansion/muc_password-trunk.scs (limited to 'spec/scansion') 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: Hello Juliet, are you there? - + # 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: - + 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: - + @@ -86,7 +86,7 @@ Juliet's phone receives: Romeo receives: - + 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: - - - - -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 --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: - +

@@ -108,7 +101,6 @@ Romeo sends: http://jabber.org/protocol/muc#roomconfig - 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: - + + + @@ -98,6 +100,7 @@ Balthasar sends: + -- cgit v1.2.3