timw4mail/tims-todo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tweak fixtures loading

Browse Source
This commit is contained in:
Timothy Warren 2014-08-13 10:38:00 -04:00
parent d4bd73d263
commit 8400ee2a5c
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/third_party/CIUnit/libraries/Fixture.php vendored
View File

@ -48,8 +48,8 @@ class Fixture {
{
$this->_assign_db();
$Q = TRUE;
//$Q = $this->CI->db->simple_query('truncate table ' . $table . ';');
//$Q = TRUE;
$Q = $this->CI->db->simple_query('TRUNCATE TABLE ' . $table . ' CASCADE;');
if (!$Q) {
echo $this->CI->db->call_function('error', $this->CI->db->conn_id);

9
tests/models/FriendModelTest.php
View File

@ -4,6 +4,8 @@ class FriendModelTest extends Todo_TestCase {
protected $tables = array(
'todo_status' => 'todo_status',
'todo_priority' => 'todo_priority',
'todo_user' => 'todo_user',
'todo_group' => 'todo_group',
'todo_category' => 'todo_category',
'todo_item' => 'todo_item',
@ -16,13 +18,6 @@ class FriendModelTest extends Todo_TestCase {
parent::setUp();
$this->CI->load->model('friend_model');
$this->create_session();
// Reset database data for each test
$this->dbfixt(
'todo_user',
'todo_group',
'todo_group_users_link',
'todo_user_friend_link'
);
}
public function testGetFriends()

3
tests/models/TaskModelTest.php
View File

@ -9,7 +9,9 @@ class TaskModelTest extends Todo_TestCase {
*/
protected $tables = array(
'todo_group' => 'todo_group',
'todo_status' => 'todo_status',
'todo_category' => 'todo_category',
'todo_priority' => 'todo_priority',
'todo_user' => 'todo_user',
'todo_item' => 'todo_item',
'todo_checklist' => 'todo_checklist',
@ -18,7 +20,6 @@ class TaskModelTest extends Todo_TestCase {
'todo_group_task_link' => 'todo_group_task_link',
'todo_user_task_link' => 'todo_user_task_link',
'todo_reminder' => 'todo_reminder',
);
public function setUp()