Merge remote-tracking branch 'origin/develop'

elboletaire · May 6, 2016 · 0cf60b3 · 0cf60b3
2 parents 3c6336b + 2c0bc31
commit 0cf60b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/View/Helper/LessHelper.php b/src/View/Helper/LessHelper.php
@@ -343,9 +343,7 @@ protected function assetBaseUrl($plugin, $asset)
         $dir  = dirname($asset);
         $path = !empty($dir) && $dir != '.' ? "/$dir" : null;
 
-        return $this->Url->assetUrl($plugin . $path, [
-            'fullBase' => true
-        ]);
+        return $this->Url->assetUrl($plugin . $path);
     }
 
     /**

diff --git a/tests/TestCase/View/Helper/LessHelperTest.php b/tests/TestCase/View/Helper/LessHelperTest.php
@@ -226,19 +226,19 @@ public function testAssetBaseUrl()
             'Less',
             'less/styles.less'
         ]);
-        $this->assertEquals('http://localhost/Less/less', $result);
+        $this->assertEquals('/Less/less', $result);
 
         $result = $assetBaseUrl->invokeArgs($this->Less, [
             'Bootstrap',
             'css/whatever.less'
         ]);
-        $this->assertEquals('http://localhost/Bootstrap/css', $result);
+        $this->assertEquals('/Bootstrap/css', $result);
 
         $result = $assetBaseUrl->invokeArgs($this->Less, [
             'Less',
             'whatever.less'
         ]);
-        $this->assertEquals('http://localhost/Less', $result);
+        $this->assertEquals('/Less', $result);
     }
 
     protected static function getProtectedMethod($name)