Merge pull request #221 from ndm2/fix-install-test-failure

Fix bootstrap shell install test failure.
FriendsOfCake · Jun 3, 2018 · b81712a · b81712a
2 parents d9f3692 + 743b0d2
commit b81712a
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         }
     ],
     "require": {
-        "cakephp/cakephp": "^3.5"
+        "cakephp/cakephp": "^3.5.12"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7.14|^6.0"

diff --git a/src/Shell/BootstrapShell.php b/src/Shell/BootstrapShell.php
@@ -27,7 +27,8 @@ public function install()
     {
         $this->TwbsAssets->installAssets();
         $this->TwbsAssets->copyAssets();
-        $this->Assets->symlink();
+        $this->Assets->remove('BootstrapUI');
+        $this->Assets->symlink('BootstrapUI');
     }
 
     /**

diff --git a/src/Shell/Task/TwbsAssetsTask.php b/src/Shell/Task/TwbsAssetsTask.php
@@ -24,10 +24,10 @@ class TwbsAssetsTask extends Shell
     public function __construct()
     {
         parent::__construct();
-        $this->_assetDir = new Folder(Plugin::path('BootstrapUI') . 'webroot');
-        $this->_nodeDir = new Folder(Plugin::path('BootstrapUI') . 'node_modules');
-        $this->_cssDir = new Folder($this->_assetDir->path . DS . 'css');
-        $this->_jsDir = new Folder($this->_assetDir->path . DS . 'js');
+        $this->_assetDir = new Folder(Plugin::path('BootstrapUI') . 'webroot', true);
+        $this->_nodeDir = new Folder(Plugin::path('BootstrapUI') . 'node_modules', true);
+        $this->_cssDir = new Folder($this->_assetDir->path . DS . 'css', true);
+        $this->_jsDir = new Folder($this->_assetDir->path . DS . 'js', true);
     }
 
     /**

diff --git a/tests/TestCase/Shell/BootstrapShellTest.php b/tests/TestCase/Shell/BootstrapShellTest.php
@@ -31,15 +31,68 @@ public function tearDown()
         unset($this->Shell);
     }
 
-    public function testInstall()
+    public function testInstallInDebugMode()
     {
         $this->Shell->install();
+
+        $pluginPath = Plugin::path('BootstrapUI');
+        $nodePath = $pluginPath . 'node_modules';
+        $webrootPath = $pluginPath . 'webroot' . DS;
+        $cssPath = $webrootPath . 'css' . DS;
+        $jsPath = $webrootPath . 'js' . DS;
+
+        $this->assertDirectoryExists($nodePath);
+        $this->assertDirectoryExists($webrootPath);
+        $this->assertDirectoryExists($cssPath);
+        $this->assertDirectoryExists($jsPath);
+
+        $appWebrootPath = WWW_ROOT . 'bootstrap_u_i' . DS;
+        $appCssPath = $webrootPath . 'css' . DS;
+        $appJsPath = $webrootPath . 'js' . DS;
+
+        $this->assertDirectoryExists($appWebrootPath);
+        $this->assertDirectoryExists($appCssPath);
+        $this->assertDirectoryExists($appJsPath);
+
+        $sourceFiles = (new Folder($webrootPath))->findRecursive();
+        $targetFiles = (new Folder($appWebrootPath))->findRecursive();
+        $this->assertEquals(count($sourceFiles), count($targetFiles));
+    }
+
+    public function testInstallInProductionMode()
+    {
         Configure::write('debug', false);
         $this->Shell->install();
+        Configure::write('debug', true);
+
+        $pluginPath = Plugin::path('BootstrapUI');
+        $nodePath = $pluginPath . 'node_modules';
+        $webrootPath = $pluginPath . 'webroot' . DS;
+        $cssPath = $webrootPath . 'css' . DS;
+        $jsPath = $webrootPath . 'js' . DS;
+
+        $this->assertDirectoryExists($nodePath);
+        $this->assertDirectoryExists($webrootPath);
+
+        $this->assertDirectoryExists($cssPath);
+        $this->assertFileExists($cssPath . 'bootstrap.min.css');
+
+        $this->assertDirectoryExists($jsPath);
+        $this->assertFileExists($jsPath . 'bootstrap.min.js');
+        $this->assertFileExists($jsPath . 'jquery.min.js');
+        $this->assertFileExists($jsPath . 'popper.min.js');
+
+        $appWebrootPath = WWW_ROOT . 'bootstrap_u_i' . DS;
+        $appCssPath = $webrootPath . 'css' . DS;
+        $appJsPath = $webrootPath . 'js' . DS;
+
+        $this->assertDirectoryExists($appWebrootPath);
+        $this->assertDirectoryExists($appCssPath);
+        $this->assertDirectoryExists($appJsPath);
 
-        $this->_assetDir = new Folder(Plugin::path('BootstrapUI') . 'webroot');
-        $this->assertDirectoryExists($this->_assetDir->path . DS . 'css');
-        $this->assertDirectoryExists($this->_assetDir->path . DS . 'js');
+        $sourceFiles = (new Folder($webrootPath))->findRecursive();
+        $targetFiles = (new Folder($appWebrootPath))->findRecursive();
+        $this->assertEquals(count($sourceFiles), count($targetFiles));
     }
 
     public function testCopyLayouts()