summaryrefslogtreecommitdiffstats
path: root/apps/theming/tests
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-03-27 19:27:49 +0200
committerGitHub <noreply@github.com>2018-03-27 19:27:49 +0200
commit06f52ead312aa5f556ad02f01abe48bcc049e28a (patch)
tree345533425a327ba18830ec12fcf96964a7132396 /apps/theming/tests
parent709589f2dbe3ce49f3bd71e1531e723353ee631d (diff)
parentb6501ae966582047a65b22b93f45c5bab049426d (diff)
downloadnextcloud-server-06f52ead312aa5f556ad02f01abe48bcc049e28a.tar.gz
nextcloud-server-06f52ead312aa5f556ad02f01abe48bcc049e28a.zip
Merge pull request #8993 from nextcloud/theming-allow-ui-with-theme
Show UI when using a custom theme
Diffstat (limited to 'apps/theming/tests')
-rw-r--r--apps/theming/tests/Settings/AdminTest.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/theming/tests/Settings/AdminTest.php b/apps/theming/tests/Settings/AdminTest.php
index bb68651d143..ee49cf0f1f6 100644
--- a/apps/theming/tests/Settings/AdminTest.php
+++ b/apps/theming/tests/Settings/AdminTest.php
@@ -118,8 +118,8 @@ class AdminTest extends TestCase {
$this->l10n
->expects($this->once())
->method('t')
- ->with('You are already using a custom theme')
- ->willReturn('You are already using a custom theme');
+ ->with('You are already using a custom theme. Theming app settings might be overwritten by that.')
+ ->willReturn('You are already using a custom theme. Theming app settings might be overwritten by that.');
$this->themingDefaults
->expects($this->once())
->method('getEntity')
@@ -143,7 +143,7 @@ class AdminTest extends TestCase {
->willReturn('/my/route');
$params = [
'themable' => false,
- 'errorMessage' => 'You are already using a custom theme',
+ 'errorMessage' => 'You are already using a custom theme. Theming app settings might be overwritten by that.',
'name' => 'MyEntity',
'url' => 'https://example.com',
'slogan' => 'MySlogan',