Add and update tests

Author: stevebauman

tests/Unit/Models/ActiveDirectory/ExchangeDatabaseTest.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace LdapRecord\Tests\Unit\Models\ActiveDirectory;
+
+use LdapRecord\Connection;
+use LdapRecord\Container;
+use LdapRecord\Models\ActiveDirectory\ExchangeDatabase;
+use LdapRecord\Testing\DirectoryFake;
+use LdapRecord\Testing\LdapFake;
+use LdapRecord\Tests\TestCase;
+
+class ExchangeDatabaseTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Container::addConnection(new Connection);
+
+        ExchangeDatabase::clearBootedModels();
+    }
+
+    protected function tearDown(): void
+    {
+        DirectoryFake::tearDown();
+
+        parent::tearDown();
+    }
+
+    public function test_configuration_context_scope_sets_the_query_base_dn()
+    {
+        DirectoryFake::setup()->getLdapConnection()->expect(
+            LdapFake::operation('read')->once()->andReturn([
+                [
+                    'dn' => '',
+                    'configurationNamingContext' => ['CN=Configuration,DC=local,DC=com'],
+                ],
+            ])
+        );
+
+        $this->assertSame(
+            'CN=Configuration,DC=local,DC=com',
+            ExchangeDatabase::query()->toBase()->getDn()
+        );
+    }
+}

tests/Unit/Models/ModelScopeTest.php

@@ -83,7 +83,7 @@ public function test_scopes_are_not_stacked_multiple_times()
         $query->toBase();
         $query->toBase();
 
-        $this->assertEquals('(&(foo=bar))', $query->toBase()->getQuery());
+        $this->assertEquals('(foo=bar)', $query->toBase()->getQuery());
     }
 
     public function test_local_scopes_can_be_called()
@@ -138,11 +138,11 @@ public function test_scopes_do_not_impact_model_find()
 
     public function test_scopes_cannot_be_negated_by_or_clauses()
     {
-        // The scope should be wrapped in its own AND group, so the OR clause
-        // cannot negate it. The filter should be: (&(bypass=...)(&(foo=bar)))
-        // NOT: (|(foo=bar)(bypass=...)) which would allow bypassing the scope
+        // The scope should be composed onto the query using AND, so the OR clause
+        // cannot negate it. The filter should be: (&(bypass=...)(foo=bar))
+        // NOT: (|(foo=bar)(bypass=...)) which would allow bypassing the scope.
         $this->assertEquals(
-            '(&(bypass=\61\74\74\65\6d\70\74)(&(foo=bar)))',
+            '(&(bypass=\61\74\74\65\6d\70\74)(foo=bar))',
             ModelWithGlobalScopeTestStub::query()
                 ->orWhere('bypass', '=', 'attempt')
                 ->toBase()
@@ -154,7 +154,7 @@ public function test_scopes_cannot_be_negated_by_multiple_or_clauses()
     {
         // Scope must remain enforced regardless of OR clauses
         $this->assertEquals(
-            '(&(|(bypass1=\61\74\74\65\6d\70\74\31)(bypass2=\61\74\74\65\6d\70\74\32))(&(foo=bar)))',
+            '(&(|(bypass1=\61\74\74\65\6d\70\74\31)(bypass2=\61\74\74\65\6d\70\74\32))(foo=bar))',
             ModelWithGlobalScopeTestStub::query()
                 ->orWhere('bypass1', '=', 'attempt1')
                 ->orWhere('bypass2', '=', 'attempt2')
@@ -167,7 +167,7 @@ public function test_scopes_remain_enforced_with_complex_queries()
     {
         // The scope (foo=bar) must always be present and enforced at the root AND level
         $this->assertEquals(
-            '(&(&(|(name=\4a\6f\68\6e)(name=\4a\61\6e\65))(active=\74\72\75\65))(&(foo=bar)))',
+            '(&(|(name=\4a\6f\68\6e)(name=\4a\61\6e\65))(active=\74\72\75\65)(foo=bar))',
             ModelWithGlobalScopeTestStub::query()
                 ->where('name', '=', 'John')
                 ->orWhere('name', '=', 'Jane')

tests/Unit/Query/Model/BuilderScopeTest.php

@@ -18,11 +18,16 @@ public function test_closure_scopes_can_be_applied()
     {
         $b = new Builder(new Entry, new QueryBuilder(new Connection));
 
-        $b->withGlobalScope('foo', function ($query) use ($b) {
-            $this->assertSame($b, $query);
+        $scoped = null;
+
+        $b->withGlobalScope('foo', function ($query) use (&$scoped) {
+            $scoped = $query;
         });
 
-        $b->applyScopes();
+        $applied = $b->applyScopes();
+
+        $this->assertNotSame($b, $applied);
+        $this->assertSame($applied, $scoped);
     }
 
     public function test_class_scopes_can_be_applied()
@@ -33,11 +38,54 @@ public function test_class_scopes_can_be_applied()
 
         $b->withGlobalScope('foo', new TestModelScope);
 
-        // Scopes are wrapped in an AndGroup to prevent negation
-        $this->assertEquals('(&(foo=LdapRecord\Models\Entry))', $b->getUnescapedQuery());
+        // Scope filters are composed onto the scoped query builder.
+        $scoped = $b->applyScopes();
+
+        $this->assertEquals('(foo=LdapRecord\Models\Entry)', $scoped->getUnescapedQuery());
+
+        $this->assertEmpty($b->appliedScopes());
+        $this->assertCount(1, $scoped->appliedScopes());
+        $this->assertArrayHasKey('foo', $scoped->appliedScopes());
+    }
+
+    public function test_scope_or_filters_are_preserved_when_grouped()
+    {
+        $b = new Builder(new Entry, new QueryBuilder(new Connection));
+
+        $b->where('cn', '=', 'John Doe');
+
+        $b->withGlobalScope('foo', function ($query) {
+            $query->orWhere('foo', '=', 'bar');
+            $query->orWhere('bar', '=', 'baz');
+        });
+
+        $this->assertEquals(
+            '(&(cn=John Doe)(|(foo=bar)(bar=baz)))',
+            $b->toBase()->getUnescapedQuery()
+        );
+    }
+
+    public function test_complex_scope_filters_cannot_be_negated_by_complex_queries()
+    {
+        $b = new Builder(new Entry, new QueryBuilder(new Connection));
+
+        $b->where('department', '=', 'Sales')
+            ->orWhere('department', '=', 'Support')
+            ->where('enabled', '=', 'true');
+
+        $b->withGlobalScope('foo', function ($query) {
+            $query->orFilter(function ($query) {
+                $query->where('type', '=', 'person');
+                $query->where('type', '=', 'contact');
+            });
+
+            $query->where('tenant', '=', 'acme');
+        });
 
-        $this->assertCount(1, $b->appliedScopes());
-        $this->assertArrayHasKey('foo', $b->appliedScopes());
+        $this->assertEquals(
+            '(&(|(department=Sales)(department=Support))(enabled=true)(&(|(type=person)(type=contact))(tenant=acme)))',
+            $b->toBase()->getUnescapedQuery()
+        );
     }
 
     public function test_scopes_can_be_removed_after_being_added()