aboutsummaryrefslogtreecommitdiffstats
path: root/spec/scansion
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-06-20 22:12:49 +0200
committerKim Alvefur <zash@zash.se>2019-06-20 22:12:49 +0200
commit17df356b09c480ca5b994fb36b8a20c8616333c9 (patch)
tree52641b7439ff4ff8adbf3c62613de3ada3259dfe /spec/scansion
parent47b408b4bdf206a1c2967e1d8272f945e816fc9c (diff)
parent159ef78300120f98bd1620418eac69e85fdcb445 (diff)
downloadprosody-17df356b09c480ca5b994fb36b8a20c8616333c9.tar.gz
prosody-17df356b09c480ca5b994fb36b8a20c8616333c9.zip
Merge 0.11->trunk
Diffstat (limited to 'spec/scansion')
-rw-r--r--spec/scansion/blocking.scs12
1 files changed, 2 insertions, 10 deletions
diff --git a/spec/scansion/blocking.scs b/spec/scansion/blocking.scs
index 809bbcb5..7b46167f 100644
--- a/spec/scansion/blocking.scs
+++ b/spec/scansion/blocking.scs
@@ -17,9 +17,7 @@ Romeo sends:
<presence/>
Romeo receives:
- <presence from="${Romeo's full JID}">
- <x xmlns="vcard-temp:x:update"/>
- </presence>
+ <presence from="${Romeo's full JID}"/>
Juliet connects
@@ -27,9 +25,7 @@ Juliet sends:
<presence/>
Juliet receives:
- <presence from="${Juliet's full JID}">
- <x xmlns="vcard-temp:x:update"/>
- </presence>
+ <presence from="${Juliet's full JID}"/>
# They add each other
Romeo sends:
@@ -47,7 +43,6 @@ Juliet sends:
Romeo receives:
<presence from="${Juliet's full JID}" to="${Romeo's JID}">
<delay xmlns="urn:xmpp:delay" stamp="{scansion:any}" from="localhost"/>
- <x xmlns="vcard-temp:x:update"/>
</presence>
Juliet sends:
@@ -65,13 +60,11 @@ Romeo sends:
Juliet receives:
<presence from="${Romeo's full JID}" to="${Juliet's JID}">
<delay xmlns="urn:xmpp:delay" stamp="{scansion:any}" from="localhost"/>
- <x xmlns="vcard-temp:x:update"/>
</presence>
Romeo receives:
<presence from="${Juliet's full JID}" to="${Romeo's JID}">
<delay xmlns="urn:xmpp:delay" stamp="{scansion:any}" from="localhost"/>
- <x xmlns="vcard-temp:x:update"/>
</presence>
# They can now talk
@@ -134,7 +127,6 @@ Romeo sends:
Juliet receives:
<presence to="${Juliet's JID}" from="${Romeo's full JID}">
- <delay xmlns="urn:xmpp:delay" stamp="{scansion:any}" from="localhost"/>
<x xmlns="vcard-temp:x:update"/>
</presence>