From e2ab9bf4af3d9c801c4586b843cbc5419d6840fd Mon Sep 17 00:00:00 2001 From: Simon L Date: Tue, 18 Apr 2023 11:33:53 +0200 Subject: address review and fix tests Signed-off-by: Simon L --- apps/settings/tests/Controller/CheckSetupControllerTest.php | 4 +++- core/js/setupchecks.js | 2 +- core/js/tests/specs/setupchecksSpec.js | 2 +- 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}', '') .replace('{linkend}', ''), 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 documentation ↗ for more information.', + msg: 'The database is used for transactional file locking. To enhance performance, please configure memcache, if available. See the documentation ↗ for more information.', type: OC.SetupChecks.MESSAGE_TYPE_INFO }]); done(); -- cgit v1.2.3