Skip to content

Commit

Permalink
Apply fixes from StyleCI
Browse files Browse the repository at this point in the history
  • Loading branch information
@poing @StyleCIBot
poing authored and StyleCIBot committed May 29, 2020
1 parent 208b4b8 commit f54356a
Show file tree
Hide file tree
Showing 18 changed files with 315 additions and 397 deletions.
2 changes: 1 addition & 1 deletion src/Baum/SetMapper.php
View file
Expand Up @@ -3,8 +3,8 @@
namespace Baum;

use Closure;
use Illuminate\Support\Contracts\ArrayableInterface;
use Illuminate\Support\Arr;
use Illuminate\Support\Contracts\ArrayableInterface;

class SetMapper
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Main/Cluster/ClusterColumnsTest.php
View file
@@ -1,8 +1,8 @@
<?php

namespace Baum\Tests\Main\Cluster;
use Baum\Tests\Main\UnitAbstract;

use Baum\Tests\Main\UnitAbstract;

class ClusterColumnsTest extends UnitAbstract
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Main/Cluster/ClusterHierarchyTest.php
View file
@@ -1,8 +1,8 @@
<?php

namespace Baum\Tests\Main\Cluster;
use Baum\Tests\Main\UnitAbstract;

use Baum\Tests\Main\UnitAbstract;

