fix(deps): use site-default for testing instead of site-blank

dadish · Jul 2, 2022 · a00703e · a00703e
1 parent caf27b3
commit a00703e
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -15,6 +15,7 @@
   },
   "require-dev": {
     "processwire/processwire": "dev-dev",
+    "processwire/site-default": "1.0.0",
     "ryancramerdesign/fieldtypemapmarker": "1.0.0",
     "dadish/graphqlfieldtypemapmarker": "2.0.0",
     "phpunit/phpunit": "9.5.10"
@@ -24,6 +25,17 @@
       "type": "vcs",
       "url": "https://github.com/processwire/processwire"
     },
+    {
+      "type": "package",
+      "package": {
+        "name": "processwire/site-default",
+        "version": "1.0.0",
+        "dist": {
+          "type": "zip",
+          "url": "https://github.com/processwire/site-default/archive/master.zip"
+        }
+      }
+    },
     {
       "type": "package",
       "package": {

diff --git a/composer.lock b/composer.lock
diff --git a/test/bootstrap.php b/test/bootstrap.php
@@ -9,7 +9,7 @@
 // paths
 $baseDir = realpath(__DIR__ . "/../");
 $pwDir = realpath($baseDir . "/vendor/processwire/processwire/");
-$siteDir = realpath($pwDir . "/site-blank/");
+$siteDir = realpath($baseDir . "/vendor/processwire/site-default/");
 $moduleDir = $siteDir . "/modules/ProcessGraphQL";
 $testFilesDir = realpath($baseDir . "/test/files");
 $siteFilesDir = $siteDir . "/assets/files";
@@ -23,7 +23,7 @@
 	unlink($installFile);
 }
 
-// overwrite site-blank's config.php with our own custom one
+// overwrite site-defaults's config.php with our own custom one
 copy(__DIR__ . "/site/config.php", $siteDir . "/config.php");
 
 // symlink site/classes directory
@@ -62,16 +62,21 @@
 	\symlink($mapMarkerGraphQLDir, $mapMarkerGraphQLDestDir);
 }
 
+// symlink the site-default to vendor/processwire/processwire/site
+// so it is next to wire directory.
+$siteDirDest = $pwDir . "/site";
+if (!file_exists($siteDirDest)) {
+	\symlink($siteDir, $siteDirDest);
+}
+
 // symlink skyscrapers pages files to site's asset files
 if (!file_exists($siteFilesDir)) {
 	\symlink($testFilesDir, $siteFilesDir);
 }
 
 use ProcessWire\ProcessWire;
 
-$config = ProcessWire::buildConfig($pwDir, null, [
-  "siteDir" => "site-blank"
-]);
+$config = ProcessWire::buildConfig($pwDir);
 
 require_once realpath(__DIR__ . "/databaseReset.php");
 

diff --git a/test/cleanup.php b/test/cleanup.php
@@ -8,9 +8,7 @@
 
 use ProcessWire\ProcessWire;
 
-$config = ProcessWire::buildConfig($pwDir, null, [
-  "siteDir" => "site-default"
-]);
+$config = ProcessWire::buildConfig($pwDir);
 
 require_once realpath(__DIR__ . "/databaseReset.php");