mirror of
https://github.com/Oreolek/yii2-nested-sets.git
synced 2024-06-17 07:10:46 +03:00
NestedSetsQueryBehavior::leaf renamed to NestedSetsQueryBehavior::leaves
This commit is contained in:
parent
a79bdc74c0
commit
bfa40bf010
|
@ -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();
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue