Skip to content

Commit 64798b5

Browse files
stevebaumanstevebauman
committed
Fix various tests
1 parent e991b2c commit 64798b5

File tree

8 files changed

+24
-27
lines changed

8 files changed

+24
-27
lines changed

‎tests/Unit/Models/ModelQueryTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function test_new_query_without_scopes()
5757
$query = $model->newQueryWithoutScopes();
5858

5959
$this->assertEquals($model, $query->getModel());
60-
$this->assertEquals(['and' => [], 'or' => [], 'raw' => []], $query->filters);
60+
$this->assertEquals(['and' => [], 'or' => [], 'raw' => []], $query->getQuery()->filters);
6161
}
6262

6363
public function test_new_query_has_connection_base_dn()

‎tests/Unit/Models/ModelRelationTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function test_query_has_no_filters()
6464
{
6565
$this->assertEquals(
6666
['and' => [], 'or' => [], 'raw' => []],
67-
(new ModelRelationTestStub)->relation()->getQuery()->filters
67+
(new ModelRelationTestStub)->relation()->getQuery()->getQuery()->filters
6868
);
6969
}
7070

@@ -209,7 +209,7 @@ public function test_parent_model_scope_is_removed_from_relation_query()
209209

210210
$query = $relation->getRelationQuery();
211211

212-
$executedQuery = $query->getQuery();
212+
$executedQuery = $query->getQuery()->getQuery();
213213

214214
$this->assertEmpty($query->appliedScopes());
215215
$this->assertEquals([ModelRelationScopeTestStub::class], $query->removedScopes());
@@ -231,7 +231,7 @@ public function test_has_many_foreign_values_are_properly_escaped_for_use_in_fil
231231

232232
$this->assertEquals(
233233
"(foo=$expected)",
234-
$model->relation()->getRelationQuery()->getQuery()
234+
$model->relation()->getRelationQuery()->getQuery()->getQuery()
235235
);
236236
}
237237

‎tests/Unit/Models/ModelScopeTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ protected static function boot(): void
157157

158158
public function newQueryBuilder(Connection $connection): Builder
159159
{
160-
return new ModelBuilderTestStub($connection);
160+
return new ModelBuilderTestStub($this, $connection->query());
161161
}
162162
}
163163

‎tests/Unit/Models/OpenLDAP/ModelTest.php‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use LdapRecord\Connection;
66
use LdapRecord\Container;
77
use LdapRecord\Models\OpenLDAP\Entry;
8-
use LdapRecord\Models\OpenLDAP\Scopes\AddEntryUuidToSelects;
98
use LdapRecord\Tests\TestCase;
109

1110
class ModelTest extends TestCase
@@ -25,10 +24,7 @@ public function test_entry_uuid_is_always_added_to_select_list_with_asterisk_whe
2524

2625
$query = $model->newQuery();
2726

28-
$query->getQuery();
29-
3027
$this->assertEquals([$model->getGuidKey(), '*'], $query->getSelects());
31-
$this->assertInstanceOf(AddEntryUuidToSelects::class, $query->appliedScopes()[AddEntryUuidToSelects::class]);
3228
}
3329

3430
public function test_entry_uuid_is_added_to_a_select_list_without_asterisk_when_selects_have_been_added()
@@ -37,11 +33,8 @@ public function test_entry_uuid_is_added_to_a_select_list_without_asterisk_when_
3733

3834
$model = new Entry;
3935

40-
$query = $model->newQuery()->select(['foo']);
41-
42-
$query->getQuery();
36+
$query = $model->newQuery()->select('foo');
4337

4438
$this->assertEquals([$model->getGuidKey(), 'foo', 'objectclass'], $query->getSelects());
45-
$this->assertInstanceOf(AddEntryUuidToSelects::class, $query->appliedScopes()[AddEntryUuidToSelects::class]);
4639
}
4740
}

‎tests/Unit/Query/BuilderCacheTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ public function test_cache_key_generation_connects_to_server_when_not_connected(
6969
$host,
7070
$query->getType(),
7171
$query->getDn(),
72-
$query->getQuery(),
72+
$query->getUnescapedQuery(),
7373
implode($query->getSelects()),
74-
$query->limit,
75-
$query->paginated,
74+
$query->getQuery()->limit,
75+
$query->getQuery()->paginated,
7676
]));
7777

7878
$cache->shouldReceive('get')->with($expectedKey)->andReturn([]);

‎tests/Unit/Query/BuilderTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public function test_select_array()
5151
{
5252
$b = $this->newBuilder();
5353

54-
$b->select(['testing']);
54+
$b->select('testing');
5555

5656
$this->assertEquals([
5757
'testing',

‎tests/Unit/Query/Model/ActiveDirectoryTest.php‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use LdapRecord\Connection;
66
use LdapRecord\Models\ActiveDirectory\Entry;
7+
use LdapRecord\Query\Builder;
78
use LdapRecord\Query\Model\ActiveDirectoryBuilder;
89
use LdapRecord\Testing\LdapFake;
910
use LdapRecord\Tests\TestCase;
@@ -12,7 +13,9 @@ class ActiveDirectoryTest extends TestCase
1213
{
1314
protected function newBuilder(): ActiveDirectoryBuilder
1415
{
15-
return (new ActiveDirectoryBuilder(new Connection([], new LdapFake)))->setModel(new Entry);
16+
return new ActiveDirectoryBuilder(
17+
new Entry, new Builder(new Connection([], new LdapFake))
18+
);
1619
}
1720

1821
public function test_where_member_of()
@@ -21,7 +24,7 @@ public function test_where_member_of()
2124

2225
$b->whereMemberOf('cn=Accounting,dc=org,dc=acme', $nested = false);
2326

24-
$where = $b->filters['and'][0];
27+
$where = $b->getQuery()->filters['and'][0];
2528

2629
$this->assertEquals('memberof', $where['field']);
2730
$this->assertEquals('=', $where['operator']);
@@ -35,7 +38,7 @@ public function test_where_member_of_nested()
3538

3639
$b->whereMemberOf('cn=Accounting,dc=org,dc=acme', $nested = true);
3740

38-
$where = $b->filters['and'][0];
41+
$where = $b->getQuery()->filters['and'][0];
3942

4043
$this->assertEquals('memberof:1.2.840.113556.1.4.1941:', $where['field']);
4144
$this->assertEquals('=', $where['operator']);
@@ -50,7 +53,7 @@ public function test_or_where_member_of()
5053
$b->orWhereEquals('cn', 'John Doe');
5154
$b->orWhereMemberOf('cn=Accounting,dc=org,dc=acme', $nested = false);
5255

53-
$where = $b->filters['or'][1];
56+
$where = $b->getQuery()->filters['or'][1];
5457

5558
$this->assertEquals('memberof', $where['field']);
5659
$this->assertEquals('=', $where['operator']);
@@ -68,7 +71,7 @@ public function test_or_where_member_of_nested()
6871
$b->orWhereEquals('cn', 'John Doe');
6972
$b->orWhereMemberOf('cn=Accounting,dc=org,dc=acme', $nested = true);
7073

71-
$where = $b->filters['or'][1];
74+
$where = $b->getQuery()->filters['or'][1];
7275

7376
$this->assertEquals('memberof:1.2.840.113556.1.4.1941:', $where['field']);
7477
$this->assertEquals('=', $where['operator']);

‎tests/Unit/Query/Model/BuilderScopeTest.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use LdapRecord\Models\Entry;
77
use LdapRecord\Models\Model;
88
use LdapRecord\Models\Scope;
9+
use LdapRecord\Query\Builder as QueryBuilder;
910
use LdapRecord\Query\Model\Builder;
1011
use LdapRecord\Tests\TestCase;
1112
use Mockery as m;
@@ -15,7 +16,7 @@ class BuilderScopeTest extends TestCase
1516
{
1617
public function test_closure_scopes_can_be_applied()
1718
{
18-
$b = new Builder(new Connection);
19+
$b = new Builder(new Entry, new QueryBuilder(new Connection));
1920

2021
$b->withGlobalScope('foo', function ($query) use ($b) {
2122
$this->assertSame($b, $query);
@@ -26,7 +27,7 @@ public function test_closure_scopes_can_be_applied()
2627

2728
public function test_class_scopes_can_be_applied()
2829
{
29-
$b = new Builder(new Connection);
30+
$b = new Builder(new Entry, new QueryBuilder(new Connection));
3031

3132
$b->setModel(new Entry);
3233

@@ -40,7 +41,7 @@ public function test_class_scopes_can_be_applied()
4041

4142
public function test_scopes_can_be_removed_after_being_added()
4243
{
43-
$b = new Builder(new Connection);
44+
$b = new Builder(new Entry, new QueryBuilder(new Connection));
4445

4546
$b->withGlobalScope('foo', function () {});
4647

@@ -51,7 +52,7 @@ public function test_scopes_can_be_removed_after_being_added()
5152

5253
public function test_many_scopes_can_be_removed_after_being_applied()
5354
{
54-
$b = new Builder(new Connection);
55+
$b = new Builder(new Entry, new QueryBuilder(new Connection));
5556

5657
$b->withGlobalScope('foo', function () {});
5758
$b->withGlobalScope('bar', function () {});
@@ -74,7 +75,7 @@ public function test_scopes_are_applied_when_getting_records()
7475
];
7576
}))->andReturn([]);
7677

77-
$b = new Builder($connection);
78+
$b = new Builder(new Entry, new QueryBuilder($connection));
7879
$b->setModel(new Entry);
7980

8081
$b->withGlobalScope('foo', function ($query) {

0 commit comments

Comments
 (0)