Merge pull request #6079 from nextcloud/fix-antivirus

Parse Sabre Exception in OC.Files.Client and file-upload

1 files changed, 16 insertions, 2 deletions

diff --git a/core/js/tests/specs/files/clientSpec.js b/core/js/tests/specs/files/clientSpec.js
index ec0a0fbda40..113e5b546d0 100644
--- a/core/js/tests/specs/files/clientSpec.js
+++ b/core/js/tests/specs/files/clientSpec.js
@@ -87,14 +87,28 @@ describe('OC.Files.Client tests', function() {
 		promise.done(successHandler);
 		promise.fail(failHandler);
 
+		var errorXml =
+			'<d:error xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">' +
+			'    <s:exception>Sabre\\DAV\\Exception\\SomeException</s:exception>' +
+			'    <s:message>Some error message</s:message>' +
+			'</d:error>';
+
+		var parser = new DOMParser();
+
 		requestDeferred.resolve({
 			status: status,
-			body: ''
+			body: errorXml,
+			xhr: {
+				responseXML: parser.parseFromString(errorXml, 'application/xml')
+			}
 		});
 
 		promise.then(function() {
 			expect(failHandler.calledOnce).toEqual(true);
-			expect(failHandler.calledWith(status)).toEqual(true);
+			expect(failHandler.getCall(0).args[0]).toEqual(status);
+			expect(failHandler.getCall(0).args[1].status).toEqual(status);
+			expect(failHandler.getCall(0).args[1].message).toEqual('Some error message');
+			expect(failHandler.getCall(0).args[1].exception).toEqual('Sabre\\DAV\\Exception\\SomeException');
 
 			expect(successHandler.notCalled).toEqual(true);
 		});