sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add expectedIncorrectUsage flags for unit tests that generate invalid dates.

Browse Source 
Since [29925], passing an invalid date to WP_Date_Query will generate a
_doing_it_wrong() notice. The current changeset adds the
`@expectedIncorrectUsage` flag to those existing unit tests that generate
invalid dates, such as those that test canonical redirect and is_404()
conditionals.

Fixes #25834.

git-svn-id: https://develop.svn.wordpress.org/trunk@29932 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2014-10-17 00:40:06 +00:00
parent 44bb383371
commit 8692199bb5
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/phpunit/tests/canonical.php
View File

@ -106,7 +106,9 @@ class Tests_Canonical extends WP_UnitTestCase {
/**
* @dataProvider data
*/
function test($test_url, $expected, $ticket = 0) {
function test( $test_url, $expected, $ticket = 0, $expected_doing_it_wrong = array() ) {
$this->expected_doing_it_wrong = array_merge( $this->expected_doing_it_wrong, (array) $expected_doing_it_wrong );
if ( $ticket )
$this->knownWPBug( $ticket );
@ -246,7 +248,7 @@ class Tests_Canonical extends WP_UnitTestCase {
array( '/?year=2008', '/2008/'),
array( '/2012/13/', '/2012/'),
array( '/2012/11/51/', '/2012/11/'),
array( '/2012/11/51/', '/2012/11/', 0, array( 'WP_Date_Query' ) ),
// Authors
array( '/?author=%d', '/author/canonical-author/' ),

3
tests/phpunit/tests/query/conditionals.php
View File

@ -603,6 +603,9 @@ class Tests_Query_Conditionals extends WP_UnitTestCase {
// '[0-9]{4}/[0-9]{1,2}/[0-9]{1,2}/[^/]+/attachment/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?attachment=$matches[1]&feed=$matches[2]',
// '[0-9]{4}/[0-9]{1,2}/[0-9]{1,2}/[^/]+/attachment/([^/]+)/(feed|rdf|rss|rss2|atom)/?$' => 'index.php?attachment=$matches[1]&feed=$matches[2]',
/**
* @expectedIncorrectUsage WP_Date_Query
*/
function test_bad_dates() {
$this->go_to( '/2013/13/13/' );
$this->assertQueryTrue( 'is_404' );

6
tests/phpunit/tests/query/results.php
View File

@ -573,7 +573,13 @@ class Tests_Query_Results extends WP_UnitTestCase {
$this->assertFalse( $this->q->is_day );
$this->assertFalse( $this->q->is_month );
$this->assertTrue( $this->q->is_year );
}
/**
* @ticket 10935
* @expectedIncorrectUsage WP_Date_Query
*/
public function test_query_is_date_with_bad_date() {
$this->q->query( array(
'year' => '2007',
'monthnum' => '01',