commit 12d5f4a: Merge pull request #3298 from korgoth1/master

[GitHub]

Author: Vsevolod Stakhov
Date: 2020-03-11 19:50:21 +0000
URL: https://github.com/rspamd/rspamd/commit/12d5f4a6ec4798d5e91cc81ef2db605d8a0ab855 (HEAD -> master)

Merge pull request #3298 from korgoth1/master
[Test] URL compose map

 test/functional/cases/300_rbl.robot                | 13 ++++++++++
 test/functional/cases/340_surbl.robot              | 12 +++++++--
 test/functional/configs/maps/url_compose_map.list  |  3 ++-
 .../configs/maps/url_compose_map_for_mails.list    |  4 ++-
 test/functional/configs/plugins.conf               | 30 ++++++++++++++++++++++
 test/functional/configs/rbl.conf                   |  9 +++++++
 test/functional/configs/surbl.conf                 |  6 -----
 test/functional/messages/url11.eml                 |  3 +--
 test/functional/messages/url12.eml                 |  1 +
 test/functional/messages/url13.eml                 |  4 +++
 test/functional/messages/url14.eml                 |  4 +++
 .../messages/{whitelist.eml => url15.eml}          |  2 +-
 test/functional/messages/url16.eml                 |  5 ++++
 13 files changed, 83 insertions(+), 13 deletions(-)