Fix tests

Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
nextcloud · Dec 2, 2019 · 5e8cc6e · 5e8cc6e
1 parent 0bf6fcd
commit 5e8cc6e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 17 deletions.
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js b/apps/files_sharing/js/dist/files_sharing_tab.js
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js.map b/apps/files_sharing/js/dist/files_sharing_tab.js.map
diff --git a/apps/files_sharing/lib/AppInfo/Application.php b/apps/files_sharing/lib/AppInfo/Application.php
@@ -49,7 +49,6 @@
 use OCP\Defaults;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Federation\ICloudIdManager;
-use OCP\IContainer;
 use OCP\Files\Config\IMountProviderCollection;
 use OCP\IContainer;
 use OCP\IGroup;

diff --git a/apps/files_sharing/tests/TestCase.php b/apps/files_sharing/tests/TestCase.php
@@ -71,9 +71,8 @@ abstract class TestCase extends \Test\TestCase {
 	public static function setUpBeforeClass(): void {
 		parent::setUpBeforeClass();
 
-		$application = new Application();
-		$application->registerMountProviders();
-
+		new Application();
+
 		// reset backend
 		\OC_User::clearBackends();
 		\OC::$server->getGroupManager()->clearBackends();

diff --git a/apps/files_trashbin/tests/TrashbinTest.php b/apps/files_trashbin/tests/TrashbinTest.php
@@ -28,6 +28,7 @@
  */
 
 use OCA\Files_Trashbin\Tests;
+use OCA\Files_Sharing\AppInfo\Application;
 
 /**
  * Class Test_Encryption
@@ -67,8 +68,9 @@ public static function setUpBeforeClass(): void {
 		// clear share hooks
 		\OC_Hook::clear('OCP\\Share');
 		\OC::registerShareHooks();
-		$application = \OC::$server->query(\OCA\Files_Sharing\AppInfo\Application::class);
-		$application->registerMountProviders();
+
+		// init files sharing
+		new Application();
 
 		//disable encryption
 		\OC::$server->getAppManager()->disableApp('encryption');

diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php
@@ -60,7 +60,6 @@ public static function setUpBeforeClass(): void {
 		parent::setUpBeforeClass();
 
 		$application = new \OCA\Files_Sharing\AppInfo\Application();
-		$application->registerMountProviders();
 
 		// create test user
 		self::loginHelper(self::TEST_VERSIONS_USER2, true);