X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=test%2Ftest_rm.rb;h=1d424619b76561c054ccd34f86679ab672d19036;hp=09ebe2e37c4faefcb5ff68932c92883b6ab6fad8;hb=e85aac7a1dc524044e44c812cd328e0b74adcb1c;hpb=c7298aa01f95c9f6094b1bfeb05a16b20eb4de45

diff --git a/test/test_rm.rb b/test/test_rm.rb
index 09ebe2e..1d42461 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,14 +26,13 @@ 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"
+      "RoundcubeRm - Removed user adam@example.net (User ID: 3).\n"
 
     assert_equal(expected, actual)
 
@@ -41,12 +40,12 @@ class TestRm < MailshearsTest
 
     arm = AgendavRm.new(cfg)
     actual = arm.list_users()
-    expected = []
+    expected = [User.new('booger@example.com')]
     assert_equal(expected, actual)
 
     drm = DavicalRm.new(cfg)
     actual = drm.list_users()
-    expected = [User.new('alice@example.com')]
+    expected = [User.new('alice@example.com'), User.new('booger@example.com')]
     assert_equal(expected, actual)
 
     pfarm = PostfixadminRm.new(cfg)
@@ -74,7 +73,7 @@ class TestRm < MailshearsTest
 
     rrm = RoundcubeRm.new(cfg)
     actual = rrm.list_users()
-    expected = [User.new('alice@example.com')]
+    expected = [User.new('alice@example.com'), User.new('booger@example.com')]
     assert_equal(expected, actual)
 
     # Check that adam's directory is gone but that the rest remain.
@@ -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"
 
@@ -112,12 +110,12 @@ class TestRm < MailshearsTest
 
     arm = AgendavRm.new(cfg)
     actual = arm.list_users()
-    expected = []
+    expected = [User.new('booger@example.com')]
     assert_equal(expected, actual)
 
     drm = DavicalRm.new(cfg)
     actual = drm.list_users()
-    expected = [User.new('alice@example.com')]
+    expected = [User.new('alice@example.com'), User.new('booger@example.com')]
     assert_equal(expected, actual)
 
     pfarm = PostfixadminRm.new(cfg)
@@ -139,7 +137,7 @@ class TestRm < MailshearsTest
 
     rrm = RoundcubeRm.new(cfg)
     actual = rrm.list_users()
-    expected = [User.new('alice@example.com')]
+    expected = [User.new('alice@example.com'), User.new('booger@example.com')]
     assert_equal(expected, actual)
 
     # Check that example.net's directory is gone but that the rest remain.