Relocating theme assets and updating tests

src/View/Helper.php

@@ -219,7 +219,7 @@ class Helper implements EventListener {
 				$file = str_replace('/', '\\', $file);
 			}
 
-			if (file_exists(Configure::read('App.www_root') . $theme . DS . $file)) {
+			if (file_exists(Configure::read('App.www_root') . $theme . $file)) {
 				$webPath = "{$this->request->webroot}" . $theme . $asset[0];
 			} else {
 				$themePath = Plugin::path($this->theme);

tests/TestCase/View/Helper/HtmlHelperTest.php

@@ -451,7 +451,7 @@ class HtmlHelperTest extends TestCase {
 		$result = $this->Html->image('__cake_test_image.gif');
 		$this->assertTags($result, array(
 			'img' => array(
-				'src' => 'preg:/\/theme\/test_theme\/img\/__cake_test_image\.gif\?\d+/',
+				'src' => 'preg:/\/test_theme\/img\/__cake_test_image\.gif\?\d+/',
 				'alt' => ''
 		)));
 
@@ -460,7 +460,7 @@ class HtmlHelperTest extends TestCase {
 
 		$this->assertTags($result, array(
 			'img' => array(
-				'src' => 'preg:/\/testing\/theme\/test_theme\/img\/__cake_test_image\.gif\?\d+/',
+				'src' => 'preg:/\/testing\/test_theme\/img\/__cake_test_image\.gif\?\d+/',
 				'alt' => ''
 		)));
 	}