Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2019-11-14 10:05:44 +0300
committerJohn Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>2019-12-02 15:08:43 +0300
commit5cb11ca6427855f52b822d2a786e54daddc62fc9 (patch)
tree17b137c6c222a6954932a7d603de481e554b25f8 /tests
parent0bf6fcd6cd0ef87fc8e41f34fbc939a5f2bd9a7d (diff)
Fix tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/karma.config.js8
-rw-r--r--tests/lib/Files/EtagTest.php6
2 files changed, 10 insertions, 4 deletions
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');