Merge remote-tracking branch 'upstream/pull/2450'

[rails.git] / test / models / acl_test.rb

diff --git a/test/models/acl_test.rb b/test/models/acl_test.rb
index 189f92677019bae19f1f7c557563b64f243ae668..ad17fc1b0eddcb9fb908196ee88188955ab3db1d 100644 (file)
--- a/test/models/acl_test.rb
+++ b/test/models/acl_test.rb
@@ -5,18 +5,24 @@ class AclTest < ActiveSupport::TestCase
     acl = create(:acl)
     assert acl.valid?
     acl.k = nil
     acl = create(:acl)
     assert acl.valid?
     acl.k = nil

-    assert !acl.valid?
+    assert_not acl.valid?

   end
 
   def test_no_account_creation_by_subnet
   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
     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")

     create(:acl, :domain => "example.com", :k => "no_account_creation")
     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")
+  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
   end
 end