From b51996540889b29b3b1d2bc118f652c7b942404b Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 2 Oct 2015 16:17:56 +0200 Subject: [admin] check for correct PHP memcached module --- core/js/tests/specs/setupchecksSpec.js | 46 +++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 6 deletions(-) (limited to 'core/js/tests/specs/setupchecksSpec.js') diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js index c70ea0ff9fa..8dd2214621a 100644 --- a/core/js/tests/specs/setupchecksSpec.js +++ b/core/js/tests/specs/setupchecksSpec.js @@ -73,7 +73,8 @@ describe('OC.SetupChecks tests', function() { isUrandomAvailable: true, serverHasInternetConnection: false, memcacheDocs: 'https://doc.owncloud.org/server/go.php?to=admin-performance', - forwardedForHeadersWorking: true + forwardedForHeadersWorking: true, + isCorrectMemcachedPHPModuleInstalled: true, }) ); @@ -106,7 +107,8 @@ describe('OC.SetupChecks tests', function() { serverHasInternetConnection: false, dataDirectoryProtected: false, memcacheDocs: 'https://doc.owncloud.org/server/go.php?to=admin-performance', - forwardedForHeadersWorking: true + forwardedForHeadersWorking: true, + isCorrectMemcachedPHPModuleInstalled: true, }) ); @@ -141,7 +143,8 @@ describe('OC.SetupChecks tests', function() { serverHasInternetConnection: false, dataDirectoryProtected: false, isMemcacheConfigured: true, - forwardedForHeadersWorking: true + forwardedForHeadersWorking: true, + isCorrectMemcachedPHPModuleInstalled: true, }) ); @@ -173,7 +176,8 @@ describe('OC.SetupChecks tests', function() { serverHasInternetConnection: true, dataDirectoryProtected: true, isMemcacheConfigured: true, - forwardedForHeadersWorking: true + forwardedForHeadersWorking: true, + isCorrectMemcachedPHPModuleInstalled: true, }) ); @@ -186,6 +190,34 @@ describe('OC.SetupChecks tests', function() { }); }); + it('should return an error if the wrong memcache PHP module is installed', function(done) { + var async = OC.SetupChecks.checkSetup(); + + suite.server.requests[0].respond( + 200, + { + 'Content-Type': 'application/json', + }, + JSON.stringify({ + isUrandomAvailable: true, + securityDocs: 'https://docs.owncloud.org/myDocs.html', + serverHasInternetConnection: true, + dataDirectoryProtected: true, + isMemcacheConfigured: true, + forwardedForHeadersWorking: true, + isCorrectMemcachedPHPModuleInstalled: false, + }) + ); + + async.done(function( data, s, x ){ + expect(data).toEqual([{ + msg: 'Memcached is configured as distributed cache, but the wrong PHP module "memcache" is installed. \\OC\\Memcache\\Memcached only supports "memcached" and not "memcache". See the memcached wiki about both modules.', + type: OC.SetupChecks.MESSAGE_TYPE_WARNING + }]); + done(); + }); + }); + it('should return an error if the forwarded for headers are not working', function(done) { var async = OC.SetupChecks.checkSetup(); @@ -200,7 +232,8 @@ describe('OC.SetupChecks tests', function() { dataDirectoryProtected: true, isMemcacheConfigured: true, forwardedForHeadersWorking: false, - reverseProxyDocs: 'https://docs.owncloud.org/foo/bar.html' + reverseProxyDocs: 'https://docs.owncloud.org/foo/bar.html', + isCorrectMemcachedPHPModuleInstalled: true, }) ); @@ -248,7 +281,8 @@ describe('OC.SetupChecks tests', function() { dataDirectoryProtected: true, isMemcacheConfigured: true, forwardedForHeadersWorking: true, - phpSupported: {eol: true, version: '5.4.0'} + phpSupported: {eol: true, version: '5.4.0'}, + isCorrectMemcachedPHPModuleInstalled: true, }) ); -- cgit v1.2.3