Remove un-used files.

* Update Plugin tests as there was an unused plugin.
cakephp · Oct 14, 2012 · 471709a · 471709a
1 parent 7fe7ce7
commit 471709a
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 185 deletions.
diff --git a/lib/Cake/Test/TestApp/Controller/MergeVariablesController.php b/lib/Cake/Test/TestApp/Controller/MergeVariablesController.php
diff --git a/lib/Cake/Test/TestApp/Controller/MergeVarsAppController.php b/lib/Cake/Test/TestApp/Controller/MergeVarsAppController.php
diff --git a/lib/Cake/Test/TestApp/Plugin/MergeVar/Config/bootstrap.php b/lib/Cake/Test/TestApp/Plugin/MergeVar/Config/bootstrap.php
diff --git a/lib/Cake/Test/TestApp/Plugin/MergeVar/Controller/Controller.php b/lib/Cake/Test/TestApp/Plugin/MergeVar/Controller/Controller.php
diff --git a/lib/Cake/Test/TestApp/Plugin/MergeVar/Controller/MergePostsController.php b/lib/Cake/Test/TestApp/Plugin/MergeVar/Controller/MergePostsController.php
diff --git a/lib/Cake/Test/TestCase/Core/PluginTest.php b/lib/Cake/Test/TestCase/Core/PluginTest.php
@@ -1,9 +1,5 @@
 <?php
 /**
- * PluginTest file.
- *
- * PHP 5
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -12,11 +8,11 @@
  *
  * @copyright     Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       Cake.Test.Case.Core
  * @since         CakePHP(tm) v 2.0
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 namespace Cake\Test\TestCase\Core;
+
 use Cake\Core\App;
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
@@ -25,6 +21,7 @@
 /**
  * PluginTest class
  *
+ * @package Cake.Test.Case.Core
  */
 class PluginTest extends TestCase {
 
@@ -245,7 +242,7 @@ public function testPathNotFound() {
  */
 	public function testLoadAll() {
 		Plugin::loadAll();
-		$expected = array('MergeVar', 'PluginJs', 'TestPlugin', 'TestPluginTwo');
+		$expected = ['PluginJs', 'TestPlugin', 'TestPluginTwo'];
 		$this->assertEquals($expected, Plugin::loaded());
 	}
 
@@ -257,7 +254,7 @@ public function testLoadAll() {
 	public function testLoadAllWithDefaults() {
 		$defaults = array('bootstrap' => true);
 		Plugin::loadAll(array($defaults));
-		$expected = array('MergeVar', 'PluginJs', 'TestPlugin', 'TestPluginTwo');
+		$expected = ['PluginJs', 'TestPlugin', 'TestPluginTwo'];
 		$this->assertEquals($expected, Plugin::loaded());
 		$this->assertEquals('loaded js plugin bootstrap', Configure::read('PluginTest.js_plugin.bootstrap'));
 		$this->assertEquals('loaded plugin bootstrap', Configure::read('PluginTest.test_plugin.bootstrap'));
@@ -274,7 +271,7 @@ public function testLoadAllWithDefaultsAndOverride() {
 		Plugin::loadAll(array(array('bootstrap' => true), 'TestPlugin' => array('routes' => true)));
 		Plugin::routes();
 
-		$expected = array('MergeVar', 'PluginJs', 'TestPlugin', 'TestPluginTwo');
+		$expected = ['PluginJs', 'TestPlugin', 'TestPluginTwo'];
 		$this->assertEquals($expected, Plugin::loaded());
 		$this->assertEquals('loaded js plugin bootstrap', Configure::read('PluginTest.js_plugin.bootstrap'));
 		$this->assertEquals('loaded plugin routes', Configure::read('PluginTest.test_plugin.routes'));