Support for Swift 6.1 TestScoping. (#965)

* Support for Swift 6.1 TestScoping.

* wip

* wip

* clean up

* Disable windows ci for now.

Author: mbrandonw

.github/workflows/ci.yml

@@ -38,29 +38,29 @@ jobs:
       - uses: actions/checkout@v4
       - run: swift test
 
-  windows:
-    strategy:
-      matrix:
-        swift:
-          - "5.9.1"
+  # windows:
+  #   strategy:
+  #     matrix:
+  #       swift:
+  #         - "5.9.1"
 
-    name: Windows (Swift ${{ matrix.swift }})
-    runs-on: windows-latest
+  #   name: Windows (Swift ${{ matrix.swift }})
+  #   runs-on: windows-latest
 
-    steps:
-      - uses: compnerd/gha-setup-swift@main
-        with:
-          branch: swift-${{ matrix.swift }}-release
-          tag: ${{ matrix.swift }}-RELEASE
+  #   steps:
+  #     - uses: compnerd/gha-setup-swift@main
+  #       with:
+  #         branch: swift-${{ matrix.swift }}-release
+  #         tag: ${{ matrix.swift }}-RELEASE
 
-      - name: Set git to use LF
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
+  #     - name: Set git to use LF
+  #       run: |
+  #         git config --global core.autocrlf false
+  #         git config --global core.eol lf
 
-      - uses: actions/checkout@v4
-      - run: swift build
-      - run: swift test
+  #     - uses: actions/checkout@v4
+  #     - run: swift build
+  #     - run: swift test
 
   android:
     strategy:

[email protected]

@@ -0,0 +1,70 @@
+// swift-tools-version:6.0
+
+import PackageDescription
+
+let package = Package(
+  name: "swift-snapshot-testing",
+  platforms: [
+    .iOS(.v13),
+    .macOS(.v10_15),
+    .tvOS(.v13),
+    .watchOS(.v6),
+  ],
+  products: [
+    .library(
+      name: "SnapshotTesting",
+      targets: ["SnapshotTesting"]
+    ),
+    .library(
+      name: "InlineSnapshotTesting",
+      targets: ["InlineSnapshotTesting"]
+    ),
+    .library(
+      name: "SnapshotTestingCustomDump",
+      targets: ["SnapshotTestingCustomDump"]
+    ),
+  ],
+  dependencies: [
+    .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.3"),
+    .package(url: "https://github.com/swiftlang/swift-syntax", "509.0.0"..<"601.0.0"),
+  ],
+  targets: [
+    .target(
+      name: "SnapshotTesting"
+    ),
+    .testTarget(
+      name: "SnapshotTestingTests",
+      dependencies: [
+        "SnapshotTesting"
+      ],
+      exclude: [
+        "__Fixtures__",
+        "__Snapshots__",
+      ]
+    ),
+    .target(
+      name: "InlineSnapshotTesting",
+      dependencies: [
+        "SnapshotTesting",
+        "SnapshotTestingCustomDump",
+        .product(name: "SwiftParser", package: "swift-syntax"),
+        .product(name: "SwiftSyntax", package: "swift-syntax"),
+        .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
+      ]
+    ),
+    .testTarget(
+      name: "InlineSnapshotTestingTests",
+      dependencies: [
+        "InlineSnapshotTesting"
+      ]
+    ),
+    .target(
+      name: "SnapshotTestingCustomDump",
+      dependencies: [
+        "SnapshotTesting",
+        .product(name: "CustomDump", package: "swift-custom-dump"),
+      ]
+    ),
+  ],
+  swiftLanguageModes: [.v5]
+)

Sources/SnapshotTesting/SnapshotsTestTrait.swift

@@ -1,6 +1,12 @@
 #if canImport(Testing)
   import Testing
 
+  /// A type representing the configuration of snapshot testing.
+  public struct _SnapshotsTestTrait: SuiteTrait, TestTrait {
+    public let isRecursive = true
+    let configuration: SnapshotTestingConfiguration
+  }
+
   extension Trait where Self == _SnapshotsTestTrait {
     /// Configure snapshot testing in a suite or test.
     ///
@@ -29,22 +35,20 @@
     }
   }
 
-  /// A type representing the configuration of snapshot testing.
-  public struct _SnapshotsTestTrait: SuiteTrait, TestTrait {
-    public let isRecursive = true
-    let configuration: SnapshotTestingConfiguration
-
-    // public func execute(
-    //   _ function: @escaping () async throws -> Void,
-    //   for test: Test,
-    //   testCase: Test.Case?
-    // ) async throws {
-    //   try await withSnapshotTesting(
-    //     record: configuration.record,
-    //     diffTool: configuration.diffTool
-    //   ) {
-    //     try await function()
-    //   }
-    // }
-  }
+  #if compiler(>=6.1)
+    extension _SnapshotsTestTrait: TestScoping {
+      public func provideScope(
+        for test: Test,
+        testCase: Test.Case?,
+        performing function: () async throws -> Void
+      ) async throws {
+        try await withSnapshotTesting(
+          record: configuration.record,
+          diffTool: configuration.diffTool
+        ) {
+          try await function()
+        }
+      }
+    }
+  #endif
 #endif