X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cb3c4ec09b70e7eae62494af795187b32128fd0c..6e7fbc9a870a933afcdf18fca16d6283f994b1ca:/test/models/acl_test.rb?ds=sidebyside diff --git a/test/models/acl_test.rb b/test/models/acl_test.rb index d3d8f26fe..88d1c0e7d 100644 --- a/test/models/acl_test.rb +++ b/test/models/acl_test.rb @@ -3,7 +3,7 @@ require "test_helper" class AclTest < ActiveSupport::TestCase def test_k_required acl = create(:acl) - assert acl.valid? + assert_predicate acl, :valid? acl.k = nil assert_not acl.valid? end @@ -15,8 +15,16 @@ class AclTest < ActiveSupport::TestCase end def test_no_account_creation_by_domain - assert_not Acl.no_account_creation("192.168.1.1", "example.com") + assert_not Acl.no_account_creation("192.168.1.1", :domain => "example.com") + assert_not Acl.no_account_creation("192.168.1.1", :domain => "test.example.com") create(:acl, :domain => "example.com", :k => "no_account_creation") - assert Acl.no_account_creation("192.168.1.1", "example.com") + assert Acl.no_account_creation("192.168.1.1", :domain => "example.com") + assert Acl.no_account_creation("192.168.1.1", :domain => "test.example.com") + end + + def test_no_account_creation_by_mx + assert_not Acl.no_account_creation("192.168.1.1", :mx => "mail.example.com") + create(:acl, :mx => "mail.example.com", :k => "no_account_creation") + assert Acl.no_account_creation("192.168.1.1", :mx => "mail.example.com") end end