Merge pull request #35 from wp-graphql/feat/slight-wpgraphql-module-r…

…efactor feat: "$request_headers" replaced with "$selected_options"
wp-graphql · May 15, 2024 · 796f2fa · 796f2fa
2 parents ef78ac4 + 15c7e58
commit 796f2fa
Show file tree

Hide file tree

Showing 9 changed files with 179 additions and 109 deletions.
diff --git a/.github/workflows/continous-integration.yml b/.github/workflows/continous-integration.yml
@@ -56,7 +56,7 @@ jobs:
           codeception/module-phpbrowser:*  \
           codeception/module-webdriver:*  \
           wp-cli/wp-cli-bundle \
-          lucatume/wp-browser:^3.1
+          lucatume/wp-browser:^4
 
       - name: Run Codeception Tests w/ Docker.
         env:

diff --git a/codeception.dist.yml b/codeception.dist.yml
@@ -18,13 +18,13 @@ extensions:
     enabled:
         - Codeception\Extension\RunFailed
     commands:
-        - Codeception\Command\GenerateWPUnit
-        - Codeception\Command\GenerateWPRestApi
-        - Codeception\Command\GenerateWPRestController
-        - Codeception\Command\GenerateWPRestPostTypeController
-        - Codeception\Command\GenerateWPAjax
-        - Codeception\Command\GenerateWPCanonical
-        - Codeception\Command\GenerateWPXMLRPC
+        - "lucatume\\WPBrowser\\Command\\GenerateWPUnit"
+        - "lucatume\\WPBrowser\\Command\\GenerateWPRestApi"
+        - "lucatume\\WPBrowser\\Command\\GenerateWPRestController"
+        - "lucatume\\WPBrowser\\Command\\GenerateWPRestPostTypeController"
+        - "lucatume\\WPBrowser\\Command\\GenerateWPAjax"
+        - "lucatume\\WPBrowser\\Command\\GenerateWPCanonical"
+        - "lucatume\\WPBrowser\\Command\\GenerateWPXMLRPC"
 params:
     - .env.testing
     - .env.docker
diff --git a/src/Codeception/Module/QueryAsserts.php b/src/Codeception/Module/QueryAsserts.php
@@ -10,6 +10,7 @@
 use Tests\WPGraphQL\Constraint\QueryErrorConstraint;
 use Tests\WPGraphQL\Constraint\QuerySuccessfulConstraint;
 use Tests\WPGraphQL\Logger\CodeceptLogger as Signal;
