Update MY_Model::delete tests for 6682478

Changes to the delete methods in
6682478 resulted in failures in the
tests. Since the tests did not break based on the function results, I've
updated the tests to reflect the changes in the model.

One item I did not fix is that the tests don't handle method chaining on
$this->db properly, so the tests error out when they encounter any use
of this feature.

Author: mwhitneysdsu

tests/bonfire/core/MY_Model_test.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once (TESTS_DIR .'_support/database.php');
+require_once(TESTS_DIR . '_support/database.php');
 //require (APPPATH .'core/MY_Model.php');
 
 class MY_Model_test extends CI_UnitTestCase {
@@ -184,7 +184,8 @@ public function test_update_where()
 
     public function test_delete_without_soft_deletes()
     {
-        $this->model->db->expectOnce('delete', array('records_table', array('id' => 1)));
+        $this->model->db->expectOnce('where', array('id', 1));
+        $this->model->db->expectOnce('delete', array('records_table'));
         $this->model->db->returns('delete', TRUE);
 
         $this->assertTrue( $this->model->soft_delete(false)->delete(1) );
@@ -205,7 +206,7 @@ public function test_delete_with_soft_deletes()
 
     public function test_delete_where_without_soft_deletes()
     {
-        $this->model->db->expectOnce('where', array('userid', 5));
+        $this->model->db->expectOnce('where', array(array('userid' => 5)));
         $this->model->db->expectOnce('delete', array('records_table'));
         $this->model->db->returns('affected_rows', 1);
         $this->model->db->returns('delete', TRUE);
@@ -217,7 +218,7 @@ public function test_delete_where_without_soft_deletes()
 
     public function test_delete_where_with_soft_deletes()
     {
-        $this->model->db->expectOnce('where', array('userid', 5));
+        $this->model->db->expectOnce('where', array(array('userid' => 5)));
         $this->model->db->expectOnce('update', array('records_table', array('deleted' => 1)));
         $this->model->db->returns('affected_rows', 1);
         $this->model->db->returns('update', TRUE);