summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon L <szaimen@e.mail.de>2023-04-18 11:33:53 +0200
committerSimon L <szaimen@e.mail.de>2023-04-18 11:33:53 +0200
commite2ab9bf4af3d9c801c4586b843cbc5419d6840fd (patch)
treed26ee2952a29d226c57c7a7eb836d385bc072648
parent80645a591a5ed0892179e042001f32de79c4ebba (diff)
downloadnextcloud-server-e2ab9bf4af3d9c801c4586b843cbc5419d6840fd.tar.gz
nextcloud-server-e2ab9bf4af3d9c801c4586b843cbc5419d6840fd.zip
address review and fix tests
Signed-off-by: Simon L <szaimen@e.mail.de>
-rw-r--r--apps/settings/tests/Controller/CheckSetupControllerTest.php4
-rw-r--r--core/js/setupchecks.js2
-rw-r--r--core/js/tests/specs/setupchecksSpec.js2
3 files changed, 5 insertions, 3 deletions
diff --git a/apps/settings/tests/Controller/CheckSetupControllerTest.php b/apps/settings/tests/Controller/CheckSetupControllerTest.php
index 2678d5ce9ee..2b074d24c39 100644
--- a/apps/settings/tests/Controller/CheckSetupControllerTest.php
+++ b/apps/settings/tests/Controller/CheckSetupControllerTest.php
@@ -186,6 +186,7 @@ class CheckSetupControllerTest extends TestCase {
'hasValidTransactionIsolationLevel',
'hasFileinfoInstalled',
'hasWorkingFileLocking',
+ 'hasDBFileLocking',
'getLastCronInfo',
'getSuggestedOverwriteCliURL',
'getCurlVersion',
@@ -504,7 +505,7 @@ class CheckSetupControllerTest extends TestCase {
->willReturn(true);
$this->checkSetupController
->expects($this->once())
- ->method('hasDBileLocking')
+ ->method('hasDBFileLocking')
->willReturn(true);
$this->checkSetupController
->expects($this->once())
@@ -608,6 +609,7 @@ class CheckSetupControllerTest extends TestCase {
'hasValidTransactionIsolationLevel' => true,
'hasFileinfoInstalled' => true,
'hasWorkingFileLocking' => true,
+ 'hasDBFileLocking' => true,
'suggestedOverwriteCliURL' => '',
'cronInfo' => [
'diffInSeconds' => 123,
diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index 6d883896999..8cb8f76e40c 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -225,7 +225,7 @@
}
if(data.hasDBFileLocking) {
messages.push({
- msg: t('core', 'The database is used for transactional file locking. This will lead to performance issues. Use redis for transactional file locking to improve the performance. See the {linkstart}documentation ↗{linkend} for more information.')
+ msg: t('core', 'The database is used for transactional file locking. To enhance performance, please configure memcache, if available. See the {linkstart}documentation ↗{linkend} for more information.')
.replace('{linkstart}', '<a target="_blank" rel="noreferrer noopener" class="external" href="' + OC.theme.docPlaceholderUrl.replace('PLACEHOLDER', 'admin-transactional-locking') + '">')
.replace('{linkend}', '</a>'),
type: OC.SetupChecks.MESSAGE_TYPE_INFO
diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index 16434e80772..a9a66970f33 100644
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -687,7 +687,7 @@ describe('OC.SetupChecks tests', function() {
async.done(function( data, s, x ){
expect(data).toEqual([{
- msg: 'The database is used for transactional file locking. This will lead to performance issues. Use redis for transactional file locking to improve the performance. See the <a target="_blank" rel="noreferrer noopener" class="external" href="https://docs.example.org/admin-transactional-locking">documentation ↗</a> for more information.',
+ msg: 'The database is used for transactional file locking. To enhance performance, please configure memcache, if available. See the <a target="_blank" rel="noreferrer noopener" class="external" href="https://docs.example.org/admin-transactional-locking">documentation ↗</a> for more information.',
type: OC.SetupChecks.MESSAGE_TYPE_INFO
}]);
done();