Merge writable temporary space check with the s3 one, and improve

It will now show available space and path of both PHP and Nextcloud
 temporary directories if they differ.

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

2 files changed, 0 insertions, 47 deletions

diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index 7e068ffd1d0..7864169dd2b 100644
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -189,12 +189,6 @@
 						});
 					}
 
-					if (!data.temporaryDirectoryWritable) {
-						messages.push({
-							msg: t('core', 'The temporary directory of this instance points to an either non-existing or non-writable directory.'),
-							type: OC.SetupChecks.MESSAGE_TYPE_WARNING
-						})
-					}
 					if (window.location.protocol === 'https:' && data.reverseProxyGeneratedURL.split('/')[0] !== 'https:') {
 						messages.push({
 							msg: t('core', 'You are accessing your instance over a secure connection, however your instance is generating insecure URLs. This most likely means that you are behind a reverse proxy and the overwrite config variables are not set correctly. Please read {linkstart}the documentation page about this ↗{linkend}.')
diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index 6a4f68b977d..b2e1baa618b 100644
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -225,7 +225,6 @@ describe('OC.SetupChecks tests', function() {
 				JSON.stringify({
 					isFairUseOfFreePushService: true,
 					reverseProxyGeneratedURL: 'https://server',
-					temporaryDirectoryWritable: true,
 					generic: {
 						network: {
 							"Internet connectivity": {
@@ -260,7 +259,6 @@ describe('OC.SetupChecks tests', function() {
 				JSON.stringify({
 					isFairUseOfFreePushService: true,
 					reverseProxyGeneratedURL: 'https://server',
-					temporaryDirectoryWritable: true,
 					generic: {
 						network: {
 							"Internet connectivity": {
@@ -295,7 +293,6 @@ describe('OC.SetupChecks tests', function() {
 				JSON.stringify({
 					isFairUseOfFreePushService: true,
 					reverseProxyGeneratedURL: 'https://server',
-					temporaryDirectoryWritable: true,
 					generic: {
 						network: {
 							"Internet connectivity": {
@@ -331,7 +328,6 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
 					reverseProxyGeneratedURL: 'https://server',
-					temporaryDirectoryWritable: true,
 					generic: {
 						network: {
 							"Internet connectivity": {
@@ -396,7 +392,6 @@ describe('OC.SetupChecks tests', function() {
 				JSON.stringify({
 					isFairUseOfFreePushService: true,
 					reverseProxyGeneratedURL: 'https://server',
-					temporaryDirectoryWritable: true,
 					generic: {
 						network: {
 							"Internet connectivity": {
@@ -441,7 +436,6 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
 					reverseProxyGeneratedURL: 'http://server',
-					temporaryDirectoryWritable: true,
 					generic: {
 						network: {
 							"Internet connectivity": {
@@ -475,7 +469,6 @@ describe('OC.SetupChecks tests', function() {
 					isFairUseOfFreePushService: true,
 					reverseProxyDocs: 'https://docs.nextcloud.com/foo/bar.html',
 					reverseProxyGeneratedURL: 'http://server',
-					temporaryDirectoryWritable: true,
 					generic: {
 						network: {
 							"Internet connectivity": {
@@ -505,7 +498,6 @@ describe('OC.SetupChecks tests', function() {
 				JSON.stringify({
 					isFairUseOfFreePushService: true,
 					reverseProxyGeneratedURL: 'https://server',
-					temporaryDirectoryWritable: true,
 					generic: {
 						network: {
 							"Internet connectivity": {
@@ -533,39 +525,6 @@ describe('OC.SetupChecks tests', function() {
 				done();
 			});
 		});
-
-		it('should return an info if the temporary directory is either non-existent or non-writable', function(done) {
-			var async = OC.SetupChecks.checkSetup();
-
-			suite.server.requests[0].respond(
-				200,
-				{
-					'Content-Type': 'application/json',
-				},
-				JSON.stringify({
-					isFairUseOfFreePushService: true,
-					reverseProxyGeneratedURL: 'https://server',
-					temporaryDirectoryWritable: false,
-					generic: {
-						network: {
-							"Internet connectivity": {
-								severity: "success",
-								description: null,
-								linkToDoc: null
-							}
-						},
-					},
-				})
-			);
-
-			async.done(function( data, s, x ){
-				expect(data).toEqual([{
-					msg: 'The temporary directory of this instance points to an either non-existing or non-writable directory.',
-					type: OC.SetupChecks.MESSAGE_TYPE_WARNING
-				}]);
-				done();
-			});
-		});
 	});
 
 	describe('checkGeneric', function() {