Changed plugin generator to use tests/bootstrap.php

originphp · Aug 29, 2020 · efa85b2 · efa85b2
1 parent 77b3ceb
commit efa85b2
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [3.3.1] - 2020-08-29
+
+### Changed
+
+- Changed plugin generator to use tests/bootstrap.php
+
 ## [3.3.0] - 2020-08-15
 
 ### Added

diff --git a/src/Console/Command/GenerateCommand.php b/src/Console/Command/GenerateCommand.php
@@ -613,6 +613,12 @@ public function plugin(array $data)
             PLUGINS.DS.Inflector::underscored($data['class']).DS.'composer.json',
             $data
         );
+
+        $this->generate(
+            $this->getTemplateFilename('plugin_test_bootstrap'),
+            PLUGINS.DS.Inflector::underscored($data['class']) . DS . 'tests' . DS . 'bootstrap.php',
+            $data
+        );
     }
     /*
     %model% e.g. BookmarksTag

diff --git a/templates/generator/phpunit.tpl b/templates/generator/phpunit.tpl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true" processIsolation="false" stopOnFailure="false" bootstrap="../../config/bootstrap.php" backupGlobals="true">
+<phpunit colors="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" backupGlobals="true">
   <testsuites>
     <testsuite name="Plugin Test Suite">
       <directory>./tests/TestCase/</directory>

diff --git a/templates/generator/plugin_test_bootstrap.tpl b/templates/generator/plugin_test_bootstrap.tpl
@@ -0,0 +1,9 @@
+<?php
+/**
+ * This is the test bootstrap which you can use for overwriting
+ */
+use Origin\Core\Config;
+
+require dirname(__DIR__, 3) . '/config/bootstrap.php';
+
+Config::write('App.url', 'http://localhost');
diff --git a/tests/TestCase/Console/Command/GenerateCommandTest.php b/tests/TestCase/Console/Command/GenerateCommandTest.php
@@ -569,12 +569,16 @@ public function testPlugin()
 
         $filename = PLUGINS . DS . 'dummy' . DS . 'phpunit.xml';
         $this->assertFileExists($filename);
-        $this->assertFileHash('547d46441f0876bac9d21742def30bc4', $filename);
+        $this->assertFileHash('6682a8306b3fb59117088aedf618b808', $filename);
 
         $filename = PLUGINS . DS . 'dummy' . DS . 'composer.json';
         $this->assertFileExists($filename);
         $this->assertFileHash('5efb8dd1e0de11ce659e00bdf657b462', $filename);
 
+        $filename = PLUGINS . DS . 'dummy' . DS . 'tests/bootstrap.php';
+        $this->assertFileExists($filename);
+        $this->assertFileHash('a6cdc8b185d91fd6b6ac25058e4c4508', $filename);
+
         $this->recursiveDelete(PLUGINS . DS . 'dummy');
     }