X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=test%2Ftest_mv.rb;h=968782b5548e92c110c1d6063cf9cb64ea3a79a9;hp=f91c4bf79c8583e36ed570fcebad6005f45971cf;hb=a28cc0462daf47661f2921739b4df31f6e8f164c;hpb=3de4ec0727320a41d1be4f37973ffc81abc91d36 diff --git a/test/test_mv.rb b/test/test_mv.rb index f91c4bf..968782b 100644 --- a/test/test_mv.rb +++ b/test/test_mv.rb @@ -3,7 +3,6 @@ require 'common/domain' require 'common/user' require 'mailshears_test' -require 'minitest/autorun' require 'mv/plugins/agendav' require 'mv/plugins/davical' require 'mv/plugins/dovecot' @@ -66,14 +65,17 @@ class TestMv < MailshearsTest assert_equal(expected.sort(), actual.sort()) actual = pfamv.list_aliases() - expected = [{'address' => 'alice@example.net', - 'goto' => 'alice@example.net'}, - {'address' => 'bob@example.com', - 'goto' => 'bob@example.com'}, - {'address' => 'adam@example.net', + expected = [{'address' => 'adam@example.net', 'goto' => 'adam@example.net'}, + {'address' => 'alice@example.net', + 'goto' => 'alice@example.net,' + + 'adam@example.net,' + + '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'}] expected.each { |e| assert(actual.include?(e)) } # can't sort dicts @@ -138,14 +140,17 @@ class TestMv < MailshearsTest assert_equal(expected.sort(), actual.sort()) actual = pfamv.list_aliases() - expected = [{'address' => 'alice@example.com', - 'goto' => 'alice@example.com'}, - {'address' => 'bob@example.com', - 'goto' => 'bob@example.com'}, - {'address' => 'adam@example.net', + expected = [{'address' => 'adam@example.net', 'goto' => 'adam@example.net'}, + {'address' => 'alice@example.com', + 'goto' => 'alice@example.com,' + + 'adam@example.net,' + + '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'}] expected.each { |e| assert(actual.include?(e)) } # can't sort dicts