Skip to content

For compattibility with Url::asset() and Html::style/script() #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
arturmamedov wants to merge 2 commits into
base: master
Choose a base branch
from
Open

For compattibility with Url::asset() and Html::style/script() #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23fb566
For compattibility with Url::asset() and Html::style/script()
arturmamedov Sep 24, 2020
df646d2
Added tests for check Subfolder Assets
arturmamedov Sep 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Stylist/Html/ThemeHtmlBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function image($url, $alt = null, $attributes = array(), $secure = null)
*/
public function url($file = '')
{
return url($this->assetUrl($file));
return asset($this->assetUrl($file));
}

/**
Expand Down
24 changes: 24 additions & 0 deletions tests/Html/ThemeHtmlBuilderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,28 @@ public function testAssetUrlResponse()
$this->assertEquals(url('themes/parent-theme/'), $this->builder->url());
$this->assertEquals(url('themes/parent-theme/favicon.ico'), $this->builder->url('favicon.ico'));
}

public function testSubfolderAssets()
{
// set subfolder
config(['app.url' => 'http://localhost/subfolder']);
config(['app.asset_url' => 'http://localhost/subfolder']);
$this->app['url']->forceRootUrl('/subfolder');

// check script in subfolder
$script = $this->builder->script('js/app.js');
$this->assertContains('/subfolder/themes/parent-theme/js/app.js', (string) $script);

// check style in subfolder
$style = $this->builder->style('css/app.css');
$this->assertContains('/subfolder/themes/parent-theme/css/app.css', (string) $style);

// check asset url in subfolder
$url = $this->builder->url('css/app.css');
$this->assertContains('/subfolder/themes/parent-theme/css/app.css', (string) $url);

// check link in subfolder
$link = $this->builder->linkAsset('css/app.css');
$this->assertContains('/subfolder/themes/parent-theme/css/app.css', (string) $link);
}
}