X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=test%2Ftest_rm.rb;h=f8e046f187f55534a74a2d64c23faaf057e23343;hp=09ebe2e37c4faefcb5ff68932c92883b6ab6fad8;hb=54cfedbd6d9d7ae35011048e16a6b9e6d82ab7f3;hpb=c7298aa01f95c9f6094b1bfeb05a16b20eb4de45;ds=sidebyside diff --git a/test/test_rm.rb b/test/test_rm.rb index 09ebe2e..f8e046f 100644 --- a/test/test_rm.rb +++ b/test/test_rm.rb @@ -10,7 +10,7 @@ require 'rm/plugins/dovecot' require 'rm/plugins/postfixadmin' require 'rm/plugins/roundcube' require 'rm/rm_runner' -require 'rm/rm_dummy_runner' + class TestRm < MailshearsTest @@ -26,12 +26,11 @@ class TestRm < MailshearsTest actual = output_buffer.string() - mail_root = cfg.send('mail_root') expected = "AgendavRm - Removed user adam@example.net.\n" + "DavicalRm - User adam@example.net not found.\n" + "DovecotRm - Removed user adam@example.net " + - "(#{mail_root}/example.net/adam).\n" + + "(#{cfg.dovecot_mail_root}/example.net/adam).\n" + "PostfixadminRm - Removed user adam@example.net.\n" + "RoundcubeRm - Removed user adam@example.net (User ID: 2).\n" @@ -97,12 +96,11 @@ class TestRm < MailshearsTest actual = output_buffer.string() - mail_root = cfg.send('mail_root') expected = "AgendavRm - Removed domain example.net.\n" + "DavicalRm - Domain example.net not found.\n" + "DovecotRm - Removed domain example.net " + - "(#{mail_root}/example.net).\n" + + "(#{cfg.dovecot_mail_root}/example.net).\n" + "PostfixadminRm - Removed domain example.net.\n" + "RoundcubeRm - Removed domain example.net.\n"