refactor(graphql)!: `GraphQLAssertions::assertCurrentGraphQLSchemaEqu…

…als()` => `GraphQLAssertions::assertGraphQLSchemaEquals()`, `GraphQLAssertions::getCurrentGraphQLSchema()` => `GraphQLAssertions::getGraphQLSchema()`.
LastDragon-ru · Aug 15, 2023 · 1b0543e · 1b0543e
1 parent 3b27a92
commit 1b0543e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/packages/graphql/README.md b/packages/graphql/README.md
@@ -472,6 +472,6 @@ $printed = $printer->print($schema);
 
 There are also few great new [GraphQL Assertions](./src/Testing/GraphQLAssertions.php).
 
-| Name                               | Description              |
-|------------------------------------|--------------------------|
-| `assertCurrentGraphQLSchemaEquals` | Compares default schema. |
+| Name                        | Description              |
+|-----------------------------|--------------------------|
+| `assertGraphQLSchemaEquals` | Compares default schema. |
diff --git a/packages/graphql/src/Builder/ManipulatorTest.php b/packages/graphql/src/Builder/ManipulatorTest.php
@@ -75,7 +75,7 @@ protected function getTypes(): TypeRegistry {
             }
         };
 
-        $schema = $this->useGraphQLSchema($graphql)->getCurrentGraphQLSchema();
+        $schema = $this->useGraphQLSchema($graphql)->getGraphQLSchema();
         $query  = $schema->getType('Query');
         $field  = $query instanceof ObjectType
             ? $query->getField('field')->astNode

diff --git a/packages/graphql/src/Printer/PrinterTest.php b/packages/graphql/src/Printer/PrinterTest.php
@@ -64,7 +64,7 @@ public function testPrint(
         Closure $typeFactory = null,
     ): void {
         $schema    = $schemaFactory($this);
-        $schema    = $this->useGraphQLSchema($schema)->getCurrentGraphQLSchema();
+        $schema    = $this->useGraphQLSchema($schema)->getGraphQLSchema();
         $printer   = $this->app->make(Printer::class)->setSettings($settings);
         $type      = $typeFactory ? $typeFactory($this, $schema) : null;
         $printable = $printableFactory($this, $schema);
@@ -92,7 +92,7 @@ public function testExport(
         Closure $typeFactory = null,
     ): void {
         $schema     = $schemaFactory($this);
-        $schema     = $this->useGraphQLSchema($schema)->getCurrentGraphQLSchema();
+        $schema     = $this->useGraphQLSchema($schema)->getGraphQLSchema();
         $printer    = $this->app->make(Printer::class)->setSettings($settings);
         $type       = $typeFactory ? $typeFactory($this, $schema) : null;
         $exportable = $exportableFactory($this, $schema);
@@ -116,7 +116,7 @@ public function testPrintSchema(
         Closure $printableFactory,
     ): void {
         $schema    = $schemaFactory($this);
-        $schema    = $this->useGraphQLSchema($schema)->getCurrentGraphQLSchema();
+        $schema    = $this->useGraphQLSchema($schema)->getGraphQLSchema();
         $printer   = $this->app->make(Printer::class)->setSettings($settings)->setLevel($level);
         $printable = $printableFactory($this, $schema);
         $actual    = $printer->printSchema($printable);
@@ -139,7 +139,7 @@ public function testPrintSchemaType(
         Closure $typeFactory,
     ): void {
         $schema  = $schemaFactory($this);
-        $schema  = $this->useGraphQLSchema($schema)->getCurrentGraphQLSchema();
+        $schema  = $this->useGraphQLSchema($schema)->getGraphQLSchema();
         $printer = $this->app->make(Printer::class)->setSettings($settings)->setLevel($level);
         $type    = $typeFactory($this, $schema);
         $actual  = $printer->printSchemaType($schema, $type);
@@ -162,7 +162,7 @@ public function testPrintType(
         Closure $typeFactory,
     ): void {
         $schema  = $schemaFactory($this);
-        $schema  = $this->useGraphQLSchema($schema)->getCurrentGraphQLSchema();
+        $schema  = $this->useGraphQLSchema($schema)->getGraphQLSchema();
         $printer = $this->app->make(Printer::class)->setSettings($settings)->setLevel($level);
         $type    = $typeFactory($this, $schema);
         $actual  = $printer->printType($type);

diff --git a/packages/graphql/src/SearchBy/Directives/DirectiveTest.php b/packages/graphql/src/SearchBy/Directives/DirectiveTest.php
@@ -92,7 +92,7 @@ public function testManipulateArgDefinition(Closure $expected, string $graphql,
             self::getTestData()->file($graphql),
         );
 
-        self::assertCurrentGraphQLSchemaEquals(
+        self::assertGraphQLSchemaEquals(
             $expected($this),
         );
     }
@@ -170,7 +170,7 @@ public function testManipulateArgDefinitionProgrammaticallyAddedType(): void {
             self::getTestData()->file('~programmatically.graphql'),
         );
 
-        self::assertCurrentGraphQLSchemaEquals(
+        self::assertGraphQLSchemaEquals(
             self::getTestData()->file('~programmatically-expected.graphql'),
         );
     }

diff --git a/packages/graphql/src/SortBy/Directives/DirectiveTest.php b/packages/graphql/src/SortBy/Directives/DirectiveTest.php
@@ -75,7 +75,7 @@ public function testManipulateArgDefinition(Closure $expected, string $graphql,
             self::getTestData()->file($graphql),
         );
 
-        self::assertCurrentGraphQLSchemaEquals(
+        self::assertGraphQLSchemaEquals(
             $expected($this),
         );
     }
@@ -160,7 +160,7 @@ public function testManipulateArgDefinitionTypeRegistry(): void {
             self::getTestData()->file('~registry.graphql'),
         );
 
-        self::assertCurrentGraphQLSchemaEquals(
+        self::assertGraphQLSchemaEquals(
             self::getTestData()->file('~registry-expected.graphql'),
         );
     }

diff --git a/packages/graphql/src/Testing/GraphQLAssertions.php b/packages/graphql/src/Testing/GraphQLAssertions.php
@@ -31,13 +31,13 @@ trait GraphQLAssertions {
     /**
      * Compares GraphQL schema with current (application) schema.
      */
-    public function assertCurrentGraphQLSchemaEquals(
+    public function assertGraphQLSchemaEquals(
         GraphQLExpected|SplFileInfo|string $expected,
         string $message = '',
     ): void {
         self::assertGraphQLPrintableEquals(
             $expected,
-            $this->getCurrentGraphQLSchema(),
+            $this->getGraphQLSchema(),
             $message,
         );
     }
@@ -62,7 +62,7 @@ protected function resetGraphQLSchema(): static {
         return $this;
     }
 
-    protected function getCurrentGraphQLSchema(): Schema {
+    protected function getGraphQLSchema(): Schema {
         return $this->getGraphQLSchemaBuilder()->schema();
     }