Port Storage Integration tests to Combine (#7959)

* Another take on verifying expected errors. (#7982)
Hat tip to https://heckj.github.io/swiftui-notes/#patterns-testing-and-debugging
Signed-off-by: Peter Friese <[email protected]>

Co-authored-by: Peter Friese <[email protected]>

Author: paulb777

.github/workflows/combine.yml

@@ -51,3 +51,27 @@ jobs:
 
     - name: Build and test
       run:  scripts/third_party/travis/retry.sh scripts/build.sh CombineSwift ${{ matrix.target }} xcodebuild
+
+  storage-combine-integration:
+    # Don't run on private repo unless it is a PR.
+    if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
+    env:
+      plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup Bundler
+      run: scripts/setup_bundler.sh
+    - name: Install Secret GoogleService-Info.plist
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/storage-db-plist.gpg \
+          FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist "$plist_secret"
+    - name: Install Credentials.h
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.h.gpg \
+          FirebaseStorage/Tests/Integration/Credentials.h "$plist_secret"
+    - name: Install Credentials.swift
+      run: |
+        scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.swift.gpg \
+          FirebaseStorage/Tests/SwiftIntegration/Credentials.swift "$plist_secret"
+        cp FirebaseStorage/Tests/SwiftIntegration/Credentials.swift FirebaseStorageSwift/Tests/Integration/
+    - name: BuildAndTest # can be replaced with pod lib lint with CocoaPods 1.10
+      run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/build.sh StorageCombine all)

FirebaseCombineSwift.podspec

@@ -82,4 +82,23 @@ Combine Publishers for Firebase.
     unit_tests.dependency 'FirebaseAuthTestingSupport'
     unit_tests.dependency 'FirebaseFunctionsTestingSupport'
   end
+
+  s.test_spec 'integration' do |int_tests|
+    int_tests.scheme = { :code_coverage => true }
+    int_tests.platforms = {
+      :ios => ios_deployment_target,
+      :osx => osx_deployment_target,
+      :tvos => tvos_deployment_target
+    }
+    int_tests.source_files = [
+      'FirebaseCombineSwift/Tests/Integration/Storage/StorageIntegration.swift',
+      'FirebaseStorage/Tests/SwiftIntegration/Credentials.swift'
+    ]
+    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/HomeImprovement.numbers'
+    int_tests.dependency 'FirebaseAuth', '~> 8.0'
+  end
 end

FirebaseCombineSwift/Sources/Storage/StorageReference+Combine.swift

@@ -20,6 +20,7 @@
 
   @available(swift 5.0)
   @available(macOS 10.15, iOS 13, watchOS 6, tvOS 13, *)
+
   extension StorageReference {
     // MARK: - Uploads
 
@@ -35,7 +36,7 @@
     /// - Returns: A publisher emitting a `StorageMetadata` instance. The publisher will emit on the *main* thread.
     @discardableResult
     public func putData(_ data: Data,
-                        metadata: StorageMetadata?) -> Future<StorageMetadata, Error> {
+                        metadata: StorageMetadata? = nil) -> Future<StorageMetadata, Error> {
       var task: StorageUploadTask?
       return Future<StorageMetadata, Error> { [weak self] promise in
         task = self?.putData(data, metadata: metadata) { result in
@@ -59,7 +60,7 @@
     /// - Returns: A publisher emitting a `StorageMetadata` instance. The publisher will emit on the *main* thread.
     @discardableResult
     public func putFile(from fileURL: URL,
-                        metadata: StorageMetadata?)
+                        metadata: StorageMetadata? = nil)
       -> Future<StorageMetadata, Error> {
       var task: StorageUploadTask?
       return Future<StorageMetadata, Error> { [weak self] promise in
@@ -255,13 +256,13 @@
     ///
     /// - Returns: A publisher that emits whether the call was successful or not. The publisher will emit on the *main* thread.
     @discardableResult
-    public func delete() -> Future<Void, Error> {
-      Future<Void, Error> { promise in
+    public func delete() -> Future<Bool, Error> {
+      Future<Bool, Error> { promise in
         self.delete { error in
           if let error = error {
             promise(.failure(error))
           } else {
-            promise(.success(()))
+            promise(.success(true))
           }
         }
       }