From 661756b02ac16594a2996da2809643e10fcfc748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Thu, 25 Oct 2018 13:07:06 +0200 Subject: [PATCH] Set error expected by the DAV client for a failed move MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A revert triggers a move in the DAV client, and the DAV client expects a DAV error message to be provided by the server in case of failure; if no error message is given the client ends trying to get an attribute from an undefined object and "crashes". Besides that, if the revert fails the "done" callback of the promise (the first parameter of "then") is never called, so a "fail" callback should be used instead. Signed-off-by: Daniel Calviño Sánchez --- apps/files_versions/tests/js/versionmodelSpec.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/files_versions/tests/js/versionmodelSpec.js b/apps/files_versions/tests/js/versionmodelSpec.js index d47e92e2b60..ae8801b1f5c 100644 --- a/apps/files_versions/tests/js/versionmodelSpec.js +++ b/apps/files_versions/tests/js/versionmodelSpec.js @@ -86,9 +86,17 @@ describe('OCA.Versions.VersionModel', function() { }); expect(fakeServer.requests.length).toEqual(1); - fakeServer.requests[0].respond(404); + var responseErrorHeaders = { + "Content-Type": "application/xml" + }; + var responseErrorBody = + '' + + ' Sabre\\DAV\\Exception\\SomeException' + + ' Some error message' + + ''; + fakeServer.requests[0].respond(404, responseErrorHeaders, responseErrorBody); - promise.then(function() { + promise.fail(function() { expect(revertEventStub.notCalled).toEqual(true); expect(successStub.notCalled).toEqual(true); expect(errorStub.calledOnce).toEqual(true);