X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=test%2Ftest_rm.rb;h=02de53d08f5a3b95f18875196f05ef73d7049d10;hp=1d424619b76561c054ccd34f86679ab672d19036;hb=HEAD;hpb=342327326fc5203b34435a7291f5528f214c1717

diff --git a/test/test_rm.rb b/test/test_rm.rb
index 1d42461..002feda 100644
--- a/test/test_rm.rb
+++ b/test/test_rm.rb
@@ -3,8 +3,6 @@
 require 'common/domain'
 require 'common/user'
 require 'mailshears_test'
-require 'minitest/autorun'
-require 'rm/plugins/agendav'
 require 'rm/plugins/davical'
 require 'rm/plugins/dovecot'
 require 'rm/plugins/postfixadmin'
@@ -27,7 +25,6 @@ class TestRm < MailshearsTest
     actual = output_buffer.string()
 
     expected =
-      "AgendavRm - Removed user adam@example.net.\n" +
       "DavicalRm - User adam@example.net not found.\n" +
       "DovecotRm - Removed user adam@example.net " +
         "(#{cfg.dovecot_mail_root}/example.net/adam).\n" +
@@ -38,11 +35,6 @@ class TestRm < MailshearsTest
 
     # Now make sure the database has what we expect.
 
-    arm = AgendavRm.new(cfg)
-    actual = arm.list_users()
-    expected = [User.new('booger@example.com')]
-    assert_equal(expected, actual)
-
     drm = DavicalRm.new(cfg)
     actual = drm.list_users()
     expected = [User.new('alice@example.com'), User.new('booger@example.com')]
@@ -62,14 +54,17 @@ class TestRm < MailshearsTest
 
     actual = pfarm.list_aliases()
     expected = [{'address' => 'alice@example.com',
-                    'goto' => 'alice@example.com'},
-                {'address' => 'bob@example.com',
-                    'goto' => 'bob@example.com'},
+                 'goto' => 'alice@example.com,' +
+                           'bob@example.com,' +
+                           'carol@example.net'},
                 {'address' => 'beth@example.net',
-                    'goto' => 'beth@example.net'},
+                 'goto' => 'beth@example.net'},
+                {'address' => 'bob@example.com',
+                 'goto' => 'bob@example.com'},
                 {'address' => 'carol@example.net',
-                    'goto' => 'carol@example.net'}]
-    assert_equal(expected, actual)
+                 'goto' => 'carol@example.net'}]
+    expected.each { |e| assert(actual.include?(e)) } # can't sort dicts
+    actual.each { |a| assert(expected.include?(a)) } # can't sort dicts
 
     rrm = RoundcubeRm.new(cfg)
     actual = rrm.list_users()
@@ -97,7 +92,6 @@ class TestRm < MailshearsTest
     actual = output_buffer.string()
 
     expected =
-      "AgendavRm - Removed domain example.net.\n" +
       "DavicalRm - Domain example.net not found.\n" +
       "DovecotRm - Removed domain example.net " +
         "(#{cfg.dovecot_mail_root}/example.net).\n" +
@@ -108,11 +102,6 @@ class TestRm < MailshearsTest
 
     # Now make sure the database has what we expect.
 
-    arm = AgendavRm.new(cfg)
-    actual = arm.list_users()
-    expected = [User.new('booger@example.com')]
-    assert_equal(expected, actual)
-
     drm = DavicalRm.new(cfg)
     actual = drm.list_users()
     expected = [User.new('alice@example.com'), User.new('booger@example.com')]
@@ -130,10 +119,11 @@ class TestRm < MailshearsTest
 
     actual = pfarm.list_aliases()
     expected = [{'address' => 'alice@example.com',
-                    'goto' => 'alice@example.com'},
+                 'goto' => 'alice@example.com,bob@example.com'},
                 {'address' => 'bob@example.com',
-                    'goto' => 'bob@example.com'}]
-    assert_equal(expected, actual)
+                 'goto' => 'bob@example.com'}]
+    expected.each { |e| assert(actual.include?(e)) } # can't sort dicts
+    actual.each { |a| assert(expected.include?(a)) } # can't sort dicts
 
     rrm = RoundcubeRm.new(cfg)
     actual = rrm.list_users()