Fixed WebDavProviderTests: the fetchItemMetadata Request, which is no…

…w additionally required for the uploadFile, was not mocked.

The additional fetchItemMetadata in uploadFile was moved behind the recover block, because it is intended for the PUT request.

Sources/CryptomatorCloudAccess/WebDAV/WebDAVProvider.swift

@@ -160,9 +160,7 @@ public class WebDAVProvider: CloudProvider {
 			default:
 				return Promise(error)
 			}
-		}.then { _, _ in
-			return self.fetchItemMetadata(at: cloudPath)
-		}.recover { error -> Promise<CloudItemMetadata> in
+		}.recover { error -> Promise<(HTTPURLResponse, Data?)> in
 			switch error {
 			case URLSessionError.httpError(_, statusCode: 401):
 				return Promise(CloudProviderError.unauthorized)
@@ -179,6 +177,8 @@ public class WebDAVProvider: CloudProvider {
 			default:
 				return Promise(error)
 			}
+		}.then { _, _ in
+			return self.fetchItemMetadata(at: cloudPath)
 		}
 	}
 

Tests/CryptomatorCloudAccessTests/WebDAV/MockURLProtocol.swift

@@ -21,8 +21,6 @@ class MockURLProtocol: URLProtocol {
 			client?.urlProtocol(self, didReceive: response, cacheStoragePolicy: .notAllowed)
 			if let data = data {
 				client?.urlProtocol(self, didLoad: data)
-			} else {
-				print("no data")
 			}
 			client?.urlProtocolDidFinishLoading(self)
 		} catch {

Tests/CryptomatorCloudAccessTests/WebDAV/WebDAVProviderTests.swift

@@ -322,15 +322,24 @@ class WebDAVProviderTests: XCTestCase {
 			return (propfindResponse, nil)
 		})
 
-		let putData = try getTestData(forResource: "item-metadata", withExtension: "xml")
 		let putResponse = HTTPURLResponse(url: responseURL, statusCode: 201, httpVersion: "HTTP/1.1", headerFields: nil)!
+		let putData = Data()
 		MockURLProtocol.requestHandler.append({ request in
 			guard let url = request.url, url.path == responseURL.path else {
 				throw MockURLProtocolError.unexpectedRequest
 			}
 			return (putResponse, putData)
 		})
 
+		let propfindResponseAfterUpload = HTTPURLResponse(url: responseURL, statusCode: 200, httpVersion: "HTTP/1.1", headerFields: nil)!
+		let propfindDataAfterUpload = try getTestData(forResource: "item-metadata", withExtension: "xml")
+		MockURLProtocol.requestHandler.append({ request in
+			guard let url = request.url, url.path == responseURL.path else {
+				throw MockURLProtocolError.unexpectedRequest
+			}
+			return (propfindResponseAfterUpload, propfindDataAfterUpload)
+		})
+
 		provider.uploadFile(from: localURL, to: CloudPath("/Documents/About.txt"), replaceExisting: false).then { metadata in
 			XCTAssertEqual(.zero, self.client.propfindRequests["Documents/About.txt"])
 			XCTAssertTrue(self.client.putRequests.contains("Documents/About.txt"))
@@ -362,7 +371,7 @@ class WebDAVProviderTests: XCTestCase {
 			return (propfindResponse, propfindData)
 		})
 
-		let putData = try getTestData(forResource: "item-metadata", withExtension: "xml")
+		let putData = Data()
 		let putResponse = HTTPURLResponse(url: responseURL, statusCode: 201, httpVersion: "HTTP/1.1", headerFields: nil)!
 		MockURLProtocol.requestHandler.append({ request in
 			guard let url = request.url, url.path == responseURL.path else {
@@ -371,6 +380,15 @@ class WebDAVProviderTests: XCTestCase {
 			return (putResponse, putData)
 		})
 
+		let propfindResponseAfterUpload = HTTPURLResponse(url: responseURL, statusCode: 200, httpVersion: "HTTP/1.1", headerFields: nil)!
+		let propfindDataAfterUpload = try getTestData(forResource: "item-metadata", withExtension: "xml")
+		MockURLProtocol.requestHandler.append({ request in
+			guard let url = request.url, url.path == responseURL.path else {
+				throw MockURLProtocolError.unexpectedRequest
+			}
+			return (propfindResponseAfterUpload, propfindDataAfterUpload)
+		})
+
 		provider.uploadFile(from: localURL, to: CloudPath("/Documents/About.txt"), replaceExisting: true).then { metadata in
 			XCTAssertEqual(.zero, self.client.propfindRequests["Documents/About.txt"])
 			XCTAssertTrue(self.client.putRequests.contains("Documents/About.txt"))