Skip to content

[Stable9] Make theming work with pretty URLs #370

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

Merged
MariusBluem merged 2 commits into from
Jul 12, 2016
Merged

[Stable9] Make theming work with pretty URLs #370

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f28ed8
Make theming work with pretty URLs
Jul 11, 2016
3c0ba18
Fix tests
Jul 11, 2016
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
Prev Previous commit
Fix tests 
(cherry picked from commit eceb0db)
  • Loading branch information
oparoz committed Jul 11, 2016
commit 3c0ba186e1ba98d028486ed11f0f139b3bba23f1
8 changes: 4 additions & 4 deletions apps/theming/tests/lib/controller/ThemingControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ public function testGetStylesheetWithOnlyColor() {
->with('theming', 'backgroundMime', '')
->willReturn('');

$expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header {background-color: #fff}', 'style.css', 'text/css');
$expected = new Http\DataDownloadResponse('#body-user #header,#body-settings #header,#body-public #header {background-color: #fff}', 'style', 'text/css');
$expected->cacheFor(3600);
@$this->assertEquals($expected, $this->themingController->getStylesheet());
}
Expand Down Expand Up @@ -356,7 +356,7 @@ public function testGetStylesheetWithOnlyHeaderLogo() {
#header .logo-icon {
background-image: url(\'./logo?v=0\');
background-size: 62px 34px;
}', 'style.css', 'text/css');
}', 'style', 'text/css');
$expected->cacheFor(3600);
@$this->assertEquals($expected, $this->themingController->getStylesheet());
}
Expand Down Expand Up @@ -385,7 +385,7 @@ public function testGetStylesheetWithOnlyBackgroundLogin() {

$expected = new Http\DataDownloadResponse('#body-login {
background-image: url(\'./loginbackground?v=0\');
}', 'style.css', 'text/css');
}', 'style', 'text/css');
$expected->cacheFor(3600);
@$this->assertEquals($expected, $this->themingController->getStylesheet());
}
Expand Down Expand Up @@ -420,7 +420,7 @@ public function testGetStylesheetWithAllCombined() {
background-size: 62px 34px;
}#body-login {
background-image: url(\'./loginbackground?v=0\');
}', 'style.css', 'text/css');
}', 'style', 'text/css');
$expected->cacheFor(3600);
@$this->assertEquals($expected, $this->themingController->getStylesheet());
}
Expand Down