Merge pull request #620 from highstrike/patch-1

Update Application.php
cakephp · Jul 10, 2018 · 3fd8ce3 · 3fd8ce3
2 parents a947873 + 8dd3d32
commit 3fd8ce3
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 0 deletions.
diff --git a/src/Application.php b/src/Application.php
@@ -15,6 +15,7 @@
 namespace App;
 
 use Cake\Core\Configure;
+use Cake\Core\Exception\MissingPluginException;
 use Cake\Error\Middleware\ErrorHandlerMiddleware;
 use Cake\Http\BaseApplication;
 use Cake\Http\Middleware\CsrfProtectionMiddleware;

diff --git a/tests/TestCase/ApplicationTest.php b/tests/TestCase/ApplicationTest.php
@@ -21,13 +21,51 @@
 use Cake\Routing\Middleware\AssetMiddleware;
 use Cake\Routing\Middleware\RoutingMiddleware;
 use Cake\TestSuite\IntegrationTestCase;
+use InvalidArgumentException;
 
 /**
  * ApplicationTest class
  */
 class ApplicationTest extends IntegrationTestCase
 {
 
+    /**
+     * testBootstrap
+     *
+     * @return void
+     */
+    public function testBootstrap()
+    {
+        $app = new Application(dirname(dirname(__DIR__)) . '/config');
+        $app->bootstrap();
+        $plugins = $app->getPlugins();
+
+        $this->assertCount(3, $plugins);
+        $this->assertSame('Bake', $plugins->get('Bake')->getName());
+        $this->assertSame('Migrations', $plugins->get('Migrations')->getName());
+        $this->assertSame('DebugKit', $plugins->get('DebugKit')->getName());
+    }
+
+    /**
+     * testBootstrapPluginWitoutHalt
+     *
+     * @return void
+     */
+    public function testBootstrapPluginWitoutHalt()
+    {
+        $this->expectException(InvalidArgumentException::class);
+
+        $app = $this->getMockBuilder(Application::class)
+            ->setConstructorArgs([dirname(dirname(__DIR__)) . '/config'])
+            ->setMethods(['addPlugin'])
+            ->getMock();
+
+        $app->method('addPlugin')
+            ->will($this->throwException(new InvalidArgumentException('test exception.')));
+
+        $app->bootstrap();
+    }
+
     /**
      * testMiddleware
      *