summaryrefslogtreecommitdiff
path: root/test/privacy_tests.erl
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2017-08-23 09:00:13 +0300
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2017-08-23 09:00:13 +0300
commit47175adc747862af58071ad91c975f062dc66636 (patch)
treed5feefea7a71874e5ee5923780b8f72ad8b50e3f /test/privacy_tests.erl
parentIgnore some options from rebar.config (diff)
Explicitly match against <domain/resource>
Fixes #1958
Diffstat (limited to 'test/privacy_tests.erl')
-rw-r--r--test/privacy_tests.erl14
1 files changed, 11 insertions, 3 deletions
diff --git a/test/privacy_tests.erl b/test/privacy_tests.erl
index cf416826..0e40adf2 100644
--- a/test/privacy_tests.erl
+++ b/test/privacy_tests.erl
@@ -258,7 +258,8 @@ master_slave_cases() ->
{privacy_master_slave, [sequence],
[master_slave_test(deny_bare_jid),
master_slave_test(deny_full_jid),
- master_slave_test(deny_server_jid),
+ master_slave_test(deny_server_bare_jid),
+ master_slave_test(deny_server_full_jid),
master_slave_test(deny_group),
master_slave_test(deny_sub_both),
master_slave_test(deny_sub_from),
@@ -285,11 +286,18 @@ deny_full_jid_master(Config) ->
deny_full_jid_slave(Config) ->
deny_slave(Config).
-deny_server_jid_master(Config) ->
+deny_server_bare_jid_master(Config) ->
{_, Server, _} = jid:tolower(?config(peer, Config)),
deny_master(Config, {jid, Server}).
-deny_server_jid_slave(Config) ->
+deny_server_bare_jid_slave(Config) ->
+ deny_slave(Config).
+
+deny_server_full_jid_master(Config) ->
+ {_, Server, Resource} = jid:tolower(?config(peer, Config)),
+ deny_master(Config, {jid, jid:encode({<<"">>, Server, Resource})}).
+
+deny_server_full_jid_slave(Config) ->
deny_slave(Config).
deny_group_master(Config) ->