class ClusterHierarchyTest extends UnitAbstract
{
Expand Down
1 change: 1 addition & 0 deletions tests/Main/Cluster/ClusterMovementTest.php
View file
@@ -1,6 +1,7 @@
<?php

namespace Baum\Tests\Main\Cluster;

use Baum\Tests\Main\UnitAbstract;

class ClusterMovementTest extends UnitAbstract
Expand Down
2 changes: 1 addition & 1 deletion tests/Main/Cluster/OrderedClusterHeirarchyTestCase.php
View file
@@ -1,8 +1,8 @@
<?php

namespace Baum\Tests\Main\Cluster;
use Baum\Tests\Main\UnitAbstract;

use Baum\Tests\Main\UnitAbstract;

class OrderedClusterHeirarchyTestCase extends UnitAbstract
{
Expand Down
20 changes: 6 additions & 14 deletions tests/Main/Concerns/NodeModelExtensionsTest.php
View file
@@ -1,24 +1,17 @@
<?php

namespace Baum\Tests\Main\Concerns;

//use Baum\Tests\Main\UnitAbstract;
//use Orchestra\Testbench\TestCase;

use Baum\Tests\Main\Models\Category;
use Baum\Tests\Main\Models\ScopedCategory;
use Baum\Tests\Main\Models\MultiScopedCategory;
use Baum\Tests\Main\Models\OrderedCategory;
use Baum\Tests\Main\Models\OrderedScopedCategory;
use Baum\Tests\Main\Models\ScopedCategory;
use Baum\Tests\Main\Models\SoftCategory;

use Baum\Tests\Main\Models\Cluster;
use Baum\Tests\Main\Models\ScopedCluster;
use Baum\Tests\Main\Models\OrderedCluster;
use Baum\Tests\Main\Models\SoftCluster;

use Baum\Tests\Main\Support\PopulateData;


trait NodeModelExtensionsTest
{
protected function categories($name, $className = Category::class)
Expand Down Expand Up @@ -119,18 +112,17 @@ public function testReloadResetsChangesOnDeletedNodes()
$this->assertEquals('Some node', $node->name);
}


// public function testReloadThrowsExceptionIfNodeCannotBeLocated()
// {
// $build = Category::buildTree(PopulateData::basicTree());
//
// $build = Category::buildTree(PopulateData::basicTree());
//
// $node = Category::create(['name' => 'Some node']);
// $this->expectException($node->getKey());
//
//
// $node->delete();
// $this->expectException($this->categories('Some node'));
// $this->assertFalse($node->exists);
//
//
// // Fake persisted state, reload & expect failure
// $node->exists = true;
// $node->reload();
Expand Down
2 changes: 0 additions & 2 deletions tests/Main/OrderedCategoryTestCase.php
View file
@@ -1,7 +1,5 @@
<?php



class OrderedCategoryTestCase extends BaumTestCase
{
public function setUp()
Expand Down
3 changes: 0 additions & 3 deletions tests/Main/OrderedClusterTestCase.php
View file
@@ -1,8 +1,5 @@
<?php

use Orchestra\Testbench\TestCase;


class OrderedClusterTestCase extends BaumTestCase
{
public function setUp()
Expand Down
1 change: 0 additions & 1 deletion tests/Main/QueryBuilderExtensionTest.php
View file
@@ -1,7 +1,6 @@
<?php

namespace Baum\Tests\Main;
use Baum\Tests\Main\UnitAbstract;

class QueryBuilderExtensionTest extends UnitAbstract
{
Expand Down
37 changes: 14 additions & 23 deletions tests/Main/Standard/CategoryColumnsTest.php
View file
Expand Up @@ -2,21 +2,13 @@

namespace Baum\Tests\Main\Standard;

use Baum\Tests\Main\Concerns\NodeModelExtensionsTest;
use Baum\Tests\Main\Models\Category;
use Baum\Tests\Main\Models\ScopedCategory;
use Baum\Tests\Main\Models\MultiScopedCategory;
use Baum\Tests\Main\Models\OrderedCategory;
use Baum\Tests\Main\Models\OrderedScopedCategory;
use Baum\Tests\Main\Models\SoftCategory;

use Baum\Tests\Main\Models\Cluster;
use Baum\Tests\Main\Models\ScopedCluster;
use Baum\Tests\Main\Models\OrderedCluster;
use Baum\Tests\Main\Models\SoftCluster;

use Baum\Tests\Main\Models\ScopedCategory;
use Baum\Tests\Main\Support\PopulateData;
use Baum\Tests\Main\UnitAbstract;
use Baum\Tests\Main\Concerns\NodeModelExtensionsTest;

//use Baum\Tests\Suite\Support\Testable;
//use Baum\Tests\Suite\Support\Cast;
Expand All @@ -42,11 +34,11 @@ public function testGetQualifiedParentColumnName()

public function testGetParentId()
{
$build = Category::buildTree(PopulateData::basicTree());
$child = Category::find(6);
$this->assertEquals(4, $child->getRoot()->id);
$build = Category::buildTree(PopulateData::basicTree());

$child = Category::find(6);
$this->assertEquals(4, $child->getRoot()->id);

//$this->assertNull($this->categories('Root 1')->getParentId());

//$this->assertEquals($this->categories('Child 1')->getParentId(), 1);
Expand All @@ -68,7 +60,7 @@ public function testGetQualifiedLeftColumnName()

public function testGetLeft()
{
$build = Category::buildTree(PopulateData::basicTree());
$build = Category::buildTree(PopulateData::basicTree());
// $child = Category::find(3);
$this->assertEquals(4, Category::find(3)->getLeft());
$this->assertEquals(7, Category::find(4)->getLeft());
Expand All @@ -89,11 +81,10 @@ public function testGetQualifiedRightColumnName()

public function testGetRight()
{
$build = Category::buildTree(PopulateData::basicTree());
$build = Category::buildTree(PopulateData::basicTree());
// $child = Category::find(5);
$this->assertEquals(5, Category::find(3)->getRight());
$this->assertEquals(11, Category::find(6)->getRight());

}

public function testGetOrderColumName()
Expand All @@ -111,7 +102,7 @@ public function testGetQualifiedOrderColumnName()
public function testGetOrder()
{
//$category = $this->categories('Root 1');
//$this->assertEquals($category->getOrder(), $category->getLeft());
//$this->assertEquals($category->getOrder(), $category->getLeft());
}

public function testGetOrderColumnNameNonDefault()
Expand All @@ -128,7 +119,7 @@ public function testGetQualifiedOrderColumnNameNonDefault()

public function testGetOrderNonDefault()
{
$build = OrderedCategory::buildTree(PopulateData::basicTree());
$build = OrderedCategory::buildTree(PopulateData::basicTree());
$category = $this->categories('A1', OrderedCategory::class);
$this->assertEquals($category->getOrder(), 'A1');
}
Expand Down Expand Up @@ -174,14 +165,14 @@ public function testIsScoped()

public function testGetOthersAtSameDepth()
{
$build = Category::buildTree(PopulateData::basicTree());
$build = Category::buildTree(PopulateData::basicTree());

$this->assertEquals(1, $this->categories('A1')->getOthersAtSameDepth()->count());
// $this->assertEquals('Root 2', $this->categories('Root 1')->getOthersAtSameDepth()->first()->name);
//
//
// $this->assertEquals(2, $this->categories('Child 1')->getOthersAtSameDepth()->count());
// $this->assertEquals(0, $this->categories('Child 2.1')->getOthersAtSameDepth()->count());
//
//
// $this->assertEquals('Child 2', $this->categories('Child 1')->getOthersAtSameDepth()->get()[0]->name);
// $this->assertEquals('Child 3', $this->categories('Child 1')->getOthersAtSameDepth()->get()[1]->name);
}
Expand Down
43 changes: 15 additions & 28 deletions tests/Main/Standard/CategoryCustomEventsTest.php
View file
Expand Up @@ -2,34 +2,21 @@

namespace Baum\Tests\Main\Standard;

use Baum\Tests\Main\Concerns\NodeModelExtensionsTest;
use Baum\Tests\Main\Models\Category;
use Baum\Tests\Main\Models\ScopedCategory;
use Baum\Tests\Main\Models\MultiScopedCategory;
use Baum\Tests\Main\Models\OrderedCategory;
use Baum\Tests\Main\Models\OrderedScopedCategory;
use Baum\Tests\Main\Models\SoftCategory;

use Baum\Tests\Main\Models\Cluster;
use Baum\Tests\Main\Models\ScopedCluster;
use Baum\Tests\Main\Models\OrderedCluster;
use Baum\Tests\Main\Models\SoftCluster;

use Baum\Tests\Main\Support\PopulateData;
use Baum\Tests\Main\UnitAbstract;
use Baum\Tests\Main\Concerns\NodeModelExtensionsTest;

use Illuminate\Support\Facades\Event;

class CategoryCustomEventsTest extends UnitAbstract
{

use NodeModelExtensionsTest;

public function testMovingEventFired()
{
Event::fake();

$node = Category::create(['name' => 'Child 2']);
$node = Category::create(['name' => 'Child 2']);

//$node = $this->categories('Child 2');

Expand All @@ -43,38 +30,38 @@ public function testMovingEventFired()

public function testMovementEventsFire()
{
// Event::fake();
// Event::fake();

$build = Category::buildTree(PopulateData::basicTree());
$this->assertTrue(Category::isValidNestedSet());
$alpha = Category::find(1);
$bravo = Category::find(4);
$build = Category::buildTree(PopulateData::basicTree());
$this->assertTrue(Category::isValidNestedSet());
$alpha = Category::find(1);
$bravo = Category::find(4);

//$alpha = Category::create(['name' => 'alpha']);
//$bravo = Category::create(['name' => 'bravo']);
//$charlie = Category::create(['name' => 'charlie']);
//$alpha = Category::create(['name' => 'alpha']);
//$bravo = Category::create(['name' => 'bravo']);
//$charlie = Category::create(['name' => 'charlie']);
$alpha->moveToRightOf($bravo);

// Event::assertDispatched('eloquent.moving: '.get_class($node), function ($event, $object) use ($node) {
// return $object->id == $node->id;
// });
//
//
// Event::assertDispatched('eloquent.moved: '.get_class($node), function ($event, $object) use ($node) {
// return $object->id == $node->id;
// });
}

public function testDoesNotMoveWhenReturningFalseFromMoving()
{
$build = Category::buildTree(PopulateData::basicTree());
$build = Category::buildTree(PopulateData::basicTree());
$node = Category::find(2);

Category::moving(function ($node) {
return false;
});

$node->makeRoot();
$node->reload();
$node->makeRoot();
$node->reload();

$this->assertEquals(1, $node->getParentId());
$this->assertEquals(1, $node->getLevel());
Expand All @@ -84,7 +71,7 @@ public function testDoesNotMoveWhenReturningFalseFromMoving()

public function testDoesMoveWhenReturningTrueFromMoving()
{
$build = Category::buildTree(PopulateData::basicTree());
$build = Category::buildTree(PopulateData::basicTree());
$node = Category::find(2);

Category::moving(function ($node) {
Expand Down

0 comments on commit f54356a

Please sign in to comment.