summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-08-02 20:23:21 +0200
committerGitHub <noreply@github.com>2018-08-02 20:23:21 +0200
commit01298cfa72105802533a2f0757c45a50c6d9bc67 (patch)
tree8928e01a103d88d039597dd7816cc1618ccc7b83 /tests
parent9057621d64589d1a45040e9dfbf87dd908e9acbb (diff)
parent84f99db7ab96746b9dc3fa662c136912c34274eb (diff)
downloadnextcloud-server-01298cfa72105802533a2f0757c45a50c6d9bc67.tar.gz
nextcloud-server-01298cfa72105802533a2f0757c45a50c6d9bc67.zip
Merge pull request #10480 from nextcloud/bugfix/10420/settings
Settings design polishing
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/Settings/Admin/EncryptionTest.php4
-rw-r--r--tests/lib/Settings/ManagerTest.php6
2 files changed, 4 insertions, 6 deletions
diff --git a/tests/lib/Settings/Admin/EncryptionTest.php b/tests/lib/Settings/Admin/EncryptionTest.php
index 41196a9bc41..9be2a3f46d9 100644
--- a/tests/lib/Settings/Admin/EncryptionTest.php
+++ b/tests/lib/Settings/Admin/EncryptionTest.php
@@ -129,10 +129,10 @@ class EncryptionTest extends TestCase {
}
public function testGetSection() {
- $this->assertSame('encryption', $this->admin->getSection());
+ $this->assertSame('security', $this->admin->getSection());
}
public function testGetPriority() {
- $this->assertSame(0, $this->admin->getPriority());
+ $this->assertSame(10, $this->admin->getPriority());
}
}
diff --git a/tests/lib/Settings/ManagerTest.php b/tests/lib/Settings/ManagerTest.php
index 76f6d867d3a..df7e59841ce 100644
--- a/tests/lib/Settings/ManagerTest.php
+++ b/tests/lib/Settings/ManagerTest.php
@@ -115,7 +115,7 @@ class ManagerTest extends TestCase {
$this->manager->registerSection('admin', \OCA\WorkflowEngine\Settings\Section::class);
- $this->url->expects($this->exactly(7))
+ $this->url->expects($this->exactly(6))
->method('imagePath')
->willReturnMap([
['settings', 'admin.svg', '0'],
@@ -131,7 +131,6 @@ class ManagerTest extends TestCase {
1 => [new Section('server', 'Basic settings', 0, '1')],
5 => [new Section('sharing', 'Sharing', 0, '2')],
10 => [new Section('security', 'Security', 0, '3')],
- 45 => [new Section('encryption', 'Encryption', 0, '3')],
50 => [new Section('groupware', 'Groupware', 0, '5')],
55 => [\OC::$server->query(\OCA\WorkflowEngine\Settings\Section::class)],
98 => [new Section('additional', 'Additional settings', 0, '1')],
@@ -168,7 +167,7 @@ class ManagerTest extends TestCase {
->method('t')
->will($this->returnArgument(0));
- $this->url->expects($this->exactly(7))
+ $this->url->expects($this->exactly(6))
->method('imagePath')
->willReturnMap([
['settings', 'admin.svg', '0'],
@@ -184,7 +183,6 @@ class ManagerTest extends TestCase {
1 => [new Section('server', 'Basic settings', 0, '1')],
5 => [new Section('sharing', 'Sharing', 0, '2')],
10 => [new Section('security', 'Security', 0, '3')],
- 45 => [new Section('encryption', 'Encryption', 0, '3')],
50 => [new Section('groupware', 'Groupware', 0, '5')],
98 => [new Section('additional', 'Additional settings', 0, '1')],
], $this->manager->getAdminSections());