prosody
decdaaf78f32

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

9290:decdaaf78f32

spec/scansion: Multiple fixes to make all tests pass in latest (c35386e4b456) scansion
author Matthew Wild <mwild1@gmail.com>
date Mon, 10 Sep 2018 14:58:44 +0100
parents 9289:b5fc11475b5d
children 9291:329a670ae975
files spec/scansion/basic_message.scs spec/scansion/basic_roster.scs spec/scansion/issue978-multi.scs spec/scansion/muc_password-trunk.scs spec/scansion/muc_password.scs spec/scansion/pubsub_advanced.scs
diffstat 6 files changed, 9 insertions(+), 155 deletions(-) [+]
line wrap: on
line diff
--- 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:
 	<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
--- 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:
 	<iq type="result" id="roster1">
-		<query xmlns="jabber:iq:roster"/>
+		<query ver='{scansion:any}' xmlns="jabber:iq:roster"/>
 	</iq>
 
 Romeo disconnects
--- 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:
 	<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 @@
 
 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>
--- 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:
-	<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" />
-
--- 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:
 	<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 @@
 					<value>http://jabber.org/protocol/muc#roomconfig</value>
 				</field>
 				<field var='muc#roomconfig_roomsecret'>
-					<value></value>
 				</field>
 			</x>
 		</query>
--- 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:
 	<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 @@
 	<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>