X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=test%2Ftest_rm.rb;h=24dacc3391f309ebdce6dfa63b710d109702dd5e;hp=1d424619b76561c054ccd34f86679ab672d19036;hb=d8d44704c6ba1edba3616b3daf24727ca348d7d9;hpb=342327326fc5203b34435a7291f5528f214c1717 diff --git a/test/test_rm.rb b/test/test_rm.rb index 1d42461..24dacc3 100644 --- a/test/test_rm.rb +++ b/test/test_rm.rb @@ -3,7 +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' @@ -62,14 +61,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() @@ -130,10 +132,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()