Remove pointless include.

[mailshears.git] / test / test_rm.rb

diff --git a/test/test_rm.rb b/test/test_rm.rb
index 09ebe2e37c4faefcb5ff68932c92883b6ab6fad8..f8e046f187f55534a74a2d64c23faaf057e23343 100644 (file)
--- 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/plugins/postfixadmin'
 require 'rm/plugins/roundcube'
 require 'rm/rm_runner'

-require 'rm/rm_dummy_runner'
+

 
 class TestRm < MailshearsTest
 
 
 class TestRm < MailshearsTest
 


@@ -26,12 +26,11 @@ class TestRm < MailshearsTest
 
     actual = output_buffer.string()
 
 
     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 " +
     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"
 
       "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()
 
 
     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 " +
     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"
 
       "PostfixadminRm - Removed domain example.net.\n" +
       "RoundcubeRm - Removed domain example.net.\n"