From 5cb11ca6427855f52b822d2a786e54daddc62fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
<skjnldsv@protonmail.com>
Date: Thu, 14 Nov 2019 08:05:44 +0100
Subject: [PATCH] Fix tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
---
.../js/dist/files_sharing_tab.js | Bin 991640 -> 991641 bytes
.../js/dist/files_sharing_tab.js.map | Bin 2508426 -> 2508426 bytes
.../files_sharing/lib/AppInfo/Application.php | 1 -
apps/files_sharing/tests/TestCase.php | 5 ++---
apps/files_trashbin/tests/TrashbinTest.php | 6 ++++--
apps/files_versions/tests/VersioningTest.php | 1 -
tests/karma.config.js | 8 ++++++--
tests/lib/Files/EtagTest.php | 6 ++++--
8 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js b/apps/files_sharing/js/dist/files_sharing_tab.js
index 724c903cd85794ee4bf8a98bba47b341a9e98caa..c7a7387958f4994551159cb97e3079dcb4cdcf5e 100644
GIT binary patch
delta 2105
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
PU7zM|MqYZ{YN+@N0Azy1
delta 2034
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
diff --git a/apps/files_sharing/js/dist/files_sharing_tab.js.map b/apps/files_sharing/js/dist/files_sharing_tab.js.map
index 64acacdd900b7d0a1c1967bad9cccc58882a8910..40bda83585c5b42da95fe3843784e685dec71e54 100644
GIT binary patch
delta 176
zcmWN=ISRr+00mGcYBVm1+o*AgF)olsEG#^VowaxX+X;LK3D_DeJwYslIgBR|drR>@
zc<JRPQdST!P(TqSm?)zH3suxmN8@QLB~EdqY#k}*Xo<7_B+f4}wqbVvdb>=8?pi<I
u-d<b}ff?tr$t`Ykhr2Af$9*2K%R?UVm?!M<lzpCYz;j;kQs;8@+WY~TQa;-N
delta 176
zcmWN=ISRr+00mGcYBVm1+o*AgF)ols1RIZHXKf|kU;-aP0=5QAPY?@X4&w>L-ctMz
zUV6ESlobRF6i`G7Cd#P5LKQXC(RkWQiE|t&TSv+{TH>TXiStX0ZJ6D^-Y!$2yVj4l
tw-?t#V8*#@a*NyC;Vw(=ai0h5@{mV7<_UW|WuIpp@SGRC)VW-}Hh-8dKG*;N
diff --git a/apps/files_sharing/lib/AppInfo/Application.php b/apps/files_sharing/lib/AppInfo/Application.php
index 3cb3d87cfb2..e5829389a46 100644
--- a/apps/files_sharing/lib/AppInfo/Application.php
+++ b/apps/files_sharing/lib/AppInfo/Application.php
@@ -49,7 +49,6 @@ use OCP\AppFramework\Utility\IControllerMethodReflector;
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
index ce5ceb1f642..cc207429e7b 100644
--- 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
index 9e5b029d9dc..35a5a957186 100644
--- 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 @@ class TrashbinTest extends \Test\TestCase {
// 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
index 3f51f619629..cc326b18928 100644
--- a/apps/files_versions/tests/VersioningTest.php
+++ b/apps/files_versions/tests/VersioningTest.php
@@ -60,7 +60,6 @@ class VersioningTest extends \Test\TestCase {
parent::setUpBeforeClass();
$application = new \OCA\Files_Sharing\AppInfo\Application();
- $application->registerMountProviders();
// create test user
self::loginHelper(self::TEST_VERSIONS_USER2, true);
diff --git a/tests/karma.config.js b/tests/karma.config.js
index fb460ad850d..06503bf9bf8 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -53,10 +53,14 @@ module.exports = function(config) {
// only test these files, others are not ready and mess
// up with the global namespace/classes/state
'apps/files_sharing/js/app.js',
- 'apps/files_sharing/js/sharedfilelist.js',
'apps/files_sharing/js/dist/additionalScripts.js',
- 'apps/files_sharing/js/public.js',
+ 'apps/files_sharing/js/dist/files_sharing_tab.js',
+ 'apps/files_sharing/js/dist/files_sharing.js',
+ 'apps/files_sharing/js/dist/main.js',
+ 'apps/files_sharing/js/dist/sidebar.js',
'apps/files_sharing/js/files_drop.js',
+ 'apps/files_sharing/js/public.js',
+ 'apps/files_sharing/js/sharedfilelist.js',
'apps/files_sharing/js/templates.js',
],
testFiles: ['apps/files_sharing/tests/js/*.js']
diff --git a/tests/lib/Files/EtagTest.php b/tests/lib/Files/EtagTest.php
index acda220d01f..554812253f3 100644
--- a/tests/lib/Files/EtagTest.php
+++ b/tests/lib/Files/EtagTest.php
@@ -10,6 +10,7 @@ namespace Test\Files;
use OC\Files\Filesystem;
use OCP\Share;
+use OCA\Files_Sharing\AppInfo\Application;
/**
* Class EtagTest
@@ -32,8 +33,9 @@ class EtagTest extends \Test\TestCase {
parent::setUp();
\OC_Hook::clear('OC_Filesystem', 'setup');
- $application = new \OCA\Files_Sharing\AppInfo\Application();
- $application->registerMountProviders();
+ // init files sharing
+ new Application();
+
\OC\Share\Share::registerBackend('file', 'OCA\Files_Sharing\ShareBackend\File');
\OC\Share\Share::registerBackend('folder', 'OCA\Files_Sharing\ShareBackend\Folder', 'file');
--
GitLab