From 8d9d02bf9f4a9c54b12ee8b01f61a03e4275c704 Mon Sep 17 00:00:00 2001 From: Ollie Read Date: Tue, 4 Feb 2025 11:07:18 +0000 Subject: [PATCH] Fix tests --- tests/Database/DatabaseEloquentBuilderTest.php | 3 +++ tests/Database/DatabaseEloquentModelTest.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/Database/DatabaseEloquentBuilderTest.php b/tests/Database/DatabaseEloquentBuilderTest.php index a84cd851eb0e..6f511a3808aa 100755 --- a/tests/Database/DatabaseEloquentBuilderTest.php +++ b/tests/Database/DatabaseEloquentBuilderTest.php @@ -1031,6 +1031,7 @@ public function testNestedWhere() $nestedQuery = m::mock(Builder::class); $nestedRawQuery = $this->getMockQueryBuilder(); $nestedQuery->shouldReceive('getQuery')->once()->andReturn($nestedRawQuery); + $nestedQuery->shouldReceive('getEagerLoads')->once()->andReturn([]); $model = $this->getMockModel()->makePartial(); $model->shouldReceive('newQueryWithoutRelationships')->once()->andReturn($nestedQuery); $builder = $this->getBuilder(); @@ -1092,6 +1093,7 @@ public function testWhereNot() $nestedQuery = m::mock(Builder::class); $nestedRawQuery = $this->getMockQueryBuilder(); $nestedQuery->shouldReceive('getQuery')->once()->andReturn($nestedRawQuery); + $nestedQuery->shouldReceive('getEagerLoads')->once()->andReturn([]); $model = $this->getMockModel()->makePartial(); $model->shouldReceive('newQueryWithoutRelationships')->once()->andReturn($nestedQuery); $builder = $this->getBuilder(); @@ -1120,6 +1122,7 @@ public function testOrWhereNot() $nestedQuery = m::mock(Builder::class); $nestedRawQuery = $this->getMockQueryBuilder(); $nestedQuery->shouldReceive('getQuery')->once()->andReturn($nestedRawQuery); + $nestedQuery->shouldReceive('getEagerLoads')->once()->andReturn([]); $model = $this->getMockModel()->makePartial(); $model->shouldReceive('newQueryWithoutRelationships')->once()->andReturn($nestedQuery); $builder = $this->getBuilder(); diff --git a/tests/Database/DatabaseEloquentModelTest.php b/tests/Database/DatabaseEloquentModelTest.php index 6ff1dd8b202b..470164cfeec8 100755 --- a/tests/Database/DatabaseEloquentModelTest.php +++ b/tests/Database/DatabaseEloquentModelTest.php @@ -720,7 +720,7 @@ public function testWithWhereHasWithSpecificColumns() public function testWithWhereHasWorksInNestedQuery() { $model = new EloquentModelWithWhereHasStub; - $instance = $model->newInstance()->newQuery()->with(fn ($q) => $q->withWhereHas('foo:diaa,fares')); + $instance = $model->newInstance()->newQuery()->where(fn (Builder $q) => $q->withWhereHas('foo:diaa,fares')); $builder = m::mock(Builder::class); $builder->shouldReceive('select')->once()->with(['diaa', 'fares']); $this->assertNotNull($instance->getEagerLoads()['foo']);