cleanup

Author: AyoobMH

tests/DiscoversEventHandlersTest.php

@@ -14,24 +14,20 @@
 use Spatie\EventSourcing\Tests\TestClasses\AutoDiscoverEventHandlers\TestReactor;
 use function PHPUnit\Framework\assertEqualsCanonicalizing;
 
-beforeEach(function () {
-    $this->getDiscoveryBasePath = function (): string
-    {
-        return realpath($this->pathToTests().'/../');
-    };
-});
+function getDiscoveryBasePath(): string
+{
+    return realpath(test()->pathToTests().'/../');
+}
 
 test('it can get all classes that have event handlers', function () {
     /** @var \Spatie\EventSourcing\Projectionist $projectionist */
     $projectionist = app(Projectionist::class);
 
     $pathToComposerJson = __DIR__.'/../composer.json';
 
-    $getDiscoveryBasePath = $this->getDiscoveryBasePath;
-
     (new DiscoverEventHandlers())
         ->within([__DIR__.'/TestClasses/AutoDiscoverEventHandlers'])
-        ->useBasePath($getDiscoveryBasePath())
+        ->useBasePath(getDiscoveryBasePath())
         ->useRootNamespace('Spatie\EventSourcing\\')
         ->ignoringFiles(Composer::getAutoloadedFiles($pathToComposerJson))
 

tests/Models/StoredEventTest.php

@@ -22,26 +22,27 @@
 use function PHPUnit\Framework\assertSame;
 use function PHPUnit\Framework\assertTrue;
 
+function fireEvents(int $number = 1, string $className = MoneyAddedEvent::class)
+{
+    foreach (range(1, $number) as $i) {
+        event(new $className(test()->account, 1234));
+    }
+}
+
 beforeEach(function () {
     Projectionist::addProjector(new BalanceProjector());
 
     $this->account = Account::create();
-
-    $this->fireEvents = function (int $number = 1, string $className = MoneyAddedEvent::class) {
-        foreach (range(1, $number) as $i) {
-            event(new $className($this->account, 1234));
-        }
-    };
 });
 
 test('it has a scope to get all events starting from given id', function () {
-    ($this->fireEvents)(4);
+    fireEvents(4);
 
     assertEquals([3, 4], EloquentStoredEvent::startingFrom(3)->pluck('id')->toArray());
 });
 
 test('it will throw a human readable exception when the event couldnt be deserialized', function () {
-    ($this->fireEvents)();
+    fireEvents();
 
     // sneakily change the stored event class
     EloquentStoredEvent::first()->update(['event_class' => 'NonExistingClass']);
@@ -54,7 +55,7 @@
         'money_added' => MoneyAddedEvent::class,
     ]);
 
-    ($this->fireEvents)();
+    fireEvents();
 
     assertEquals(MoneyAddedEvent::class, EloquentStoredEvent::first()->toStoredEvent()->event_class);
     $this->assertDatabaseHas('stored_events', ['event_class' => 'money_added']);
@@ -69,7 +70,7 @@
         'money_added' => MoneyAddedEvent::class,
     ]);
 
-    ($this->fireEvents)();
+    fireEvents();
 
     $instance = EloquentStoredEvent::withMetaDataAttributes('ip', '127.0.0.1')->first();
 
