diff --git a/travis/Tests/DatabaseTest.php b/travis/Tests/DatabaseTest.php index 01fad4e69..623168821 100644 --- a/travis/Tests/DatabaseTest.php +++ b/travis/Tests/DatabaseTest.php @@ -3,7 +3,6 @@ class DatabaseTest extends PHPUnit_Framework_TestCase { public function testDb() { $c = c::db()->get('select * from config limit 1')->get(0); - // TODO: travis fix it - // $this->assertTrue($c->id_config ? true : false); + $this->assertTrue($c->id_config ? true : false); } } \ No newline at end of file diff --git a/travis/Tests/OrderTest.php b/travis/Tests/OrderTest.php index 9cbcd979a..0a5d3ee4a 100644 --- a/travis/Tests/OrderTest.php +++ b/travis/Tests/OrderTest.php @@ -109,9 +109,9 @@ class OrderTest extends PHPUnit_Framework_TestCase { 'phone' => $this->user->phone, 'name' => $this->user->name, 'cart' => [ [ 'id' => $this->id_dish1->id_dish ], - [ 'id' => $this->id_dish2->id_dish ], - [ 'id' => $this->id_dish3->id_dish ], - [ 'id' => $this->id_dish4->id_dish ] ], + [ 'id' => $this->id_dish2->id_dish ], + [ 'id' => $this->id_dish3->id_dish ], + [ 'id' => $this->id_dish4->id_dish ] ], 'pay_type' => 'cash', 'delivery_type' => 'delivery', 'restaurant' => $this->restaurant->id_restaurant, @@ -127,7 +127,7 @@ class OrderTest extends PHPUnit_Framework_TestCase { $charge = $order->process($_POST); $this->id_order = $order->id_order; - echo '
';var_dump( $charge ); + echo '';var_dump( $_POST, $charge ); $this->assertTrue($charge === true); return $order;