Merge pull request #22935 from owncloud/stable8.2-remove-wrongly-backported-test

Remove wrongly backported test

2 files changed, 1 insertions, 57 deletions

diff --git a/apps/dav/tests/unit/connector/sabre/requesttest/partfileinrootupload.php b/apps/dav/tests/unit/connector/sabre/requesttest/partfileinrootupload.php
deleted file mode 100644
index 52790c5b00b..00000000000
--- a/apps/dav/tests/unit/connector/sabre/requesttest/partfileinrootupload.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * @author Robin Appelman <icewind@owncloud.com>
- * @author Thomas Müller <thomas.mueller@tmit.eu>
- *
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * 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, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest;
-
-use OC\Files\View;
-use Test\Traits\EncryptionTrait;
-
-/**
- * Class EncryptionUploadTest
- *
- * @group DB
- *
- * @package OCA\DAV\Tests\Unit\Connector\Sabre\RequestTest
- */
-class PartFileInRootUpload extends UploadTest {
-	protected function setUp() {
-		$config = \OC::$server->getConfig();
-		$mockConfig = $this->getMock('\OCP\IConfig');
-		$mockConfig->expects($this->any())
-			->method('getSystemValue')
-			->will($this->returnCallback(function ($key, $default) use ($config) {
-				if ($key === 'part_file_in_storage') {
-					return false;
-				} else {
-					return $config->getSystemValue($key, $default);
-				}
-			}));
-		$this->overwriteService('AllConfig', $mockConfig);
-		parent::setUp();
-	}
-
-	protected function tearDown() {
-		$this->restoreService('AllConfig');
-		return parent::tearDown();
-	}
-}
diff --git a/apps/files_sharing/tests/grouppropagationmanager.php b/apps/files_sharing/tests/grouppropagationmanager.php
index 6fc6ef7a532..2e5ef8f7587 100644
--- a/apps/files_sharing/tests/grouppropagationmanager.php
+++ b/apps/files_sharing/tests/grouppropagationmanager.php
@@ -73,7 +73,7 @@ class GroupPropagationManagerTest extends TestCase {
 		$userSession = $this->getMockBuilder('\OCP\IUserSession')
 		                    ->disableOriginalConstructor()
 		                    ->getMock();
-		$userSession->method('getUser')->willReturn(selF::TEST_FILES_SHARING_API_USER1);
+		$userSession->method('getUser')->willReturn(self::TEST_FILES_SHARING_API_USER1);
 
 		$this->propagationManager = $this->getMockBuilder('OCA\Files_Sharing\Propagation\PropagationManager')
 			->disableOriginalConstructor()