Add platform builds to CI

Author: carson-katri

.github/workflows/ci.yml

@@ -14,4 +14,12 @@ jobs:
         shell: bash
         run: |
           sudo xcode-select --switch /Applications/Xcode_14.2.app
-          xcodebuild test -scheme LiveViewNative -sdk iphonesimulator16.2 -destination "OS=16.2,name=iPhone 14 Pro"
+          xcodebuild test -scheme LiveViewNative -sdk iphonesimulator16.2 -destination "OS=16.2,name=iPhone 14 Pro"
+      - name: Build for macOS
+        shell: bash
+        run: |
+          xcodebuild -scheme LiveViewNative -sdk macosx13.1 -destination "platform=macOS"
+      - name: Build for watchOS
+        shell: bash
+        run: |
+          xcodebuild -scheme LiveViewNative -sdk watchsimulator9.1 -destination "OS=9.1,name=Apple Watch Series 8 (45mm)"

Package.resolved

@@ -34,7 +34,8 @@ let package = Package(
             ]),
         .testTarget(
             name: "LiveViewNativeTests",
-            dependencies: ["LiveViewNative"]),
+            dependencies: ["LiveViewNative"]
+        ),
         .testTarget(
             name: "RenderingTests",
             dependencies: ["LiveViewNative"]

Package.swift

@@ -12,14 +12,14 @@ import SwiftUI
 @MainActor
 final class ProgressViewTests: XCTestCase {
     func testValue() throws {
-        try assertMatch(#"<progressview value="0.5" />"#) {
+        try assertMatch(#"<progress-view value="0.5" />"#, size: .init(width: 200, height: 200)) {
             ProgressView(value: 0.5)
         }
     }
 
     func testTotal() throws {
-        try assertMatch(#"<progressview value="2.5" total="5" />"#) {
-            ProgressView(value: 0.5, total: 5)
+        try assertMatch(#"<progress-view value="2.5" total="5" />"#, size: .init(width: 200, height: 200)) {
+            ProgressView(value: 2.5, total: 5)
         }
     }
 }

Tests/RenderingTests/ProgressViewTests.swift

@@ -11,56 +11,71 @@ import Foundation
 @testable import LiveViewNative
 import LiveViewNativeCore
 
-@MainActor
-func assertMatch(
-    _ markup: String,
-    _ file: String = #file,
-    _ line: Int = #line,
-    _ function: StaticString = #function,
-    environment: @escaping (inout EnvironmentValues) -> () = { _ in },
-    size: CGSize? = nil,
-    @ViewBuilder _ view: () -> some View
-) throws {
-    try assertMatch(name: "\(URL(filePath: file).lastPathComponent)-\(line)-\(function)", markup, environment: environment, size: size, view)
-}
-
-@MainActor
-func assertMatch(
-    name: String,
-    _ markup: String,
-    environment: @escaping (inout EnvironmentValues) -> () = { _ in },
-    size: CGSize? = nil,
-    @ViewBuilder _ view: () -> some View
-) throws {
-    let session = LiveSessionCoordinator(URL(string: "http://localhost")!)
-    let document = try LiveViewNativeCore.Document.parse(markup)
-    let viewTree = session.rootCoordinator.builder.fromNodes(
-        document[document.root()].children(),
-        context: LiveContext(coordinator: session.rootCoordinator, url: session.url)
-    ).environment(\.coordinatorEnvironment, CoordinatorEnvironment(session.rootCoordinator, document: document))
-    
-    let markupImage = snapshot(
-        viewTree
-            .transformEnvironment(\.self, transform: environment),
-        size: size
-    )?.pngData()
-    let viewImage = snapshot(
-        view()
-            .transformEnvironment(\.self, transform: environment),
-        size: size
-    )?.pngData()
+extension XCTestCase {
+    @MainActor
+    func assertMatch(
+        _ markup: String,
+        _ file: String = #file,
+        _ line: Int = #line,
+        _ function: StaticString = #function,
+        environment: @escaping (inout EnvironmentValues) -> () = { _ in },
+        size: CGSize? = nil,
+        @ViewBuilder _ view: () -> some View
+    ) throws {
+        try assertMatch(name: "\(URL(filePath: file).lastPathComponent)-\(line)-\(function)", markup, environment: environment, size: size, view)
+    }
 
-    if markupImage == viewImage {
-        XCTAssert(true)
-    } else {
-        let markupURL = URL.temporaryDirectory.appendingPathComponent("\(name)_markup", conformingTo: .png)
-        let viewURL = URL.temporaryDirectory.appendingPathComponent("\(name)_view", conformingTo: .png)
-        try markupImage?.write(to: markupURL)
-        try viewImage?.write(to: viewURL)
-        XCTAssert(false, "Rendered views did not match. Outputs saved to \(markupURL.path()) and \(viewURL.path())")
+    @MainActor
+    func assertMatch(
+        name: String,
+        _ markup: String,
+        environment: @escaping (inout EnvironmentValues) -> () = { _ in },
+        size: CGSize? = nil,
+        @ViewBuilder _ view: () -> some View
+    ) throws {
+        #if !os(iOS)
+        fatalError("Rendering tests not supported on platforms other than iOS at this time")
+        #else
+        let session = LiveSessionCoordinator(URL(string: "http://localhost")!)
+        let document = try LiveViewNativeCore.Document.parse(markup)
+        let viewTree = session.rootCoordinator.builder.fromNodes(
+            document[document.root()].children(),
+            context: LiveContext(coordinator: session.rootCoordinator, url: session.url)
+        ).environment(\.coordinatorEnvironment, CoordinatorEnvironment(session.rootCoordinator, document: document))
+        
+        guard let markupImage = snapshot(
+            viewTree
+                .transformEnvironment(\.self, transform: environment),
+            size: size
+        )
+        else {
+            return XCTAssert(false, "Markup failed to render an image")
+        }
+        guard let viewImage = snapshot(
+            view()
+                .transformEnvironment(\.self, transform: environment),
+            size: size
+        )
+        else {
+            return XCTAssert(false, "View failed to render an image")
+        }
+        
+        self.add(XCTAttachment(image: markupImage))
+        self.add(XCTAttachment(image: viewImage))
+        
+        let markupData = markupImage.pngData()
+        let viewData = viewImage.pngData()
+        
+        if markupData == viewData {
+            XCTAssert(true)
+        } else {
+            XCTAssert(false, "Rendered views did not match. Attachments can be viewed in the Report navigator.")
+        }
+        #endif
     }
 }
 
+#if os(iOS)
 private class SnapshotWindow: UIWindow {
     override var safeAreaInsets: UIEdgeInsets {
         .zero
@@ -86,3 +101,4 @@ private func snapshot(_ view: some View, size: CGSize?) -> UIImage? {
         uiView.layer.render(in: context.cgContext)
     }
 }
+#endif