diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-10-11 08:49:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-11 08:49:57 +0200 |
| commit | 5bf4bc7ed16b11eff5ed01936d456fd6443d03f1 (patch) | |
| tree | 73beca787f0a04efb6a2656a3ba93b8ea09ddc47 | |
| parent | cef454c280b6717777aeb6225c901b696c155a15 (diff) | |
| parent | 5f0887c1d58690fe3fe7db451746e448a10914af (diff) | |
| download | nextcloud-server-5bf4bc7ed16b11eff5ed01936d456fd6443d03f1.tar.gz nextcloud-server-5bf4bc7ed16b11eff5ed01936d456fd6443d03f1.zip | |
Merge pull request #11738 from nextcloud/backport/11733/fix-setupcheck-14
[stable14] Fix a misleading setup check for .well-known/caldav & carddav
| -rw-r--r-- | core/js/tests/specs/setupchecksSpec.js | 8 | ||||
| -rw-r--r-- | settings/js/admin.js | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/js/tests/specs/setupchecksSpec.js b/core/js/tests/specs/setupchecksSpec.js index 4c0545b7b4f..6170a427241 100644 --- 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 6ac569f2a37..de5bc2b9537 100644 --- 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() |