+use Tests\WPGraphQL\Utils\Utils;
 
 /**
  * GraphQL Query Asserts Module for Codeception
@@ -120,6 +121,21 @@ private function get_not() {
 		return $prefix;
 	}
 
+	/**
+	 * The value returned for undefined resolved values.
+	 *
+	 * Clone of the "get" function from the Lodash JS libra
+	 *
+	 * @param array  $object   The object to query.
+	 * @param string $path     The path of the property to get.
+	 * @param mixed  $default  The value returned for undefined resolved values.
+	 *
+	 * @return mixed
+	 */
+	public function lodashGet( array $data, string $string, $default = null ) {
+		return Utils::lodashGet( $data, $string, $default );
+	}
+
 	/**
 	 * Returns an expected "location" error data object.
 	 *

diff --git a/src/Codeception/Module/WPGraphQL.php b/src/Codeception/Module/WPGraphQL.php
diff --git a/tests/codeception/acceptance.suite.dist.yml b/tests/codeception/acceptance.suite.dist.yml
@@ -8,11 +8,11 @@
 actor: AcceptanceTester
 modules:
     enabled:
-        - WPDb
-        - WPBrowser
+        - \lucatume\WPBrowser\Module\WPDb
+        - \lucatume\WPBrowser\Module\WPBrowser
         - \Helper\Acceptance
     config:
-        WPDb:
+        \lucatume\WPBrowser\Module\WPDb:
             dsn: '%TEST_SITE_DB_DSN%'
             user: '%TEST_DB_USER%'
             password: '%TEST_DB_PASSWORD%'
@@ -24,7 +24,7 @@ modules:
             urlReplacement: true
             tablePrefix: '%TEST_TABLE_PREFIX%'
 
-        WPBrowser:
+        \lucatume\WPBrowser\Module\WPBrowser:
             url: '%TEST_SITE_WP_URL%'
             wpRootFolder: '%WP_ROOT_FOLDER%'
             adminUsername: '%TEST_SITE_ADMIN_USERNAME%'

diff --git a/tests/codeception/functional.suite.dist.yml b/tests/codeception/functional.suite.dist.yml
@@ -6,18 +6,18 @@
 actor: FunctionalTester
 modules:
     enabled:
-        - WPDb
-        - WPBrowser
-        - WPFilesystem
         - Asserts
+        - \lucatume\WPBrowser\Module\WPDb
+        - \lucatume\WPBrowser\Module\WPBrowser
+        - \lucatume\WPBrowser\Module\WPFilesystem
         - \Tests\WPGraphQL\Codeception\Module\QueryAsserts
         - \Tests\WPGraphQL\Codeception\Module\WPGraphQL
         - \Helper\Functional
     config:
         \Tests\WPGraphQL\Codeception\Module\WPGraphQL:
             endpoint: '%TEST_SITE_WP_URL%/graphql'
             auth_header: 'Basic %TEST_SITE_ADMIN_APP_PASSWORD%'
-        WPDb:
+        \lucatume\WPBrowser\Module\WPDb:
             dsn: '%TEST_SITE_DB_DSN%'
             user: '%TEST_DB_USER%'
             password: '%TEST_DB_PASSWORD%'
@@ -29,30 +29,16 @@ modules:
             urlReplacement: true
             tablePrefix: '%TEST_TABLE_PREFIX%'
 
-        WPBrowser:
+        \lucatume\WPBrowser\Module\WPBrowser:
             url: '%TEST_SITE_WP_URL%'
             wpRootFolder: '%WP_ROOT_FOLDER%'
             adminUsername: '%TEST_SITE_ADMIN_USERNAME%'
             adminPassword: '%TEST_SITE_ADMIN_PASSWORD%'
             adminPath: '/wp-admin'
 
-        WPFilesystem:
+        \lucatume\WPBrowser\Module\WPFilesystem:
             wpRootFolder: '%WP_ROOT_FOLDER%'
             plugins: '/wp-content/plugins'
             mu-plugins: '/wp-content/mu-plugins'
             themes: '/wp-content/themes'
             uploads: '/wp-content/uploads'
-
-        WPLoader:
-            loadOnly: true
-            wpRootFolder: "%WP_ROOT_FOLDER%"
-            dbName: "%TEST_DB_NAME%"
-            dbHost: "%TEST_DB_HOST%"
-            dbUser: "%TEST_DB_USER%"
-            dbPassword: "%TEST_DB_PASSWORD%"
-            tablePrefix: "%TEST_TABLE_PREFIX%"
-            domain: "%TEST_SITE_WP_DOMAIN%"
-            adminEmail: "%TEST_SITE_ADMIN_EMAIL%"
-            title: "WPGraphQLTestcase"
-            plugins: ['wp-graphql/wp-graphql.php']
-            activatePlugins: ['wp-graphql/wp-graphql.php']
diff --git a/...functional/QueryAssertsModuleTestCest.php → ...ion/functional/QueryAssertsModuleCest.php b/...functional/QueryAssertsModuleTestCest.php → ...ion/functional/QueryAssertsModuleCest.php
@@ -6,7 +6,7 @@
 use \FunctionalTester;
 use Tests\WPGraphQL\Logger\CodeceptLogger as Signal;
 
-class QueryAssertsModuleTestCest {
+class QueryAssertsModuleCest {
     public function testAssertResponseIdValid( FunctionalTester $I ) {
         $data = [
             'data' => [

diff --git a/...on/functional/WPGraphQLModuleTestCest.php → ...eption/functional/WPGraphQLModuleCest.php b/...on/functional/WPGraphQLModuleTestCest.php → ...eption/functional/WPGraphQLModuleCest.php
@@ -6,7 +6,7 @@
 use \FunctionalTester;
 use Tests\WPGraphQL\Logger\CodeceptLogger as Signal;
 
-class WPGraphQLModuleTestCest {
+class WPGraphQLModuleCest {
     public function testGetRequest( FunctionalTester $I, $scenario ) {
         $I->wantTo( 'send a GET request to the GraphQL endpoint and return a response' );
 
@@ -290,4 +290,51 @@ public function testConcurrentRequests( FunctionalTester $I, $scenario ) {
             ]
         );
     }
+
+    public function testRequestOptions( FunctionalTester $I ) {
+        $I->wantTo( 'send a request to the GraphQL endpoint with custom options' );
+
+        $query = 'mutation ( $input: CreatePostInput! ) {
+            createPost( input: $input ) {
+                post {
+                    id
+                    title
+                    slug
+                    status
+                }
+            }
+        }';
+
+        $variables = [
+            'input' => [
+                'title' => 'Test Post',
+                'content' => 'Test Post content',
+                'slug' => 'test-post',
+                'status' => 'DRAFT'
+            ]
+        ];
+
+
+        $response = $I->postRequest( $query, $variables, [ 'suppress_mod_token' => true ] );
+
+        $I->assertQueryError( $response );
+
+        $response = $I->postRequest( $query, $variables );
+
+        $I->assertQuerySuccessful( $response, [ $I->expectField( 'createPost.post.id', Signal::NOT_NULL ) ] );
+
+        $id = $I->lodashGet( $response, 'data.createPost.post.id' );
+
+        $query = '
+            query ( $id: ID! ) {
+                post( id: $id ) {
+                    id
+                }
+            }
+        ';
+
+        $response = $I->postRequest( $query, [ 'id' => $id ], [ 'suppress_mod_token' => true ] );
+
+        $I->assertQuerySuccessful( $response, [ $I->expectField( 'post', Signal::IS_NULL ) ] );
+    }
 }
diff --git a/tests/codeception/wpunit.suite.dist.yml b/tests/codeception/wpunit.suite.dist.yml
@@ -5,10 +5,10 @@
 actor: WpunitTester
 modules:
     enabled:
-        - WPLoader
+        - \lucatume\WPBrowser\Module\WPLoader
         - \Helper\Wpunit
     config:
-        WPLoader:
+        \lucatume\WPBrowser\Module\WPLoader:
             wpRootFolder: "%WP_ROOT_FOLDER%"
             dbName: "%TEST_DB_NAME%"
             dbHost: "%TEST_DB_HOST%"