Add unit tests and provide better message

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js
index da5dc68b16638d3b7e7b3f9cdf886ba2fbe7597b..7582b062d52dd3878bf7d4d13ab9cb2c242582ff 100644 (file)
--- a/core/js/setupchecks.js
+++ b/core/js/setupchecks.js
@@ -112,10 +112,10 @@
                        var afterCall = function(xhr) {
                                var messages = [];
                                if (expectedStatus.indexOf(xhr.status) === -1) {
-                                       var docUrl = placeholderUrl.replace('PLACEHOLDER', 'admin-setup-well-known-URL');
+                                       var docUrl = placeholderUrl.replace('PLACEHOLDER', 'admin-nginx');
                                        messages.push({
-                                               msg: t('core', 'Your web server is not properly set up to resolve "{url}". Further information can be found in the <a target="_blank" rel="noreferrer noopener" href="{docLink}">documentation</a>.', { docLink: docUrl, url: url }),
-                                               type: OC.SetupChecks.MESSAGE_TYPE_INFO
+                                               msg: t('core', 'Your web server is not properly set up to resolve "{url}". This is most likely related to a web server configuration that was not updated to deliver this folder directly. Please compare your configuration against the shipped rewrite rules in ".htaccess" for Apache or the provided one in the documentation for Nginx at it\'s <a target="_blank" rel="noreferrer noopener" href="{docLink}">documentation page</a>. On Nginx those are typically the lines starting with "location ~" that need an update.', { docLink: docUrl, url: url }),
+                                               type: OC.SetupChecks.MESSAGE_TYPE_WARNING
                                        });
                                }
                                deferred.resolve(messages);

diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index 6ea7d812d9a568a872d751d2f3953fc90c059528..e2c0053aa71c28a4886c323a6b0fcad7788b2830 100644 (file)
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -107,6 +107,42 @@ describe('OC.SetupChecks tests', function() {
                });
        });
 
+       describe('checkProviderUrl', function() {
+               it('should fail with another response status code than the expected one', function(done) {
+                       var async = OC.SetupChecks.checkProviderUrl('/ocm-provider/', 'http://example.org/PLACEHOLDER', true);
+
+                       suite.server.requests[0].respond(302);
+
+                       async.done(function( data, s, x ){
+                               expect(data).toEqual([{
+                                       msg: 'Your web server is not properly set up to resolve "/ocm-provider/". This is most likely related to a web server configuration that was not updated to deliver this folder directly. Please compare your configuration against the shipped rewrite rules in ".htaccess" for Apache or the provided one in the documentation for Nginx at it\'s <a href="http://example.org/admin-nginx" rel="noreferrer noopener">documentation page</a>. On Nginx those are typically the lines starting with "location ~" that need an update.',
+                                       type: OC.SetupChecks.MESSAGE_TYPE_WARNING
+                               }]);
+                               done();
+                       });
+               });
+
+               it('should return no error with the expected response status code', function(done) {
+                       var async = OC.SetupChecks.checkProviderUrl('/ocm-provider/', 'http://example.org/PLACEHOLDER', true);
+
+                       suite.server.requests[0].respond(200);
+
+                       async.done(function( data, s, x ){
+                               expect(data).toEqual([]);
+                               done();
+                       });
+               });
+
+               it('should return no error when no check should be run', function(done) {
+                       var async = OC.SetupChecks.checkProviderUrl('/ocm-provider/', 'http://example.org/PLACEHOLDER', false);
+
+                       async.done(function( data, s, x ){
+                               expect(data).toEqual([]);
+                               done();
+                       });
+               });
+       });
+
        describe('checkWOFF2Loading', function() {
                it('should fail with another response status code than the expected one', function(done) {
                        var async = OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/Nunito-Regular.woff2'), 'http://example.org/PLACEHOLDER');

diff --git a/settings/js/admin.js b/settings/js/admin.js
index 2ffd4383eb2919df899db5c10d78c361456cb99f..0ca9b6162e2c34bb289c6eae5052e235c26b7c7e 100644 (file)
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -257,8 +257,8 @@ $(document).ready(function(){
                        OC.SetupChecks.checkGeneric(),
                        OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/Nunito-Regular.woff2'), oc_defaults.docPlaceholderUrl),
                        OC.SetupChecks.checkDataProtected()
-               ).then(function (check1, check2, check3, check4, check5, check6, check7, check8) {
-                       var messages = [].concat(check1, check2, check3, check4, check5, check6, check7, check8);
+               ).then(function (check1, check2, check3, check4, check5, check6, check7, check8, check9, check10) {
+                       var messages = [].concat(check1, check2, check3, check4, check5, check6, check7, check8, check9, check10);
                        var $el = $('#postsetupchecks');
                        $('#security-warning-state-loading').addClass('hidden');