Merge pull request #2 from DirectoryTree/agent/fix-index-fake-assertions

Fix fake index assertion callback semantics

Author: stevebauman

.github/workflows/run-tests.yml

@@ -50,9 +50,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          ruby -rjson -e 'composer = JSON.parse(File.read("composer.json")); composer["repositories"] = [{"type" => "vcs", "url" => "https://github.com/DirectoryTree/OpenSearchAdapter"}, {"type" => "vcs", "url" => "https://github.com/DirectoryTree/OpenSearchClient"}]; File.write("composer.json", JSON.pretty_generate(composer))'
-          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --no-blocking
-          composer update --prefer-dist --no-interaction --no-blocking
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer update --prefer-dist --no-interaction
 
       - name: Wait for OpenSearch
         run: |

composer.json

@@ -27,7 +27,7 @@
     },
     "require": {
         "php": "^8.2",
-        "directorytree/opensearch-adapter": "^1.0",
+        "directorytree/opensearch-adapter": "^1.2.1",
         "directorytree/opensearch-client": "^1.0",
         "illuminate/console": "^11.0|^12.0|^13.0",
         "illuminate/database": "^11.0|^12.0|^13.0",
@@ -41,26 +41,6 @@
         "orchestra/testbench": "^9.0|^10.0|^11.0",
         "pestphp/pest": "^3.0"
     },
-    "repositories": [
-        {
-            "type": "path",
-            "url": "../OpenSearchAdapter",
-            "options": {
-                "versions": {
-                    "directorytree/opensearch-adapter": "1.0.1"
-                }
-            }
-        },
-        {
-            "type": "path",
-            "url": "../OpenSearchClient",
-            "options": {
-                "versions": {
-                    "directorytree/opensearch-client": "1.0.0"
-                }
-            }
-        }
-    ],
     "config": {
         "allow-plugins": {
             "php-http/discovery": true,
@@ -73,5 +53,7 @@
                 "DirectoryTree\\OpenSearchMigrations\\OpenSearchMigrationsServiceProvider"
             ]
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }

src/Testing/Fakes/FakeIndexManager.php

@@ -144,10 +144,18 @@ public function assertChecked(string $index): static
 
     /**
      * Assert that the given index was created.
+     *
+     * @param  (callable(?Mapping, ?Settings): bool)|null  $callback
      */
-    public function assertCreated(string $index, ?callable $modifier = null): static
+    public function assertCreated(string $index, ?callable $callback = null): static
     {
-        $this->manager->assertCreated($this->blueprint($index, $modifier));
+        $this->manager->assertCreated(
+            MigrationPrefix::index($index),
+            $callback ? fn (IndexBlueprint $index): bool => $callback(
+                $index->mapping(),
+                $index->settings(),
+            ) : null,
+        );
 
         return $this;
     }
@@ -164,24 +172,30 @@ public function assertNotCreated(string $index): static
 
     /**
      * Assert that the given index mapping was updated.
+     *
+     * @param  (callable(Mapping): bool)|null  $callback
      */
-    public function assertMappingPut(string $index, callable $modifier): static
+    public function assertMappingPut(string $index, ?callable $callback = null): static
     {
-        $modifier($mapping = new Mapping);
-
-        $this->manager->assertMappingPut(MigrationPrefix::index($index), $mapping);
+        $this->manager->assertMappingPut(
+            MigrationPrefix::index($index),
+            $callback,
+        );
 
         return $this;
     }
 
     /**
      * Assert that the given index settings were updated.
+     *
+     * @param  (callable(Settings): bool)|null  $callback
      */
-    public function assertSettingsPut(string $index, callable $modifier): static
+    public function assertSettingsPut(string $index, ?callable $callback = null): static
     {
-        $modifier($settings = new Settings);
-
-        $this->manager->assertSettingsPut(MigrationPrefix::index($index), $settings);
+        $this->manager->assertSettingsPut(
+            MigrationPrefix::index($index),
+            $callback,
+        );
 
         return $this;
     }
@@ -243,21 +257,4 @@ public function assertAliasDeleted(string $index, string $alias): static
 
         return $this;
     }
-
-    /**
-     * Create an index blueprint for an assertion.
-     */
-    protected function blueprint(string $index, ?callable $modifier = null): IndexBlueprint
-    {
-        if (isset($modifier)) {
-            $modifier(
-                $mapping = new Mapping,
-                $settings = new Settings,
-            );
-
-            return new IndexBlueprint(MigrationPrefix::index($index), $mapping, $settings);
-        }
-
-        return new IndexBlueprint(MigrationPrefix::index($index));
-    }
 }

tests/Integration/Console/FreshCommandTest.php

@@ -7,7 +7,7 @@
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 
-it('drops indices and migrations', function (): void {
+it('drops indices and migrations', function () {
     $migrator = Mockery::mock(Migrator::class);
     $repository = Mockery::mock(MigrationRepository::class);
     $index = Mockery::mock(IndexManagerInterface::class);

tests/Integration/Console/MakeCommandTest.php

@@ -5,7 +5,7 @@
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\BufferedOutput;
 
-it('creates migration files', function (): void {
+it('creates migration files', function () {
     $migrations = Mockery::mock(MigrationStorage::class);
     app()->instance(MigrationStorage::class, $migrations);
 

tests/Integration/Console/MigrateCommandTest.php

@@ -5,7 +5,7 @@
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 
-it('runs one migration when a file name is provided', function (): void {
+it('runs one migration when a file name is provided', function () {
     $migrator = Mockery::mock(Migrator::class);
     app()->instance(Migrator::class, $migrator);
 
@@ -20,7 +20,7 @@
     expect($command->run(new ArrayInput(['--force' => true, 'fileName' => 'test_file_name']), new NullOutput))->toBe(0);
 });
 
-it('runs all migrations when a file name is not provided', function (): void {
+it('runs all migrations when a file name is not provided', function () {
     $migrator = Mockery::mock(Migrator::class);
     app()->instance(Migrator::class, $migrator);
 

tests/Integration/Console/RefreshCommandTest.php

@@ -5,7 +5,7 @@
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 
-it('resets and reruns all migrations', function (): void {
+it('resets and reruns all migrations', function () {
     $migrator = Mockery::mock(Migrator::class);
     app()->instance(Migrator::class, $migrator);
 

tests/Integration/Console/ResetCommandTest.php

@@ -5,7 +5,7 @@
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 
-it('rolls back all migrations', function (): void {
+it('rolls back all migrations', function () {
     $migrator = Mockery::mock(Migrator::class);
     app()->instance(Migrator::class, $migrator);
 

tests/Integration/Console/RollbackCommandTest.php

@@ -5,7 +5,7 @@
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 
-it('rolls back one migration when a file name is provided', function (): void {
+it('rolls back one migration when a file name is provided', function () {
     $migrator = Mockery::mock(Migrator::class);
     app()->instance(Migrator::class, $migrator);
 
@@ -20,7 +20,7 @@
     expect($command->run(new ArrayInput(['--force' => true, 'fileName' => 'test_file_name']), new NullOutput))->toBe(0);
 });
 
-it('rolls back the last batch when a file name is not provided', function (): void {
+it('rolls back the last batch when a file name is not provided', function () {
     $migrator = Mockery::mock(Migrator::class);
     app()->instance(Migrator::class, $migrator);
 

tests/Integration/Console/StatusCommandTest.php

@@ -5,7 +5,7 @@
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 
-it('shows migration status', function (): void {
+it('shows migration status', function () {
     $migrator = Mockery::mock(Migrator::class);
     app()->instance(Migrator::class, $migrator);