Fixing tests and removing one that made no sense

cakephp · Jun 9, 2014 · 3a66afa · 3a66afa
1 parent 697dfce
commit 3a66afa
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 29 deletions.
diff --git a/src/Controller/Controller.php b/src/Controller/Controller.php
@@ -325,7 +325,7 @@ public function __get($name) {
  */
 	public function setRequest(Request $request) {
 		$this->request = $request;
-		$this->plugin = isset($request->params['plugin']) ? Inflector::camelize($request->params['plugin']) : null;
+		$this->plugin = isset($request->params['plugin']) ? $request->params['plugin'] : null;
 		$this->view = isset($request->params['action']) ? $request->params['action'] : null;
 
 		if (isset($request->params['pass'])) {

diff --git a/src/TestSuite/ControllerTestCase.php b/src/TestSuite/ControllerTestCase.php
@@ -286,9 +286,9 @@ protected function _testAction($url = '', $options = array()) {
 		if ($this->controller === null && $this->autoMock) {
 			$plugin = '';
 			if (!empty($request->params['plugin'])) {
-				$plugin = Inflector::camelize($request->params['plugin']) . '.';
+				$plugin = $request->params['plugin'] . '.';
 			}
-			$controllerName = Inflector::camelize($request->params['controller']);
+			$controllerName = $request->params['controller'];
 			if (!empty($request->params['prefix'])) {
 				$controllerName = Inflector::camelize($request->params['prefix']) . '/' . $controllerName;
 			}

diff --git a/src/View/Helper.php b/src/View/Helper.php
@@ -319,7 +319,7 @@ public function assetTimestamp($path) {
 				//@codingStandardsIgnoreEnd
 			}
 			$segments = explode('/', ltrim($filepath, '/'));
-			$plugin = Inflector::camelize($segments[0]);
+			$plugin = $segments[0];
 			if (Plugin::loaded($plugin)) {
 				unset($segments[0]);
 				$pluginPath = Plugin::path($plugin) . 'webroot' . DS . implode(DS, $segments);

diff --git a/src/View/Helper/HtmlHelper.php b/src/View/Helper/HtmlHelper.php
@@ -18,7 +18,6 @@
 use Cake\Core\Configure;
 use Cake\Error;
 use Cake\Network\Response;
-use Cake\Utility\Inflector;
 use Cake\View\Helper;
 use Cake\View\Helper\StringTemplateTrait;
 use Cake\View\View;

diff --git a/tests/TestCase/TestSuite/ControllerTestCaseTest.php b/tests/TestCase/TestSuite/ControllerTestCaseTest.php
@@ -52,6 +52,7 @@ public function setUp() {
 		DispatcherFactory::add('Routing');
 		DispatcherFactory::add('ControllerFactory');
 		Router::reload();
+		require CAKE . 'Config/routes.php';
 		TableRegistry::clear();
 	}
 
@@ -227,37 +228,13 @@ public function testTestActionWithPlugin() {
 		$this->assertEquals('It is a variable', $this->Case->controller->viewVars['test_value']);
 	}
 
-/**
- * Tests using loaded routes during tests
- *
- * @return void
- */
-	public function testUseRoutes() {
-		Router::connect('/:controller/:action/*');
-		include APP . '/Config/routes.php';
-
-		$controller = $this->Case->generate('TestsApps');
-		$controller->components()->load('RequestHandler');
-		$result = $this->Case->testAction('/tests_apps/index.json', array('return' => 'contents'));
-		$result = json_decode($result, true);
-		$expected = array('cakephp' => 'cool');
-		$this->assertEquals($expected, $result);
-
-		include APP . '/Config/routes.php';
-		$result = $this->Case->testAction('/some_alias');
-		$this->assertEquals(5, $result);
-	}
-
 /**
  * Tests not using loaded routes during tests
  *
  * @expectedException \Cake\Controller\Error\MissingActionException
  * @return void
  */
 	public function testSkipRoutes() {
-		Router::connect('/:controller/:action/*');
-		include APP . 'Config/routes.php';
-
 		$this->Case->loadRoutes = false;
 		$this->Case->testAction('/tests_apps/missing_action.json', array('return' => 'view'));
 	}