Add error for attempt to upload directory

FirebaseStorage/Sources/FIRStorageReference.m

@@ -215,6 +215,13 @@ - (FIRStorageUploadTask *)putFile:(NSURL *)fileURL
 - (FIRStorageUploadTask *)putFile:(NSURL *)fileURL
                          metadata:(nullable FIRStorageMetadata *)metadata
                        completion:(nullable FIRStorageVoidMetadataError)completion {
+  if ([fileURL frs_hasDirectoryPath]) {
+    NSError *error = [FIRStorageErrors
+        errorWithCustomMessage:
+            @"Failed to recognize file for file URL. Ensure file URL is not a directory."];
+    completion(nil, error);
+  }
+
   if (!metadata) {
     metadata = [[FIRStorageMetadata alloc] init];
   }

FirebaseStorage/Sources/FIRStorageUtils.h

@@ -108,4 +108,14 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface NSURL (FIRStorageNSURLHelpers)
+
+/**
+ * Returns a boolean indicating that the NSURL instance represents a file directory
+ * @return True if the NSURL object represents a file directory, and false if otherwise
+ */
+- (BOOL)frs_hasDirectoryPath;
+
+@end
+
 NS_ASSUME_NONNULL_END

FirebaseStorage/Sources/FIRStorageUtils.m

@@ -149,3 +149,18 @@ + (nullable instancetype)frs_dataFromJSONDictionary:(nullable NSDictionary *)dic
 }
 
 @end
+
+@implementation NSURL (FIRStorageNSURLHelpers)
+
+- (BOOL)frs_hasDirectoryPath {
+  if (@available(macOS 10.11, iOS 9.0, watchOS 2.0, tvOS 9.0, *)) {
+    return [self hasDirectoryPath];
+  } else {
+    NSError *error;
+    NSNumber *isDirectory = [NSNumber numberWithBool:NO];
+    [self getResourceValue:&isDirectory forKey:NSURLIsDirectoryKey error:&error];
+    return [isDirectory boolValue];
+  }
+}
+
+@end

FirebaseStorage/Tests/Integration/Resources/Home Improvement.numbers/Metadata/BuildVersionHistory.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<array>
+	<string>Template: 08_Home_Improvement (2014-07-09 16:51)</string>
+	<string>G-r8-1GP146</string>
+</array>
+</plist>

FirebaseStorage/Tests/Integration/Resources/Home Improvement.numbers/Metadata/DocumentIdentifier

@@ -0,0 +1 @@
+58239D62-15E4-43C7-A38A-62E3F530B363

FirebaseStorageSwift.podspec

@@ -39,7 +39,9 @@ Firebase Storage provides robust, secure file uploads and downloads from Firebas
     int_tests.requires_app_host = true
     # Resources are shared with FirebaseStorage's integration tests.
     int_tests.resources = 'FirebaseStorage/Tests/Integration/Resources/1mb.dat',
-                          'FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist'
+                          'FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist',
+                          'FirebaseStorage/Tests/Integration/Resources/Home Improvement.numbers',
+                          'FirebaseStorage/Tests/Integration/Resources/star_wars.pdf'
     int_tests.dependency 'FirebaseAuth', '~> 6.5'
   end
 end

FirebaseStorageSwift/Tests/Integration/StorageIntegration.swift

@@ -223,6 +223,20 @@ class StorageIntegration: XCTestCase {
     waitForExpectations()
   }
 
+  func testSimplePutCustomFile() throws {
+    let expectation = self.expectation(description: #function)
+    let fileName = "star_wars.pdf"
+    let bundle = Bundle(for: StorageIntegration.self)
+    let filePath = try XCTUnwrap(bundle.path(forResource: fileName, ofType: ""),
+                                 "Failed to get filePath")
+    let ref = storage.reference(withPath: "ios/public/" + fileName)
+    ref.putFile(from: URL(fileURLWithPath: filePath)) { result in
+      self.assertResultSuccess(result)
+      expectation.fulfill()
+    }
+    waitForExpectations()
+  }
+
   func testSimplePutFile() throws {
     let expectation = self.expectation(description: #function)
     let putFileExpectation = self.expectation(description: "putFile")
@@ -256,6 +270,27 @@ class StorageIntegration: XCTestCase {
     waitForExpectations()
   }
 
+  func testAttemptToUploadDirectory() throws {
+    let expectation = self.expectation(description: #function)
+
+    let fileName = "Home Improvement.numbers"
+    let bundle = Bundle(for: StorageIntegration.self)
+    let fileURL = try XCTUnwrap(bundle.url(forResource: fileName, withExtension: ""),
+                                 "Failed to get filePath")
+    let ref = storage.reference(withPath: "ios/public/" + fileName)
+    ref.putFile(from: fileURL) { result in
+      switch result {
+      case let .success(metadata):
+        XCTAssertNil(metadata)
+        XCTFail("This test should have thrown an error.")
+      case let .failure(error):
+        XCTAssertNotNil(error)
+        expectation.fulfill()
+      }
+    }
+    waitForExpectations()
+  }
+
   func testPutFileWithSpecialCharacters() throws {
     let expectation = self.expectation(description: #function)