test(functions): increase code coverage (#647)

supabase · Jan 27, 2025 · 3053599 · 3053599
1 parent b13788c
commit 3053599
Show file tree

Hide file tree

Showing 19 changed files with 635 additions and 180 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,20 +30,10 @@ jobs:
         run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
       - name: List available devices
         run: xcrun simctl list devices available
-      - name: Cache derived data
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.derivedData
-          key: |
-            deriveddata-xcodebuild-${{ matrix.platform }}-${{ matrix.xcode }}-${{ matrix.command }}-${{ hashFiles('**/Sources/**/*.swift', '**/Tests/**/*.swift') }}
-          restore-keys: |
-            deriveddata-xcodebuild-${{ matrix.platform }}-${{ matrix.xcode }}-${{ matrix.command }}-
       - name: Set IgnoreFileSystemDeviceInodeChanges flag
         run: defaults write com.apple.dt.XCBuild IgnoreFileSystemDeviceInodeChanges -bool YES
       - name: Update mtime for incremental builds
         uses: chetan/git-restore-mtime-action@v2
-      - run: make dot-env
       - name: Debug
         run: make XCODEBUILD_ARGUMENT="${{ matrix.command }}" CONFIG=Debug PLATFORM="${{ matrix.platform }}" xcodebuild
       - name: Release
@@ -62,7 +52,6 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           file: lcov.info
 
-
   xcodebuild:
     name: xcodebuild (15)
     runs-on: macos-14
@@ -77,6 +66,7 @@ jobs:
           - { xcode: 15.2, platform: TVOS }
           - { xcode: 15.2, platform: VISIONOS }
           - { xcode: 15.2, platform: WATCHOS }
+          - { command: test, platform: WATCHOS }
         include:
           - { command: test, skip_release: 1 }
     steps:
@@ -105,7 +95,6 @@ jobs:
         run: defaults write com.apple.dt.XCBuild IgnoreFileSystemDeviceInodeChanges -bool YES
       - name: Update mtime for incremental builds
         uses: chetan/git-restore-mtime-action@v2
-      - run: make dot-env
       - name: Debug
         run: make XCODEBUILD_ARGUMENT="${{ matrix.command }}" CONFIG=Debug PLATFORM="${{ matrix.platform }}" xcodebuild
       - name: Release
@@ -132,7 +121,6 @@ jobs:
   #           build-spm-linux-${{ matrix.swift-version }}-${{ hashFiles('**/Sources/**/*.swift', '**/Tests/**/*.swift', '**/Package.resolved') }}
   #         restore-keys: |
   #           build-spm-linux-${{ matrix.swift-version }}-
-  #     - run: make dot-env
   #     - name: Run tests
   #       run: swift test --skip IntegrationTests
 

diff --git a/.github/workflows/integration-tests.yml → .../workflows_disabled/integration-tests.yml b/.github/workflows/integration-tests.yml → .../workflows_disabled/integration-tests.yml
diff --git a/.gitignore b/.gitignore
@@ -99,6 +99,5 @@ iOSInjectionProject/
 # Environment
 .env
 Secrets.swift
-DotEnv.swift
 lcov.info
 temp_coverage
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/Supabase.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/Supabase.xcscheme
@@ -97,7 +97,52 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      codeCoverageEnabled = "YES"
+      onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <CodeCoverageTargets>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "Auth"
+            BuildableName = "Auth"
+            BlueprintName = "Auth"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "Functions"
+            BuildableName = "Functions"
+            BlueprintName = "Functions"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "PostgREST"
+            BuildableName = "PostgREST"
+            BlueprintName = "PostgREST"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "Realtime"
+            BuildableName = "Realtime"
+            BlueprintName = "Realtime"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "Storage"
+            BuildableName = "Storage"
+            BlueprintName = "Storage"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "Supabase"
+            BuildableName = "Supabase"
+            BlueprintName = "Supabase"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </CodeCoverageTargets>
       <Testables>
          <TestableReference
             skipped = "NO">

diff --git a/Makefile b/Makefile
@@ -38,26 +38,13 @@ endif
 
 TEST_RUNNER_CI = $(CI)
 
-export SECRETS
-define SECRETS
-enum DotEnv {
-  static let SUPABASE_URL = "$(SUPABASE_URL)"
-  static let SUPABASE_ANON_KEY = "$(SUPABASE_ANON_KEY)"
-  static let SUPABASE_SERVICE_ROLE_KEY = "$(SUPABASE_SERVICE_ROLE_KEY)"
-}
-endef
-
 xcodebuild:
 	$(XCODEBUILD)
 
-load-env:
-	@. ./scripts/load_env.sh
-
-dot-env:
-	@echo "$$SECRETS" > Tests/IntegrationTests/DotEnv.swift
-
-test-integration: dot-env
-	$(MAKE) TEST_PLAN=Integration xcodebuild
+test-integration:
+	cd Tests/IntegrationTests && supabase start && supabase db reset
+	swift test --filter IntegrationTests
+	cd Tests/IntegrationTests && supabase stop
 
 build-for-library-evolution:
 	swift build \
@@ -107,4 +94,4 @@ coverage:
 
 define udid_for
 $(shell xcrun simctl list devices available '$(1)' | grep '$(2)' | sort -r | head -1 | awk -F '[()]' '{ print $$(NF-3) }')
-endef
+endef
diff --git a/Package.resolved b/Package.resolved
@@ -1,5 +1,14 @@
 {
   "pins" : [
+    {
+      "identity" : "mocker",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/WeTransfer/Mocker",
+      "state" : {
+        "revision" : "95fa785c751f6bc40c49e112d433c3acf8417a97",
+        "version" : "3.0.2"
+      }
+    },
     {
       "identity" : "swift-asn1",
       "kind" : "remoteSourceControl",

diff --git a/Package.swift b/Package.swift
@@ -24,13 +24,14 @@ let package = Package(
       targets: ["Supabase", "Functions", "PostgREST", "Auth", "Realtime", "Storage"]),
   ],
   dependencies: [
-    .package(url: "https://github.com/apple/swift-http-types.git", from: "1.3.0"),
     .package(url: "https://github.com/apple/swift-crypto.git", "1.0.0"..<"4.0.0"),
+    .package(url: "https://github.com/apple/swift-http-types.git", from: "1.3.0"),
+    .package(url: "https://github.com/pointfreeco/swift-clocks", from: "1.0.0"),
     .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.1.0"),
     .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.2"),
-    .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.17.2"),
+    .package(url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.17.0"),
     .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.2.2"),
-    .package(url: "https://github.com/pointfreeco/swift-clocks", from: "1.0.0"),
+    .package(url: "https://github.com/WeTransfer/Mocker", from: "3.0.0"),
   ],
   targets: [
     .target(
@@ -39,6 +40,7 @@ let package = Package(
         .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
         .product(name: "HTTPTypes", package: "swift-http-types"),
         .product(name: "Clocks", package: "swift-clocks"),
+        .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
       ]
     ),
     .testTarget(
@@ -60,11 +62,11 @@ let package = Package(
       name: "AuthTests",
       dependencies: [
         .product(name: "CustomDump", package: "swift-custom-dump"),
-        .product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
         .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
+        .product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
         .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
-        "Helpers",
         "Auth",
+        "Helpers",
         "TestHelpers",
       ],
       exclude: [
@@ -82,12 +84,13 @@ let package = Package(
       name: "FunctionsTests",
       dependencies: [
         .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
+        .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
         .product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
         .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
         "Functions",
+        "Mocker",
         "TestHelpers",
-      ],
-      exclude: ["__Snapshots__"]
+      ]
     ),
     .testTarget(
       name: "IntegrationTests",
@@ -99,7 +102,10 @@ let package = Package(
         "Supabase",
         "TestHelpers",
       ],
-      resources: [.process("Fixtures")]
+      resources: [
+        .process("Fixtures"),
+        .process("supabase"),
+      ]
     ),
     .target(
       name: "PostgREST",
@@ -111,11 +117,13 @@ let package = Package(
     .testTarget(
       name: "PostgRESTTests",
       dependencies: [
+        .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
         .product(name: "SnapshotTesting", package: "swift-snapshot-testing"),
         "Helpers",
+        "Mocker",
         "PostgREST",
-      ],
-      exclude: ["__Snapshots__"]
+        "TestHelpers",
+      ]
     ),
     .target(
       name: "Realtime",
@@ -129,8 +137,8 @@ let package = Package(
       name: "RealtimeTests",
       dependencies: [
         .product(name: "CustomDump", package: "swift-custom-dump"),
-        .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
         .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
+        .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
         "PostgREST",
         "Realtime",
         "TestHelpers",
@@ -149,6 +157,9 @@ let package = Package(
         .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
         .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
         "Storage",
+      ],
+      resources: [
+        .copy("sadcat.jpg")
       ]
     ),
     .target(
@@ -174,8 +185,10 @@ let package = Package(
       name: "TestHelpers",
       dependencies: [
         .product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
+        .product(name: "InlineSnapshotTesting", package: "swift-snapshot-testing"),
         .product(name: "XCTestDynamicOverlay", package: "xctest-dynamic-overlay"),
         "Auth",
+        "Mocker",
       ]
     ),
   ]