Use extended MKCOL in backbone adapter

This makes it possible to pre-set some properties without a subsequent
PROPPATCH call.

core/js/oc-backbone-webdav.js

@@ -179,10 +179,10 @@
 		});
 	}
 
-	function callPropPatch(client, options, model, headers, changed) {
+	function callPropPatch(client, options, model, headers) {
 		return client.propPatch(
 			options.url,
-			convertModelAttributesToDavProperties(changed || model.changed, options.davProperties),
+			convertModelAttributesToDavProperties(model.changed, options.davProperties),
 			headers
 		).then(function(result) {
 			if (isSuccessStatus(result.status)) {
@@ -199,21 +199,24 @@
 	}
 
 	function callMkCol(client, options, model, headers) {
-		// call MKCOL without data, followed by PROPPATCH
-		return client.request(
-			options.type,
+		var props = convertModelAttributesToDavProperties(model.attributes, options.davProperties);
+		if (!props['{DAV:}resourcetype']) {
+			props['{DAV:}resourcetype'] = '<d:collection/>';
+		}
+		return client.mkcol(
 			options.url,
-			headers,
-			null
+			props,
+			headers
 		).then(function(result) {
-			if (!isSuccessStatus(result.status)) {
-				if (_.isFunction(options.error)) {
-					options.error(result);
+			if (isSuccessStatus(result.status)) {
+				if (_.isFunction(options.success)) {
+					// pass the object's own values because the server
+					// does not return the updated model
+					options.success(model.toJSON());
 				}
-				return;
+			} else if (_.isFunction(options.error)) {
+				options.error(result);
 			}
-
-			callPropPatch(client, options, model, headers, model.attributes);
 		});
 	}
 
@@ -233,7 +236,7 @@
 			}
 
 			if (_.isFunction(options.success)) {
-				if (options.type === 'PUT' || options.type === 'POST' || options.type === 'MKCOL') {
+				if (options.type === 'PUT' || options.type === 'POST') {
 					// pass the object's own values because the server
 					// does not return anything
 					var responseJson = result.body || model.toJSON();

core/js/tests/specs/oc-backbone-webdavSpec.js

@@ -650,6 +650,8 @@ describe('Backbone Webdav extension', function() {
 		});
 
 		it('creates the Webdav collection with MKCOL', function() {
+			var mkcolStub = sinon.stub(dav.Client.prototype, 'mkcol');
+			mkcolStub.returns(deferredRequest.promise());
 			var model = new NodeModel({
 				id: 'davcol'
 			});
@@ -658,15 +660,17 @@ describe('Backbone Webdav extension', function() {
 				lastName: 'World',
 			});
 
-			expect(davClientRequestStub.calledOnce).toEqual(true);
-			expect(davClientRequestStub.getCall(0).args[0])
-				.toEqual('MKCOL');
-			expect(davClientRequestStub.getCall(0).args[1])
+			expect(mkcolStub.calledOnce).toEqual(true);
+			expect(mkcolStub.getCall(0).args[0])
 				.toEqual('http://example.com/owncloud/remote.php/dav/davcol');
-			expect(davClientRequestStub.getCall(0).args[2]['X-Requested-With'])
+			expect(mkcolStub.getCall(0).args[1])
+				.toEqual({
+					'{http://owncloud.org/ns}first-name': 'Hello',
+					'{http://owncloud.org/ns}last-name': 'World',
+					'{DAV:}resourcetype': '<d:collection/>'
+				});
+			expect(mkcolStub.getCall(0).args[2]['X-Requested-With'])
 				.toEqual('XMLHttpRequest');
-			expect(davClientRequestStub.getCall(0).args[3])
-				.toEqual(null);
 
 			deferredRequest.resolve({
 				status: 201,
@@ -678,6 +682,8 @@ describe('Backbone Webdav extension', function() {
 
 			expect(model.id).toEqual('davcol');
 			expect(model.isNew()).toEqual(false);
+
+			mkcolStub.restore();
 		});
 		it('updates Webdav collection properties with PROPPATCH', function() {
 			var model = new NodeModel({