Revert "Where is your data?"

2 files changed, 3 insertions, 103 deletions

diff --git a/tests/Settings/Controller/ServerInfoSettingsControllerTest.php b/tests/Settings/Controller/ServerInfoSettingsControllerTest.php
deleted file mode 100644
index 8d2083d0acb..00000000000
--- a/tests/Settings/Controller/ServerInfoSettingsControllerTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2018 Michael Weimann <mail@michael-weimann.eu>
- *
- * @author Michael Weimann <mail@michael-weimann.eu>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace Settings\Controller;
-
-use OC\Settings\Theming\ServerInfo;
-use OC\Settings\Controller\ServerInfoSettingsController;
-use OCP\IConfig;
-use OCP\IRequest;
-use PHPUnit\Framework\MockObject\MockObject;
-use Test\TestCase;
-
-/**
- * This class provides tests for the server info settings controller.
- */
-class ServerInfoSettingsControllerTest extends TestCase {
-
-	/**
-	 * @var IConfig|MockObject
-	 */
-	private $config;
-
-	/**
-	 * @var ServerInfoSettingsController
-	 */
-	private $controller;
-
-	/**
-	 * Does the test setup.
-	 */
-	protected function setUp() {
-		parent::setUp();
-
-		$request = $this->getMockBuilder(IRequest::class)->getMock();
-		/* @var IRequest|MockObject $request */
-		$this->config = $this->getMockBuilder(IConfig::class)->getMock();
-		$this->controller = new ServerInfoSettingsController(
-			'settings',
-			$request,
-			$this->config
-		);
-	}
-
-	/**
-	 * Tests that the handler passes the params to the config.
-	 */
-	public function testStoreServerInfo() {
-
-		$location = 'test-location';
-		$provider = 'test-provider';
-		$providerWebsite = 'https://example.com/';
-		$providerPrivacyLink = 'https://example.com/privacy';
-		$adminContact = 'testuser';
-
-		$this->config->expects($this->once())
-			->method('setSystemValues')
-			->with([
-				ServerInfo::SETTING_LOCATION => $location,
-				ServerInfo::SETTING_PROVIDER => $provider,
-				ServerInfo::SETTING_PROVIDER_WEBSITE => $providerWebsite,
-				ServerInfo::SETTING_PROVIDER_PRIVACY_LINK => $providerPrivacyLink,
-				ServerInfo::SETTING_PROVIDER_ADMIN_CONTACT => $adminContact,
-			]);
-
-		$this->controller->storeServerInfo(
-			$location,
-			$provider,
-			$providerWebsite,
-			$providerPrivacyLink,
-			$adminContact
-		);
-
-	}
-
-}
diff --git a/tests/lib/Settings/ManagerTest.php b/tests/lib/Settings/ManagerTest.php
index 8323452934f..b82fb5bc3ca 100644
--- a/tests/lib/Settings/ManagerTest.php
+++ b/tests/lib/Settings/ManagerTest.php
@@ -72,14 +72,13 @@ 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'],
 				['core', 'actions/settings-dark.svg', '1'],
 				['core', 'actions/share.svg', '2'],
 				['core', 'actions/password.svg', '3'],
-				['settings', 'theming-dark.svg', '6'],
 				['core', 'places/contacts.svg', '5'],
 				['settings', 'help.svg', '4'],
 			]);
@@ -89,7 +88,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')],
-			30 => [new Section('theming', 'Theming', 0, '6')],
 			50 => [new Section('groupware', 'Groupware', 0, '5')],
 			55 => [\OC::$server->query(\OCA\WorkflowEngine\Settings\Section::class)],
 			98 => [new Section('additional', 'Additional settings', 0, '1')],
@@ -126,14 +124,13 @@ 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'],
 				['core', 'actions/settings-dark.svg', '1'],
 				['core', 'actions/share.svg', '2'],
 				['core', 'actions/password.svg', '3'],
-				['settings', 'theming-dark.svg', '6'],
 				['core', 'places/contacts.svg', '5'],
 				['settings', 'help.svg', '4'],
 			]);
@@ -143,7 +140,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')],
-			30 => [new Section('theming', 'Theming', 0, '6')],
 			50 => [new Section('groupware', 'Groupware', 0, '5')],
 			98 => [new Section('additional', 'Additional settings', 0, '1')],
 		], $this->manager->getAdminSections());
@@ -213,7 +209,7 @@ class ManagerTest extends TestCase {
 		$this->manager->registerSection('personal', \OCA\WorkflowEngine\Settings\Section::class);
 		$this->manager->registerSection('admin', \OCA\WorkflowEngine\Settings\Section::class);
 
-		$this->url->expects($this->exactly(10))
+		$this->url->expects($this->exactly(9))
 			->method('imagePath')
 			->willReturnMap([
 				['core', 'actions/info.svg', '1'],
@@ -223,7 +219,6 @@ class ManagerTest extends TestCase {
 				['core', 'actions/settings-dark.svg', '1'],
 				['core', 'actions/share.svg', '2'],
 				['core', 'actions/password.svg', '3'],
-				['settings', 'theming-dark.svg', '6'],
 				['core', 'places/contacts.svg', '5'],
 				['settings', 'help.svg', '4'],
 			]);
@@ -240,7 +235,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')],
-			30 => [new Section('theming', 'Theming', 0, '6')],
 			50 => [new Section('groupware', 'Groupware', 0, '5')],
 			55 => [\OC::$server->query(\OCA\WorkflowEngine\Settings\Section::class)],
 			98 => [new Section('additional', 'Additional settings', 0, '1')],