aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-12-23 15:22:49 +0100
committerKim Alvefur <zash@zash.se>2018-12-23 15:22:49 +0100
commit67a3bf56f3d74c27bc49918e5b4ed5a891ed5b92 (patch)
treebfeb9d91bbcf76ca0ba45eedc2071647e4bac9e4
parent6282f9029c3ea12eca3630ce40658ebe0c3c9b46 (diff)
downloadprosody-67a3bf56f3d74c27bc49918e5b4ed5a891ed5b92.tar.gz
prosody-67a3bf56f3d74c27bc49918e5b4ed5a891ed5b92.zip
mod_mam: Add test for JID normalization in prefs (see #1275)
-rw-r--r--spec/scansion/mam_prefs_prep.scs36
-rw-r--r--spec/scansion/prosody.cfg.lua3
2 files changed, 38 insertions, 1 deletions
diff --git a/spec/scansion/mam_prefs_prep.scs b/spec/scansion/mam_prefs_prep.scs
new file mode 100644
index 00000000..9589ec65
--- /dev/null
+++ b/spec/scansion/mam_prefs_prep.scs
@@ -0,0 +1,36 @@
+# mod_mam shold apply JIDprep in prefs
+
+[Client] Romeo
+ jid: romeo@localhost
+ password: password
+
+-----
+
+Romeo connects
+
+Romeo sends:
+ <iq id="lx2" type="set">
+ <prefs xmlns="urn:xmpp:mam:2" default="roster">
+ <always>
+ <jid>JULIET@MONTAGUE.LIT</jid>
+ </always>
+ <never>
+ <jid>MONTAGUE@MONTAGUE.LIT</jid>
+ </never>
+ </prefs>
+ </iq>
+
+Romeo receives:
+ <iq id="lx2" type="result">
+ <prefs xmlns="urn:xmpp:mam:2" default="roster">
+ <always>
+ <jid>juliet@montague.lit</jid>
+ </always>
+ <never>
+ <jid>montague@montague.lit</jid>
+ </never>
+ </prefs>
+ </iq>
+
+Romeo disconnects
+
diff --git a/spec/scansion/prosody.cfg.lua b/spec/scansion/prosody.cfg.lua
index 94861449..f95ea31b 100644
--- a/spec/scansion/prosody.cfg.lua
+++ b/spec/scansion/prosody.cfg.lua
@@ -25,7 +25,7 @@ modules_enabled = {
"time"; -- Let others know the time here on this server
"ping"; -- Replies to XMPP pings with pongs
"register"; -- Allow users to register on this server using a client and change passwords
- --"mam"; -- Store messages in an archive and allow users to access it
+ "mam"; -- Store messages in an archive and allow users to access it
-- HTTP modules
--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
@@ -59,6 +59,7 @@ insecure_open_authentication = "Yes please, I know what I'm doing!"
storage = "memory"
+mam_smart_enable = true
-- For the "sql" backend, you can uncomment *one* of the below to configure:
--sql = { driver = "SQLite3", database = "prosody.sqlite" } -- Default. 'database' is the filename.