cvs: pearweb /tests/site/account-request-confirm.php test_account_election_request_deleted.phpt

dufuz Sun Feb 10 22:57:33 2008 UTC Modified files: /pearweb/tests/site/account-request-confirm.php test_account_election_request_deleted.phpt Log: Update test to work, still doesn't really pass the test run but I suspect it's because of some silly expectf thing going on that I can't figure out atm. http://cvs.php.net/viewvc.cgi/pearweb/tests/site/account-request-confirm.php/test_account_election_request_deleted.phpt?r1=1.2&r2=1.3&diff_format=u Index: pearweb/tests/site/account-request-confirm.php/test_account_election_request_deleted.phpt diff -u pearweb/tests/site/account-request-confirm.php/test_account_election_request_deleted.phpt:1.2 pearweb/tests/site/account-request-confirm.php/test_account_election_request_deleted.phpt:1.3 --- pearweb/tests/site/account-request-confirm.php/test_account_election_request_deleted.phpt:1.2 Fri Jun 15 01:36:49 2007 +++ pearweb/tests/site/account-request-confirm.php/test_account_election_request_deleted.phpt Sun Feb 10 22:57:33 2008 @@ -13,7 +13,7 @@ $_SERVER['QUERY_STRING'] = ''; require dirname(__FILE__) . '/setup.php.inc'; -$time = gmdate('Y-m-d H:i', strtotime('-15 minutes')); +$time = gmdate('Y-m-d', strtotime('-1 day')); $mock->addDeleteQuery("DELETE FROM election_account_request WHERE created_on < '" . $time . "'", array(), array()); @@ -24,7 +24,7 @@ $mock->addDataQuery("SELECT id, created_on, salt, handle FROM election_account_request - WHERE salt='12345678901234567890123456789012'", + WHERE salt = '12345678901234567890123456789012'", array(array( 'id' => 1, 'created_on' => gmdate('Y-m-d H:i', strtotime('-10 minutes')), @@ -33,7 +33,7 @@ )), array('id', 'created_on', 'salt', 'handle')); -$mock->addDataQuery("SELECT * FROM users WHERE handle = 'helgi' AND registered = '0'", array(), array()); +$mock->addDataQuery("SELECT * FROM users WHERE handle = 'helgi'", array(), array()); include dirname(dirname(dirname(dirname(__FILE__)))) . '/public_html/account-request-confirm.php'; @@ -43,9 +43,9 @@ 2 => " SELECT id, created_on, salt, handle FROM election_account_request - WHERE salt='12345678901234567890123456789012' + WHERE salt = '12345678901234567890123456789012' ", - 3 => 'SELECT * FROM users WHERE handle = \'helgi\' AND registered = \'0\'', + 3 => 'SELECT * FROM users WHERE handle = \'helgi\'', ), $mock->queries, 'queries'); __halt_compiler(); ?> @@ -56,12 +56,12 @@ %s <!-- START MAIN CONTENT --> - <td class="content"> + <div id="body"> - <h1>Confirm Account</h1><div class="errors">ERROR:<ul><li>Error - user request was deleted, please try again</li> +<h1>Confirm Account</h1><div class="errors">ERROR:<ul><li>Error - user request was deleted, please try again</li> </ul></div> - </td> + </div> <!-- END MAIN CONTENT --> %s \ No newline at end of file