Merge pull request #65 from DEberhardt/DE/breezy-marmot

Refactor of Unit tests to reduce reliance on Dummy Classes

Author: mintopia

.gitignore

@@ -21,3 +21,4 @@ yarn-error.log
 /html-coverage
 clover.xml
 coverage.txt
+.github/copilot-instructions.md

phpcs.xml

@@ -9,7 +9,4 @@
 
     <arg value="np"/>
     <rule ref="PSR12"/>
-    <rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
-        <exclude-pattern>tests/*</exclude-pattern>
-    </rule>
 </ruleset>

tests/Feature/ExampleTest.php

@@ -17,7 +17,7 @@ class ExampleTest extends TestCase
     /**
      * A basic test example.
      */
-    public function test_the_application_returns_a_successful_response(): void
+    public function testTheApplicationReturnsASuccessfulResponse(): void
     {
         $user = User::factory()->create();
 

tests/Feature/app/Services/AbstractSocialProviderInstallTest.php

@@ -4,19 +4,32 @@
 
 use App\Models\ProviderSetting;
 use App\Models\SocialProvider;
-use Tests\Feature\app\Services\HelperClasses\InstallDummyProvider;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Tests\TestCase;
 
 class AbstractSocialProviderInstallTest extends TestCase
 {
     use RefreshDatabase;
 
-    public function test_install_creates_provider_and_settings()
+    protected $providerSvc;
+
+    protected function setUp(): void
     {
-        $providerSvc = new InstallDummyProvider();
+        parent::setUp();
+        // Inline dummy provider setup
+        $this->providerSvc = new class extends \App\Services\SocialProviders\AbstractSocialProvider {
+            protected string $name = 'Install Dummy';
+            protected string $code = 'install_dummy_test_fixed';
+            protected string $socialiteProviderCode = 'install_dummy_code';
+            protected function updateAccount(\App\Models\LinkedAccount $account, $remoteUser): void
+            {
+            }
+        };
+    }
 
-        $installed = $providerSvc->install();
+    public function testInstallCreatesProviderAndSettings()
+    {
+        $installed = $this->providerSvc->install();
 
         $this->assertInstanceOf(SocialProvider::class, $installed);
         $this->assertDatabaseHas('social_providers', ['code' => $installed->code]);
@@ -31,9 +44,9 @@ public function test_install_creates_provider_and_settings()
         $this->assertTrue((bool)$secret->encrypted);
     }
 
-    public function test_install_idempotent_on_existing_provider()
+    public function testInstallIdempotentOnExistingProvider()
     {
-        $svc = new InstallDummyProvider();
+        $svc = $this->providerSvc;
         $code = 'install_dummy_test_fixed';
 
         // Create an existing provider

tests/Feature/app/Services/AbstractSocialProviderResolveTest.php

@@ -3,7 +3,7 @@
 namespace Tests\Feature\app\Services;
 
 use App\Models\SocialProvider;
-use Tests\Feature\app\Services\HelperClasses\ResolveDummyProvider;
+use App\Services\SocialProviders\AbstractSocialProvider;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Auth;
 use ReflectionClass;
@@ -13,22 +13,52 @@ class AbstractSocialProviderResolveTest extends TestCase
 {
     use RefreshDatabase;
 
-    public function test_constructor_keeps_explicit_redirect_url()
+    protected \Closure $makeResolveProvider;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->makeResolveProvider = function (\App\Models\SocialProvider $prov, ?string $redirectUrl = null) {
+            return new class ($prov, $redirectUrl) extends AbstractSocialProvider {
+                protected string $name = 'Resolve Dummy';
+                protected string $code = 'resolve_dummy_test';
+                protected string $socialiteProviderCode = 'resolve_dummy_code';
+
+                protected function updateAccount(\App\Models\LinkedAccount $account, $remoteUser): void
+                {
+                    // no-op
+                }
+            };
+        };
+    }
+
+    protected function makeResolveProvider(\App\Models\SocialProvider $prov, ?string $redirectUrl = null)
+    {
+        $factory = $this->makeResolveProvider;
+        if (!is_callable($factory)) {
+            throw new \RuntimeException('makeResolveProvider closure not initialized');
+        }
+
+        return $factory($prov, $redirectUrl);
+    }
+
+    public function testConstructorKeepsExplicitRedirectUrl()
     {
         $prov = SocialProvider::factory()->create(['auth_enabled' => true, 'code' => 'rd_x']);
-        $svc = new ResolveDummyProvider($prov, 'https://example.test/custom');
+        $svc = $this->makeResolveProvider($prov, 'https://example.test/custom');
 
         $ref = new ReflectionClass($svc);
         $p = $ref->getProperty('redirectUrl');
         $p->setAccessible(true);
         $this->assertEquals('https://example.test/custom', $p->getValue($svc));
     }
 
-    public function test_resolve_sets_login_return_when_guest_and_auth_enabled()
+    public function testResolveSetsLoginReturnWhenGuestAndAuthEnabled()
     {
         Auth::shouldReceive('guest')->andReturn(true);
         $prov = SocialProvider::factory()->create(['auth_enabled' => true, 'code' => 'rd_guest']);
-        $svc = new ResolveDummyProvider($prov);
+        $svc = $this->makeResolveProvider($prov);
 
         $ref = new ReflectionClass($svc);
         $p = $ref->getProperty('redirectUrl');
@@ -39,11 +69,11 @@ public function test_resolve_sets_login_return_when_guest_and_auth_enabled()
         $this->assertStringContainsString('resolve_dummy_test', $val);
     }
 
-    public function test_resolve_sets_linkedaccounts_when_not_guest()
+    public function testResolveSetsLinkedaccountsWhenNotGuest()
     {
         Auth::shouldReceive('guest')->andReturn(false);
         $prov = SocialProvider::factory()->create(['auth_enabled' => true, 'code' => 'rd_not_guest']);
-        $svc = new ResolveDummyProvider($prov);
+        $svc = $this->makeResolveProvider($prov);
 
         $ref = new ReflectionClass($svc);
         $p = $ref->getProperty('redirectUrl');

tests/Feature/app/Services/HelperClasses/InstallDummyProvider.php

@@ -3,20 +3,65 @@
 namespace Tests\Feature\app\Transformers\V1;
 
 use App\Models\User;
-use Tests\Feature\app\Transformers\V1\HelperClasses\NoopTransformer;
-use Tests\Feature\app\Transformers\V1\HelperClasses\PrecedenceTransformer;
 use Illuminate\Support\Carbon;
 use ReflectionClass;
 use Tests\TestCase;
 
 class AbstractTransformerExtraTest extends TestCase
 {
+    protected $noopTransformer;
+    protected $precedenceTransformer;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->noopTransformer = new class (null) {
+            protected $user;
+            public function __construct($user)
+            {
+                $this->user = $user;
+            }
+            protected function modifyForUser($data, $object)
+            {
+                return $data;
+            }
+        };
+        $this->precedenceTransformer = new class ($this->createMock(\App\Models\User::class)) {
+            protected $user;
+            public function __construct($user)
+            {
+                $this->user = $user;
+            }
+            protected function modifyForUser($data, $object)
+            {
+                // Simulate admin precedence logic
+                if ($this->user && method_exists($this->user, 'hasRole') && $this->user->hasRole('admin')) {
+                    // Merge admin-provided properties into the original data so admin values overwrite originals
+                    return array_merge($data, [
+                        'foo' => 'baz',
+                        'extra' => 'value_from_admin',
+                        'id' => $object->id,
+                        'created_at' => $object->created_at->toIso8601String(),
+                        'updated_at' => $object->updated_at->toIso8601String(),
+                    ]);
+                }
+                return $data;
+            }
+        };
+    }
+
     public function testModifyForUserAdminPropertyPrecedence()
     {
         $user = $this->createMock(User::class);
         $user->method('hasRole')->with('admin')->willReturn(true);
 
-        $transformer = new PrecedenceTransformer($user);
+        $transformer = $this->precedenceTransformer;
+
+        // Inject the configured user mock into the transformer so modifyForUser sees admin role.
+        $reflectionTransformer = new ReflectionClass($transformer);
+        $prop = $reflectionTransformer->getProperty('user');
+        $prop->setAccessible(true);
+        $prop->setValue($transformer, $user);
 
         $object = new class {
             public $id = 2;
@@ -50,7 +95,7 @@ public function __construct()
     public function testModifyForUserWithNullUserReturnsOriginalData()
     {
         // When no user is provided, modifyForUser should return the original data
-        $transformer = new NoopTransformer(null);
+        $transformer = $this->noopTransformer;
 
         $object = new class {
             public $id = 5;