Run "WordPressData unit tests" as part of "WordPress Unit Tests"

.buildkite/pipeline.yml

@@ -90,14 +90,6 @@ steps:
       #   notify:
       #     - github_commit_status:
       #         context: "Unit Tests Keystone"
-      - label: "🔬 WordPressData Unit Tests"
-        command: .buildkite/commands/run-unit-tests-for-scheme.sh WordPressData
-        plugins: [$CI_TOOLKIT_PLUGIN]
-        artifact_paths:
-          - "build/results/*"
-        notify:
-          - github_commit_status:
-              context: "Unit Tests WordPressData"
 
   #################
   # Linters

AGENTS.md

@@ -49,9 +49,8 @@ WordPress-iOS uses a modular architecture with the main app and separate Swift p
 - **Localization**: follow best practices from @docs/localization.md
 
 ## Xcode Schemes
-- `WordPress` builds the WordPress iOS app and runs `WordPressUnitTests.xctestplan` — default for builds and the full unit test suite.
+- `WordPress` builds the WordPress iOS app and runs `WordPressUnitTests.xctestplan` — default for builds and the full unit test suite. Use this scheme to run unit tests.
 - `Jetpack` builds the Jetpack iOS app — switch to it for Jetpack-only work.
-- Some test targets (e.g. `WordPressDataTests`) have their own scheme and aren't in `WordPressUnitTests.xctestplan`. If the `WordPress` scheme fails to build because of an unrelated target, fall back to the target's dedicated scheme.
 
 ## Simulator Sign-In
 

Modules/Sources/WordPressData/Swift/Bundle+WordPressData.swift

@@ -2,6 +2,14 @@ import Foundation
 
 extension Bundle {
     @objc public class var wordPressData: Bundle {
-        .module
+        #if DEBUG
+        // Workaround for https://forums.swift.org/t/swift-5-3-swiftpm-resources-in-tests-uses-wrong-bundle-path/37051
+        if let testBundlePath = ProcessInfo.processInfo.environment["XCTestBundlePath"],
+            let bundle = Bundle(path: "\(testBundlePath)/Modules_WordPressData.bundle")
+        {
+            return bundle
+        }
+        #endif
+        return .module
     }
 }

Tests/KeystoneTests/WordPressUnitTests.xctestplan

@@ -115,6 +115,13 @@
         "name" : "WordPressMediaLibraryTests"
       }
     },
+    {
+      "target" : {
+        "containerPath" : "container:..\/Modules",
+        "identifier" : "WordPressDataTests",
+        "name" : "WordPressDataTests"
+      }
+    },
     {
       "target" : {
         "containerPath" : "container:WordPress.xcodeproj",