Merge pull request #12039 from nextcloud/fix-javascript-unit-tests-for-versionmodel-js

Fix JavaScript unit tests for "versionmodel.js"

1 files changed, 16 insertions, 6 deletions

diff --git a/apps/files_versions/tests/js/versionmodelSpec.js b/apps/files_versions/tests/js/versionmodelSpec.js
index 7ee239cd94a..ae8801b1f5c 100644
--- a/apps/files_versions/tests/js/versionmodelSpec.js
+++ b/apps/files_versions/tests/js/versionmodelSpec.js
@@ -58,7 +58,7 @@ describe('OCA.Versions.VersionModel', function() {
 			model.on('revert', revertEventStub);
 			model.on('error', errorStub);
 		});
-		it('tells the server to revert when calling the revert method', function() {
+		it('tells the server to revert when calling the revert method', function(done) {
 			var promise = model.revert({
 				success: successStub
 			});
@@ -76,22 +76,32 @@ describe('OCA.Versions.VersionModel', function() {
 				expect(revertEventStub.calledOnce).toEqual(true);
 				expect(successStub.calledOnce).toEqual(true);
 				expect(errorStub.notCalled).toEqual(true);
-			});
 
-			return promise;
+				done();
+			});
 		});
-		it('triggers error event when server returns a failure', function() {
+		it('triggers error event when server returns a failure', function(done) {
 			var promise = model.revert({
 				success: successStub
 			});
 
 			expect(fakeServer.requests.length).toEqual(1);
-			fakeServer.requests[0].respond(404);
+			var responseErrorHeaders = {
+				"Content-Type": "application/xml"
+			};
+			var responseErrorBody =
+				'<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>';
+			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);
+
+				done();
 			});
 		});
 	});