Ticket #15706: 15706.3.unit-tests.patch

tests/ms.php

@@ -525 +525 @@
 
         /**
          * Test fetching a blog that doesn't exist and again after it exists.
-         * 
+         *
          * @ticket 23405
          */
         function test_get_blog_details_blog_does_not_exist() {
@@ -828 +828 @@
          * @ticket 21570
          */
         function test_is_email_address_unsafe() {
-                update_site_option( 'banned_email_domains', array( 'bar.com', 'foo.co' ) );
+                update_site_option( 'banned_email_domains', array( 'bar.com', 'foo.co', '*.foo.org', 'foo.*.gov' ) );
 
-                foreach ( array( 'test@bar.com', 'test@foo.bar.com', 'test@foo.co', 'test@subdomain.foo.co' ) as $email_address ) {
+                foreach ( array( 'test@bar.com', 'test@foo.bar.com', 'test@foo.co', 'test@subdomain.foo.co', 'test@bar.foo.org', 'test@foo.bar.gov' ) as $email_address ) {
                         $this->assertTrue( is_email_address_unsafe( $email_address ), "$email_address should be UNSAFE" );
                 }
 
-                foreach ( array( 'test@foobar.com', 'test@foo-bar.com', 'test@foo.com', 'test@subdomain.foo.com' ) as $email_address ) {
+                foreach ( array( 'test@foobar.com', 'test@foo-bar.com', 'test@foo.com', 'test@subdomain.foo.com', 'test@bar.baz.foo.org', 'test@foo.bar.baz.gov' ) as $email_address ) {
                         $this->assertFalse( is_email_address_unsafe( $email_address ), "$email_address should be SAFE" );
                 }
         }
 
+        function test_is_email_address_allowed() {
+                update_site_option( 'limited_email_domains', array( 'bar.com', 'foo.co', '*.foo.org', 'foo.*.gov' ) );
+
+                foreach ( array( 'test@bar.com', 'test@foo.bar.com', 'test@foo.co', 'test@subdomain.foo.co', 'test@bar.foo.org', 'test@foo.bar.gov' ) as $email_address ) {
+                        $this->assertTrue( is_email_address_allowed( $email_address ), "$email_address should be UNSAFE" );
+                }
+
+                foreach ( array( 'test@foobar.com', 'test@foo-bar.com', 'test@foo.com', 'test@subdomain.foo.com', 'test@bar.baz.foo.org', 'test@foo.bar.baz.gov' ) as $email_address ) {
+                        $this->assertFalse( is_email_address_allowed( $email_address ), "$email_address should be SAFE" );
+                }
+
+                update_site_option( 'limited_email_domains', '' );
+
+                foreach ( array( 'test@foobar.com', 'test@foo-bar.com', 'test@foo.com', 'test@subdomain.foo.com', 'test@bar.baz.foo.org', 'test@foo.bar.baz.gov' ) as $email_address ) {
+                        $this->assertTrue( is_email_address_allowed( $email_address ), "$email_address should be SAFE" );
+                }
+        }
+
         /**
          * @ticket 21552
          * @ticket 23418
@@ -998 +1016 @@
                         'user_login' => $spam_username,
                 ) );
                 update_user_status( $spam_user_id, 'spam', '1' );
-                
+
                 $this->assertTrue( is_user_spammy( $spam_username ) );
                 $this->assertFalse( is_user_spammy( 'testuser1' ) );
         }