Merge pull request #4268 from antograssiot/3.0

Add test for missing datasource config template

src/Database/Error/MissingDriverException.php

@@ -21,6 +21,6 @@ class MissingDriverException extends \Cake\Error\Exception {
 /**
  * {@inheritDoc}
  */
-	protected $_messageTemplate = 'Database driver "%s" could not be found.';
+	protected $_messageTemplate = 'Database driver %s could not be found.';
 
 }

tests/TestCase/Database/ConnectionTest.php

@@ -65,7 +65,7 @@ class ConnectionTest extends TestCase {
  * Tests creating a connection using no driver throws an exception
  *
  * @expectedException \Cake\Database\Error\MissingDriverException
- * @expectedExceptionMessage Database driver "" could not be found.
+ * @expectedExceptionMessage Database driver  could not be found.
  * @return void
  */
 	public function testNoDriver() {
@@ -76,7 +76,7 @@ class ConnectionTest extends TestCase {
  * Tests creating a connection using an invalid driver throws an exception
  *
  * @expectedException \Cake\Database\Error\MissingDriverException
- * @expectedExceptionMessage Database driver "" could not be found.
+ * @expectedExceptionMessage Database driver  could not be found.
  * @return void
  */
 	public function testEmptyDriver() {
@@ -87,7 +87,7 @@ class ConnectionTest extends TestCase {
  * Tests creating a connection using an invalid driver throws an exception
  *
  * @expectedException \Cake\Database\Error\MissingDriverException
- * @expectedExceptionMessage Database driver "\Foo\InvalidDriver" could not be found.
+ * @expectedExceptionMessage Database driver \Foo\InvalidDriver could not be found.
  * @return void
  */
 	public function testMissingDriver() {

tests/TestCase/Error/ExceptionRendererTest.php

@@ -24,6 +24,7 @@ use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Error\MissingPluginException;
 use Cake\Core\Plugin;
+use Cake\Datasource\Error\MissingDatasourceConfigException;
 use Cake\Error;
 use Cake\Error\ExceptionRenderer;
 use Cake\Event\Event;
@@ -565,6 +566,14 @@ class ExceptionRendererTest extends TestCase {
 				500
 			),
 			array(
+				new MissingDatasourceConfigException(array('name' => 'MyDatasourceConfig')),
+				array(
+					'/<h2>Missing Datasource Configuration<\/h2>/',
+					'/<em>MyDatasourceConfig<\/em> was not found/'
+				),
+				500
+			),
+			array(
 				new \Exception('boom'),
 				array(
 					'/Internal Error/'