<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[32638] trunk/tests/phpunit/tests: Improve tests for `is_email_address_unsafe()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/32638">32638</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/32638","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-05-28 16:05:30 +0000 (Thu, 28 May 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Improve tests for `is_email_address_unsafe()`.
* Move to a separate file for better organization and method names.
* Use a `dataProvider` when appropriate, for better readability.
* Add a test for splitting the banned domain list on line breaks.
See <a href="https://core.trac.wordpress.org/ticket/20459">#20459</a>, <a href="https://core.trac.wordpress.org/ticket/21730">#21730</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsmultisitephp">trunk/tests/phpunit/tests/multisite.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestsmultisiteisEmailAddressUnsafephp">trunk/tests/phpunit/tests/multisite/isEmailAddressUnsafe.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsphpunittestsmultisiteisEmailAddressUnsafephp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/tests/phpunit/tests/multisite/isEmailAddressUnsafe.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite/isEmailAddressUnsafe.php (rev 0)
+++ trunk/tests/phpunit/tests/multisite/isEmailAddressUnsafe.php 2015-05-28 16:05:30 UTC (rev 32638)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,121 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+
+/**
+ * @group multisite
+ */
+class Tests_Multisite_IsEmailAddressUnsafe extends WP_UnitTestCase {
+ public function test_string_domain_list_should_be_split_on_line_breaks() {
+ update_site_option( 'banned_email_domains', "foo.com\nbar.org\nbaz.gov" );
+ $this->assertTrue( is_email_address_unsafe( 'foo@bar.org' ) );
+ $this->assertFalse( is_email_address_unsafe( 'foo@example.org' ) );
+ }
+
+ /**
+ * @dataProvider data_unsafe
+ * @ticket 25046
+ * @ticket 21570
+ */
+ public function test_unsafe_emails( $banned, $email ) {
+ update_site_option( 'banned_email_domains', $banned );
+ $this->assertTrue( is_email_address_unsafe( $email ) );
+ }
+
+ /**
+ * @dataProvider data_safe
+ * @ticket 25046
+ * @ticket 21570
+ */
+ public function test_safe_emails( $banned, $email ) {
+ update_site_option( 'banned_email_domains', $banned );
+ $this->assertFalse( is_email_address_unsafe( $email ) );
+ }
+
+ public function data_unsafe() {
+ return array(
+ // 25046
+ 'case_insensitive_1' => array(
+ array( 'baR.com' ),
+ 'test@Bar.com',
+ ),
+ 'case_insensitive_2' => array(
+ array( 'baR.com' ),
+ 'tEst@bar.com',
+ ),
+ 'case_insensitive_3' => array(
+ array( 'barfoo.COM' ),
+ 'test@barFoo.com',
+ ),
+ 'case_insensitive_4' => array(
+ array( 'baR.com' ),
+ 'tEst@foo.bar.com',
+ ),
+ 'case_insensitive_5' => array(
+ array( 'BAZ.com' ),
+ 'test@baz.Com',
+ ),
+
+
+ // 21570
+ array(
+ array( 'bar.com', 'foo.co' ),
+ 'test@bar.com',
+ ),
+ 'subdomain_1' => array(
+ array( 'bar.com', 'foo.co' ),
+ 'test@foo.bar.com',
+ ),
+ array(
+ array( 'bar.com', 'foo.co' ),
+ 'test@foo.co',
+ ),
+ 'subdomain_2' => array(
+ array( 'bar.com', 'foo.co' ),
+ 'test@subdomain.foo.co',
+ ),
+ );
+ }
+
+ public function data_safe() {
+ return array(
+ // 25046
+ array(
+ array( 'baR.com', 'Foo.co', 'barfoo.COM', 'BAZ.com' ),
+ 'test@Foobar.com',
+ ),
+ array(
+ array( 'baR.com', 'Foo.co', 'barfoo.COM', 'BAZ.com' ),
+ 'test@Foo-bar.com',
+ ),
+ array(
+ array( 'baR.com', 'Foo.co', 'barfoo.COM', 'BAZ.com' ),
+ 'tEst@foobar.com',
+ ),
+ array(
+ array( 'baR.com', 'Foo.co', 'barfoo.COM', 'BAZ.com' ),
+ 'test@Subdomain.Foo.com',
+ ),
+ array(
+ array( 'baR.com', 'Foo.co', 'barfoo.COM', 'BAZ.com' ),
+ 'test@feeBAz.com',
+ ),
+
+ // 21570
+ array(
+ array( 'bar.com', 'foo.co' ),
+ 'test@foobar.com',
+ ),
+ array(
+ array( 'bar.com', 'foo.co' ),
+ 'test@foo-bar.com',
+ ),
+ array(
+ array( 'bar.com', 'foo.co' ),
+ 'test@foo.com',
+ ),
+ array(
+ array( 'bar.com', 'foo.co' ),
+ 'test@subdomain.foo.com',
+ ),
+ );
+ }
+}
</ins></span></pre></div>
<a id="trunktestsphpunittestsmultisitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/multisite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/multisite.php 2015-05-28 15:50:34 UTC (rev 32637)
+++ trunk/tests/phpunit/tests/multisite.php 2015-05-28 16:05:30 UTC (rev 32638)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,37 +36,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $reg_blog = $wpdb->get_col( "SELECT email FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.blog_id = 1 AND IP LIKE '" . $ip . "'" );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $user->user_email, $reg_blog[ count( $reg_blog )-1 ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- /**
- * @ticket 21570
- */
- function test_aggressiveness_of_is_email_address_unsafe() {
- update_site_option( 'banned_email_domains', array( 'bar.com', 'foo.co' ) );
-
- foreach ( array( 'test@bar.com', 'test@foo.bar.com', 'test@foo.co', 'test@subdomain.foo.co' ) 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 ) {
- $this->assertFalse( is_email_address_unsafe( $email_address ), "$email_address should be SAFE" );
- }
- }
-
- /**
- * @ticket 25046
- */
- function test_case_sensitivity_of_is_email_address_unsafe() {
- update_site_option( 'banned_email_domains', array( 'baR.com', 'Foo.co', 'barfoo.COM', 'BAZ.com' ) );
-
- foreach ( array( 'test@Bar.com', 'tEst@bar.com', 'test@barFoo.com', 'tEst@foo.bar.com', 'test@baz.Com' ) 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@foobar.com', 'test@Subdomain.Foo.com', 'test@fooBAz.com' ) as $email_address ) {
- $this->assertFalse( is_email_address_unsafe( $email_address ), "$email_address should be SAFE" );
- }
-
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span></span></pre>
</div>
</div>
</body>
</html>