Solve conflict in PR #3113
This commit is contained in:
@@ -80,5 +80,52 @@ class TaskValidatorTest extends Base
|
||||
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_due' => '09/11/2017 10:50', 'date_started' => '09/11/2017 11:50'));
|
||||
$this->assertFalse($result[0]);
|
||||
|
||||
// date_due
|
||||
// ISO dates
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_due' => '2017-02-01'));
|
||||
$this->assertTrue($result[0]);
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_due' => '2017-02-01 13:15'));
|
||||
$this->assertTrue($result[0]);
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_due' => '2017-02-01 1:15 pm'));
|
||||
$this->assertFalse($result[0]);
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_due' => '2017_02_01'));
|
||||
$this->assertTrue($result[0]);
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_due' => '2017_02_01 13:15'));
|
||||
$this->assertTrue($result[0]);
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_due' => '2017_02_01 1:15 am'));
|
||||
$this->assertFalse($result[0]);
|
||||
|
||||
// d/m/Y dates
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_due' => '02/01/2017'));
|
||||
$this->assertTrue($result[0]);
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_due' => '02/01/2017 13:15'));
|
||||
$this->assertTrue($result[0]);
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_due' => '02/01/2017 1:15 pm'));
|
||||
$this->assertFalse($result[0]);
|
||||
|
||||
|
||||
// date_started
|
||||
// ISO dates
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_started' => '2017-02-01'));
|
||||
$this->assertTrue($result[0]);
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_started' => '2017-02-01 13:15'));
|
||||
$this->assertTrue($result[0]);
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_started' => '2017-02-01 1:15 pm'));
|
||||
$this->assertFalse($result[0]);
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_started' => '2017_02_01'));
|
||||
$this->assertTrue($result[0]);
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_started' => '2017_02_01 13:15'));
|
||||
$this->assertTrue($result[0]);
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_started' => '2017_02_01 1:15 pm'));
|
||||
$this->assertFalse($result[0]);
|
||||
|
||||
// d/m/Y dates
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_started' => '02/01/2017'));
|
||||
$this->assertTrue($result[0]);
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_started' => '02/01/2017 13:15'));
|
||||
$this->assertTrue($result[0]);
|
||||
$result = $taskValidator->validateCreation(array('project_id' => 1, 'title' => 'test', 'date_started' => '02/01/2017 1:15 pm'));
|
||||
$this->assertFalse($result[0]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user