diff --git a/tests/Commands/MinifyAllTest.php b/tests/Commands/MinifyAllTest.php index dadbc42..f27b608 100644 --- a/tests/Commands/MinifyAllTest.php +++ b/tests/Commands/MinifyAllTest.php @@ -26,16 +26,7 @@ public function testRunWithNoProperConfig(): void public function testRun(): void { - $config = config(MinifierConfig::class); - $config->dirJs = SUPPORTPATH . 'assets/js'; - $config->dirCss = SUPPORTPATH . 'assets/css'; - $config->dirMinJs = SUPPORTPATH . 'assets/js'; - $config->dirMinCss = SUPPORTPATH . 'assets/css'; - $config->dirVersion = SUPPORTPATH . 'assets'; - $config->js = ['all.min.js' => ['bootstrap.js', 'jquery-3.7.1.js', 'main.js']]; - $config->css = ['all.min.css' => ['bootstrap.css', 'font-awesome.css', 'main.css']]; - - service('minifier', $config); + $this->setMinifierConfig(); CITestStreamFilter::registration(); CITestStreamFilter::addOutputFilter(); diff --git a/tests/Commands/MinifyCssTest.php b/tests/Commands/MinifyCssTest.php index 63f4109..558ab06 100644 --- a/tests/Commands/MinifyCssTest.php +++ b/tests/Commands/MinifyCssTest.php @@ -26,16 +26,7 @@ public function testRunWithNoProperConfig(): void public function testRun(): void { - $config = config(MinifierConfig::class); - $config->dirJs = SUPPORTPATH . 'assets/js'; - $config->dirCss = SUPPORTPATH . 'assets/css'; - $config->dirMinJs = SUPPORTPATH . 'assets/js'; - $config->dirMinCss = SUPPORTPATH . 'assets/css'; - $config->dirVersion = SUPPORTPATH . 'assets'; - $config->js = ['all.min.js' => ['bootstrap.js', 'jquery-3.7.1.js', 'main.js']]; - $config->css = ['all.min.css' => ['bootstrap.css', 'font-awesome.css', 'main.css']]; - - service('minifier', $config); + $this->setMinifierConfig(); CITestStreamFilter::registration(); CITestStreamFilter::addOutputFilter(); diff --git a/tests/Commands/MinifyJsTest.php b/tests/Commands/MinifyJsTest.php index 9f4b935..d629544 100644 --- a/tests/Commands/MinifyJsTest.php +++ b/tests/Commands/MinifyJsTest.php @@ -26,16 +26,7 @@ public function testRunWithNoProperConfig(): void public function testRun(): void { - $config = config(MinifierConfig::class); - $config->dirJs = SUPPORTPATH . 'assets/js'; - $config->dirCss = SUPPORTPATH . 'assets/css'; - $config->dirMinJs = SUPPORTPATH . 'assets/js'; - $config->dirMinCss = SUPPORTPATH . 'assets/css'; - $config->dirVersion = SUPPORTPATH . 'assets'; - $config->js = ['all.min.js' => ['bootstrap.js', 'jquery-3.7.1.js', 'main.js']]; - $config->css = ['all.min.css' => ['bootstrap.css', 'font-awesome.css', 'main.css']]; - - service('minifier', $config); + $this->setMinifierConfig(); CITestStreamFilter::registration(); CITestStreamFilter::addOutputFilter(); diff --git a/tests/_support/CLITestCase.php b/tests/_support/CLITestCase.php index 9b7880e..5517d9a 100644 --- a/tests/_support/CLITestCase.php +++ b/tests/_support/CLITestCase.php @@ -4,6 +4,7 @@ use CodeIgniter\CLI\CLI; use CodeIgniter\Test\ReflectionHelper; +use Michalsn\Minifier\Config\Minifier as MinifierConfig; abstract class CLITestCase extends TestCase { @@ -44,4 +45,18 @@ protected function removeColorCodes(string $output): string return $output; } + + protected function setMinifierConfig() + { + $config = config(MinifierConfig::class); + $config->dirJs = SUPPORTPATH . 'assets/js'; + $config->dirCss = SUPPORTPATH . 'assets/css'; + $config->dirMinJs = SUPPORTPATH . 'assets/js'; + $config->dirMinCss = SUPPORTPATH . 'assets/css'; + $config->dirVersion = SUPPORTPATH . 'assets'; + $config->js = ['all.min.js' => ['bootstrap.js', 'jquery-3.7.1.js', 'main.js']]; + $config->css = ['all.min.css' => ['bootstrap.css', 'font-awesome.css', 'main.css']]; + + service('minifier', $config); + } }