diff --git a/.github/workflows/testing-integration.yml b/.github/workflows/testing-integration.yml index 32b0d020..e7578cdd 100644 --- a/.github/workflows/testing-integration.yml +++ b/.github/workflows/testing-integration.yml @@ -52,9 +52,6 @@ jobs: - name: Run Tests w/ Docker. run: | docker-compose run --rm \ - -e WORDPRESS_CONFIG_EXTRA="define( 'GRAPHQL_JWT_AUTH_SECRET_KEY', '${{ secrets.GRAPHQL_JWT_AUTH_SECRET_KEY }}' ); \ - define( 'STRIPE_API_PUBLISHABLE_KEY', '${{ secrets.STRIPE_API_PUBLISHABLE_KEY }}' ); \ - define( 'STRIPE_API_SECRET_KEY', '${{ secrets.STRIPE_API_SECRET_KEY }}' );" \ -e COVERAGE=${{ matrix.coverage }} \ -e DEBUG=${{ matrix.debug }} \ testing --scale app=0 diff --git a/Dockerfile b/Dockerfile index f1526adb..48c75924 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,6 @@ ARG PHP_VERSION FROM kidunot89/woographql-app:wp${WP_VERSION}-php${PHP_VERSION} - LABEL author=kidunot89 LABEL author_uri=https://github.com/kidunot89 diff --git a/bin/testing-entrypoint.sh b/bin/testing-entrypoint.sh index 73b3edbf..f2db652c 100644 --- a/bin/testing-entrypoint.sh +++ b/bin/testing-entrypoint.sh @@ -30,6 +30,9 @@ cd ${WP_ROOT_FOLDER} # Run app entrypoint script. . app-entrypoint.sh +# Deactivate WP-GraphQL-JWT-Authentication +wp plugin deactivate wp-graphql-jwt-authentication --allow-root + # Return to PWD. echo "Moving back to project working directory." cd ${workdir} diff --git a/codeception.dist.yml b/codeception.dist.yml index d503a42f..29157f96 100644 --- a/codeception.dist.yml +++ b/codeception.dist.yml @@ -77,12 +77,10 @@ modules: - woocommerce/woocommerce.php - woocommerce-gateway-stripe/woocommerce-gateway-stripe.php - wp-graphql/wp-graphql.php - - wp-graphql-jwt-authentication/wp-graphql-jwt-authentication.php - wp-graphql-woocommerce/wp-graphql-woocommerce.php activatePlugins: - woocommerce/woocommerce.php - woocommerce-gateway-stripe/woocommerce-gateway-stripe.php - wp-graphql/wp-graphql.php - - wp-graphql-jwt-authentication/wp-graphql-jwt-authentication.php - wp-graphql-woocommerce/wp-graphql-woocommerce.php configFile: 'tests/_data/config.php' diff --git a/docker-compose.yml b/docker-compose.yml index 05c2189d..981de288 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,8 +41,8 @@ services: context: . dockerfile: Dockerfile args: - - PHP_VERSION="${PHP_VERSION:-7.3}" - - WP_VERSION="${WP_VERSION:-5.2}" + - PHP_VERSION=7.3 + - WP_VERSION=5.2 - USE_XDEBUG image: woographql-testing volumes: diff --git a/tests/wpunit.suite.dist.yml b/tests/wpunit.suite.dist.yml index e53f1db4..4efc9dfb 100644 --- a/tests/wpunit.suite.dist.yml +++ b/tests/wpunit.suite.dist.yml @@ -10,4 +10,20 @@ modules: disabled: - WPDb - WPBrowser + config: + WPDb: + cleanup: false + WPLoader: + plugins: + - woocommerce/woocommerce.php + - woocommerce-gateway-stripe/woocommerce-gateway-stripe.php + - wp-graphql/wp-graphql.php + - wp-graphql-jwt-authentication/wp-graphql-jwt-authentication.php + - wp-graphql-woocommerce/wp-graphql-woocommerce.php + activatePlugins: + - woocommerce/woocommerce.php + - woocommerce-gateway-stripe/woocommerce-gateway-stripe.php + - wp-graphql/wp-graphql.php + - wp-graphql-jwt-authentication/wp-graphql-jwt-authentication.php + - wp-graphql-woocommerce/wp-graphql-woocommerce.php bootstrap: bootstrap.php \ No newline at end of file diff --git a/vendor/autoload.php b/vendor/autoload.php index 6cbce685..7876e074 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit42ce487bd54747a5700ee465e69f5212::getLoader(); +return ComposerAutoloaderInit0f6ddcb6876ce7e524f7f630211f1850::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index aa4ccbe8..0da22c69 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit42ce487bd54747a5700ee465e69f5212 +class ComposerAutoloaderInit0f6ddcb6876ce7e524f7f630211f1850 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit42ce487bd54747a5700ee465e69f5212 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit42ce487bd54747a5700ee465e69f5212', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit0f6ddcb6876ce7e524f7f630211f1850', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit42ce487bd54747a5700ee465e69f5212', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit0f6ddcb6876ce7e524f7f630211f1850', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit42ce487bd54747a5700ee465e69f5212::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit0f6ddcb6876ce7e524f7f630211f1850::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit42ce487bd54747a5700ee465e69f5212 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit42ce487bd54747a5700ee465e69f5212::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit0f6ddcb6876ce7e524f7f630211f1850::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire42ce487bd54747a5700ee465e69f5212($fileIdentifier, $file); + composerRequire0f6ddcb6876ce7e524f7f630211f1850($fileIdentifier, $file); } return $loader; } } -function composerRequire42ce487bd54747a5700ee465e69f5212($fileIdentifier, $file) +function composerRequire0f6ddcb6876ce7e524f7f630211f1850($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index d4d13180..e7172ced 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit42ce487bd54747a5700ee465e69f5212 +class ComposerStaticInit0f6ddcb6876ce7e524f7f630211f1850 { public static $files = array ( '944484f100dc1864a5320474d49ebd5a' => __DIR__ . '/../..' . '/includes/connection/wc-cpt-connection-args.php', @@ -174,9 +174,9 @@ class ComposerStaticInit42ce487bd54747a5700ee465e69f5212 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit42ce487bd54747a5700ee465e69f5212::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit42ce487bd54747a5700ee465e69f5212::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit42ce487bd54747a5700ee465e69f5212::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit0f6ddcb6876ce7e524f7f630211f1850::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit0f6ddcb6876ce7e524f7f630211f1850::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit0f6ddcb6876ce7e524f7f630211f1850::$classMap; }, null, ClassLoader::class); }