Fix a misleading setup check for .well-known/caldav & carddav

The problem is that the version without the slash is the correct one.

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

diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js
index 4c0545b7b4f4de64ee414fe8cdc7f4f813242ddc..6170a42724118954c80cccc0097f1d50b1306f2c 100644 (file)
--- a/core/js/tests/specs/setupchecksSpec.js
+++ b/core/js/tests/specs/setupchecksSpec.js
@@ -62,13 +62,13 @@ describe('OC.SetupChecks tests', function() {
 
        describe('checkWellKnownUrl', function() {
                it('should fail with another response status code than 207', function(done) {
-                       var async = OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav/', 'http://example.org/PLACEHOLDER', true);
+                       var async = OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav', 'http://example.org/PLACEHOLDER', true);
 
                        suite.server.requests[0].respond(200);
 
                        async.done(function( data, s, x ){
                                expect(data).toEqual([{
-                                       msg: 'Your web server is not properly set up to resolve "/.well-known/caldav/". Further information can be found in the <a href="http://example.org/admin-setup-well-known-URL" rel="noreferrer noopener">documentation</a>.',
+                                       msg: 'Your web server is not properly set up to resolve "/.well-known/caldav". Further information can be found in the <a href="http://example.org/admin-setup-well-known-URL" rel="noreferrer noopener">documentation</a>.',
                                        type: OC.SetupChecks.MESSAGE_TYPE_INFO
                                }]);
                                done();
@@ -76,7 +76,7 @@ describe('OC.SetupChecks tests', function() {
                });
 
                it('should return no error with a response status code of 207', function(done) {
-                       var async = OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav/', 'http://example.org/PLACEHOLDER', true);
+                       var async = OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav', 'http://example.org/PLACEHOLDER', true);
 
                        suite.server.requests[0].respond(207);
 
@@ -87,7 +87,7 @@ describe('OC.SetupChecks tests', function() {
                });
 
                it('should return no error when no check should be run', function(done) {
-                       var async = OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav/', 'http://example.org/PLACEHOLDER', false);
+                       var async = OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav', 'http://example.org/PLACEHOLDER', false);
 
                        async.done(function( data, s, x ){
                                expect(data).toEqual([]);

diff --git a/settings/js/admin.js b/settings/js/admin.js
index 6ac569f2a37aa1f7ad94181429a0668c21d8214a..de5bc2b953708174a94b5ec5c4e63ecbc658bc9c 100644 (file)
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -248,8 +248,8 @@ $(document).ready(function(){
        // run setup checks then gather error messages
        $.when(
                OC.SetupChecks.checkWebDAV(),
-               OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true),
-               OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav/', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true),
+               OC.SetupChecks.checkWellKnownUrl('/.well-known/caldav', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true),
+               OC.SetupChecks.checkWellKnownUrl('/.well-known/carddav', oc_defaults.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true),
                OC.SetupChecks.checkSetup(),
                OC.SetupChecks.checkGeneric(),
                OC.SetupChecks.checkDataProtected()