X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/69fa4e9940fe2858c90ea39277ef6ffcd84a3ca6..4c564e5a322e04cd0a811c859ddb251cb80b45d4:/test/models/acl_test.rb diff --git a/test/models/acl_test.rb b/test/models/acl_test.rb index 189f92677..88d1c0e7d 100644 --- a/test/models/acl_test.rb +++ b/test/models/acl_test.rb @@ -3,20 +3,28 @@ 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 !acl.valid? + assert_not acl.valid? end def test_no_account_creation_by_subnet - assert !Acl.no_account_creation("192.168.1.1") + assert_not Acl.no_account_creation("192.168.1.1") create(:acl, :address => "192.168.0.0/16", :k => "no_account_creation") assert Acl.no_account_creation("192.168.1.1") end def test_no_account_creation_by_domain - assert !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