diff options
author | Morris Jobke <hey@morrisjobke.de> | 2017-04-25 10:25:29 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-25 10:25:29 -0300 |
commit | 6f2df5e49570d6c4a5b2f48a931ddf3a5fbd4c39 (patch) | |
tree | 4f84aaceccb367c97d9b34ceaa9112673c972e11 /tests | |
parent | 82c9eb1c5654562e8057953356af49b7295a7561 (diff) | |
parent | 88bc43182f3352fd5ddb23c01b9b7b3ae4b6b2fd (diff) | |
download | nextcloud-server-6f2df5e49570d6c4a5b2f48a931ddf3a5fbd4c39.tar.gz nextcloud-server-6f2df5e49570d6c4a5b2f48a931ddf3a5fbd4c39.zip |
Merge pull request #3195 from nextcloud/settings-apps-tabular
Make apps settings tabular
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Settings/Controller/AppSettingsControllerTest.php | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/Settings/Controller/AppSettingsControllerTest.php b/tests/Settings/Controller/AppSettingsControllerTest.php index a3e4a6fd828..14dc33ca191 100644 --- a/tests/Settings/Controller/AppSettingsControllerTest.php +++ b/tests/Settings/Controller/AppSettingsControllerTest.php @@ -92,14 +92,19 @@ class AppSettingsControllerTest extends TestCase { public function testListCategories() { $expected = new JSONResponse([ [ + 'id' => 2, + 'ident' => 'installed', + 'displayName' => 'Your apps', + ], + [ 'id' => 0, 'ident' => 'enabled', - 'displayName' => 'Enabled', + 'displayName' => 'Enabled apps', ], [ 'id' => 1, 'ident' => 'disabled', - 'displayName' => 'Not enabled', + 'displayName' => 'Disabled apps', ], [ 'id' => 'auth', @@ -175,7 +180,7 @@ class AppSettingsControllerTest extends TestCase { $policy = new ContentSecurityPolicy(); $policy->addAllowedImageDomain('https://usercontent.apps.nextcloud.com'); - $expected = new TemplateResponse('settings', 'apps', ['category' => 'enabled', 'appstoreEnabled' => true], 'user'); + $expected = new TemplateResponse('settings', 'apps', ['category' => 'installed', 'appstoreEnabled' => true], 'user'); $expected->setContentSecurityPolicy($policy); $this->assertEquals($expected, $this->appSettingsController->viewApps()); @@ -195,7 +200,7 @@ class AppSettingsControllerTest extends TestCase { $policy = new ContentSecurityPolicy(); $policy->addAllowedImageDomain('https://usercontent.apps.nextcloud.com'); - $expected = new TemplateResponse('settings', 'apps', ['category' => 'enabled', 'appstoreEnabled' => false], 'user'); + $expected = new TemplateResponse('settings', 'apps', ['category' => 'installed', 'appstoreEnabled' => false], 'user'); $expected->setContentSecurityPolicy($policy); $this->assertEquals($expected, $this->appSettingsController->viewApps()); |