Skip to content

Commit

Permalink
Merge pull request #17 from mikimaine/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
mikimaine authored Sep 28, 2016
2 parents b8373f0 + c6bdbed commit 2156dff
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 15 deletions.
3 changes: 0 additions & 3 deletions app/Innovate/Image/InnovateImageUpload.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
*/
namespace Innovate\Image;

use File;
use Intervention\Image\Facades\Image;

/**
Expand Down Expand Up @@ -75,8 +74,6 @@ public function __construct($horizontal = null, $vertical = null)
*/
public function up($image, $path)
{


$this->image = Image::make($image);

return $this->image->resize($this->horizontal, $this->vertical)->save($path);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,9 @@ private function createCategoryStub($input)
isset($input['status']) ? $category['status'] = 1 : $category['status'] = 0;
// isset($input['parent_category']) ? $category->parent_id = $input['parent_category'] : $category->parent_id = null;

if($input['parent_category'] !=''){
$category->parent_id = $input['parent_category'] ;
}else{
if ($input['parent_category'] != '') {
$category->parent_id = $input['parent_category'];
} else {
$category->parent_id = null;
}

Expand Down
5 changes: 1 addition & 4 deletions tests/ProductTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,15 @@

class ProductTest extends TestCase
{


public function testIsInstanceOfProduct()
{
$this->visit('/');
$this->seePageIs('/');
}

/** @test */
public function it_fetches_lessons()
{


return true;
}

Expand Down
9 changes: 4 additions & 5 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,19 @@ public function createApplication()
{
$app = require __DIR__.'/../bootstrap/app.php';
$app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap();

return $app;
}

public function testIsInstanceOfProduct()
{
$this->visit($this->baseUrl);
$came = array('hellos'=>'come');
return $this->assertArrayHasKey('hello',$came);
$came = ['hellos' => 'come'];

return $this->assertArrayHasKey('hello', $came);
}

public function testIfSomeThing()
{

}


}

0 comments on commit 2156dff

Please sign in to comment.