@@ -81,7 +82,7 @@
 });
 
 test('it can handle an encoded string as event properties', function () {
-    ($this->fireEvents)();
+    fireEvents();
 
     $eloquentEvent = EloquentStoredEvent::first();
 
@@ -99,7 +100,7 @@
 });
 
 test('it encodes the event properties itself when its an array', function () {
-    ($this->fireEvents)();
+    fireEvents();
 
     $eloquentEvent = EloquentStoredEvent::first();
 
@@ -119,7 +120,7 @@
 });
 
 test('it exposes the aggregate version', function () {
-    ($this->fireEvents)();
+    fireEvents();
 
     $eloquentEvent = EloquentStoredEvent::first();
 
@@ -191,7 +192,7 @@
 
     Carbon::setTestNow($now);
 
-    ($this->fireEvents)();
+    fireEvents();
 
     /** @var \Spatie\EventSourcing\StoredEvents\Models\EloquentStoredEvent $eloquentEvent */
     $eloquentEvent = EloquentStoredEvent::first();
@@ -202,7 +203,7 @@
 });
 
 test('the stored event id is set', function () {
-    ($this->fireEvents)();
+    fireEvents();
 
     /** @var \Spatie\EventSourcing\StoredEvents\Models\EloquentStoredEvent $eloquentEvent */
     $eloquentEvent = EloquentStoredEvent::first();

tests/ProjectionTest.php

@@ -10,25 +10,25 @@
 use function PHPUnit\Framework\assertFalse;
 use function PHPUnit\Framework\assertTrue;
 
-beforeEach(function () {
-    $this->createProjection = function (): ProjectionModel
-    {
-        ProjectionModel::new()->writeable()->create([
-            'uuid' => 'test-uuid',
-            'field' => 'original',
-        ]);
+function createProjection(): ProjectionModel
+{
+    ProjectionModel::new()->writeable()->create([
+        'uuid' => 'test-uuid',
+        'field' => 'original',
+    ]);
 
-        return ProjectionModel::find('test-uuid');
-    };
+    return ProjectionModel::find('test-uuid');
+}
 
-    $this->assertNothingChanged = function (): void
-    {
-        $this->assertDatabaseHas((new ProjectionModel())->getTable(), [
-            'uuid' => 'test-uuid',
-            'field' => 'original',
-        ]);
-    };
+function assertNothingChanged(): void
+{
+    test()->assertDatabaseHas((new ProjectionModel())->getTable(), [
+        'uuid' => 'test-uuid',
+        'field' => 'original',
+    ]);
+}
 
+beforeEach(function () {
     Schema::dropIfExists('projection_models');
 
     Schema::create('projection_models', function (Blueprint $table): void {
@@ -55,15 +55,15 @@
 });
 
 test('save', function () {
-    $projection =  ($this->createProjection)();
+    $projection =  createProjection();
 
     expect(function () use ($projection) {
         $projection->field = 'changed';
 
         $projection->save();
     })->toThrow(ReadonlyProjection::class);
 
-    ($this->assertNothingChanged)();
+    assertNothingChanged();
 
     $projection->field = 'changed';
 
@@ -73,15 +73,15 @@
 });
 
 test('update', function () {
-    $projection =  ($this->createProjection)();
+    $projection =  createProjection();
 
     expect(function () use ($projection) {
         $projection->update([
             'field' => 'changed',
         ]);
     })->toThrow(ReadonlyProjection::class);
 
-    ($this->assertNothingChanged)();
+    assertNothingChanged();
 
     $projection->writeable()->update([
         'field' => 'changed',
@@ -91,39 +91,39 @@
 });
 
 test('delete', function () {
-    $projection =  ($this->createProjection)();
+    $projection =  createProjection();
 
     expect(fn() => $projection->delete())->toThrow(ReadonlyProjection::class);
 
-    ($this->assertNothingChanged)();
+    assertNothingChanged();
 
     $projection->writeable()->delete();
 
     assertEquals(0, ProjectionModel::all()->count());
 });
 
 test('force delete', function () {
-    $projection =  ($this->createProjection)();
+    $projection =  createProjection();
 
     expect(fn () => $projection->forceDelete())->toThrow(ReadonlyProjection::class);
 
-    ($this->assertNothingChanged)();
+    assertNothingChanged();
 
     $projection->writeable()->forceDelete();
 
     assertEquals(0, ProjectionModel::all()->count());
 });
 
 test('force fill', function () {
-    $projection =  ($this->createProjection)();
+    $projection =  createProjection();
 
     expect(function () use ($projection) {
         $projection->forceFill([
             'field' => 'changed',
         ])->save();
     })->toThrow(ReadonlyProjection::class);
 
-    ($this->assertNothingChanged)();
+    assertNothingChanged();
 
     $projection->writeable()->forceFill([
         'field' => 'changed',
@@ -133,23 +133,23 @@
 });
 
 test('is writeable is reset on refresh', function () {
-    $projection =  ($this->createProjection)();
+    $projection =  createProjection();
 
     $projection = $projection->writeable();
 
     assertFalse($projection->refresh()->isWriteable());
 });
 
 test('is writeable is reset on fresh', function () {
-    $projection =  ($this->createProjection)();
+    $projection =  createProjection();
 
     $projection = $projection->writeable();
 
     assertFalse($projection->fresh()->isWriteable());
 });
 
 test('read', function () {
-     ($this->createProjection)();
+     createProjection();
 
     assertEquals(1, ProjectionModel::all()->count());
 });

tests/TestCase.php

@@ -82,7 +82,7 @@ protected function setConfig(string $name, $value)
         (new EventSourcingServiceProvider($this->app))->register();
     }
 
-    protected function pathToTests(): string
+    public function pathToTests(): string
     {
         return __DIR__;
     }