oreolek/yii2-nested-sets
1
0
Fork 0
mirror of https://github.com/Oreolek/yii2-nested-sets.git synced 2024-05-19 01:08:17 +03:00
Code Issues Releases Wiki Activity

NestedSetsQueryBehavior::leaf renamed to NestedSetsQueryBehavior::leaves

Browse source
This commit is contained in:
Alexander Kochetov 2015-01-03 21:16:50 +03:00
parent a79bdc74c0
commit bfa40bf010
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NestedSetsQueryBehavior.php
View file

@ -38,7 +38,7 @@ class NestedSetsQueryBehavior extends Behavior
* Gets the leaf nodes.
* @return \yii\db\ActiveQuery the owner
*/
public function leaf()
public function leaves()
{
$model = new $this->owner->modelClass();
$db = $model->getDb();

12
tests/NestedSetsQueryBehaviorTest.php
View file

@ -39,24 +39,24 @@ class NestedSetsQueryBehaviorTest extends DatabaseTestCase
}
/**
* @covers \creocoder\nestedsets\NestedSetsQueryBehavior::leaf
* @covers \creocoder\nestedsets\NestedSetsQueryBehavior::leaves
*/
public function testLeaf()
public function testLeaves()
{
$dataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/tree.xml');
$this->getDatabaseTester()->setDataSet($dataSet);
$this->getDatabaseTester()->onSetUp();
$models = Tree::find()->leaf()->all();
$models = Tree::find()->leaves()->all();
$dataSet = new ArrayDataSet(['tree' => ArrayHelper::toArray($models)]);
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/tree-query-leaf.xml');
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/tree-query-leaves.xml');
$this->assertDataSetsEqual($expectedDataSet, $dataSet);
$dataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/multiple-roots-tree.xml');
$this->getDatabaseTester()->setDataSet($dataSet);
$this->getDatabaseTester()->onSetUp();
$models = MultipleRootsTree::find()->leaf()->all();
$models = MultipleRootsTree::find()->leaves()->all();
$dataSet = new ArrayDataSet(['multiple_roots_tree' => ArrayHelper::toArray($models)]);
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/multiple-roots-tree-query-leaf.xml');
$expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/multiple-roots-tree-query-leaves.xml');
$this->assertDataSetsEqual($expectedDataSet, $dataSet);
}
}

0
tests/datasets/multiple-roots-tree-query-leaf.xml → tests/datasets/multiple-roots-tree-query-leaves.xml
View file

0
tests/datasets/tree-query-leaf.xml → tests/datasets/tree-query-leaves.xml
View file