Support for xcode 15b1 (pointfreeco#737)

* Fix compile errors with Xcode-15.0b1 * Fix warnings * Update snapshots * wip --------- Co-authored-by: Stephen Celis <[email protected]>
oreillymedia · Jun 15, 2023 · dc46eeb · dc46eeb
1 parent f5489a2
commit dc46eeb
Show file tree

Hide file tree

Showing 18 changed files with 13 additions and 21 deletions.
diff --git a/Sources/SnapshotTesting/Snapshotting/CALayer.swift b/Sources/SnapshotTesting/Snapshotting/CALayer.swift
@@ -1,5 +1,7 @@
 #if os(macOS)
+import AppKit
 import Cocoa
+import QuartzCore
 
 extension Snapshotting where Value == CALayer, Format == NSImage {
   /// A snapshot strategy for comparing layers based on pixel equality.

diff --git a/Sources/SnapshotTesting/Snapshotting/CGPath.swift b/Sources/SnapshotTesting/Snapshotting/CGPath.swift
@@ -1,5 +1,7 @@
 #if os(macOS)
+import AppKit
 import Cocoa
+import CoreGraphics
 
 extension Snapshotting where Value == CGPath, Format == NSImage {
   /// A snapshot strategy for comparing bezier paths based on pixel equality.

diff --git a/Sources/SnapshotTesting/Snapshotting/NSBezierPath.swift b/Sources/SnapshotTesting/Snapshotting/NSBezierPath.swift
@@ -1,4 +1,5 @@
 #if os(macOS)
+import AppKit
 import Cocoa
 
 extension Snapshotting where Value == NSBezierPath, Format == NSImage {
@@ -30,6 +31,7 @@ extension Snapshotting where Value == NSBezierPath, Format == NSImage {
 
 extension Snapshotting where Value == NSBezierPath, Format == String {
   /// A snapshot strategy for comparing bezier paths based on pixel equality.
+  @available(macOS 11.0, *)
   @available(iOS 11.0, *)
   public static var elementsDescription: Snapshotting {
     return .elementsDescription(numberFormatter: defaultNumberFormatter)
@@ -38,6 +40,7 @@ extension Snapshotting where Value == NSBezierPath, Format == String {
   /// A snapshot strategy for comparing bezier paths based on pixel equality.
   ///
   /// - Parameter numberFormatter: The number formatter used for formatting points.
+  @available(macOS 11.0, *)
   @available(iOS 11.0, *)
   public static func elementsDescription(numberFormatter: NumberFormatter) -> Snapshotting {
     let namesByType: [NSBezierPath.ElementType: String] = [

diff --git a/Sources/SnapshotTesting/Snapshotting/NSView.swift b/Sources/SnapshotTesting/Snapshotting/NSView.swift
@@ -1,4 +1,5 @@
 #if os(macOS)
+import AppKit
 import Cocoa
 
 extension Snapshotting where Value == NSView, Format == NSImage {

diff --git a/Sources/SnapshotTesting/Snapshotting/NSViewController.swift b/Sources/SnapshotTesting/Snapshotting/NSViewController.swift
@@ -1,4 +1,5 @@
 #if os(macOS)
+import AppKit
 import Cocoa
 
 extension Snapshotting where Value == NSViewController, Format == NSImage {

diff --git a/Tests/SnapshotTestingTests/SnapshotTestingTests.swift b/Tests/SnapshotTestingTests/SnapshotTestingTests.swift
@@ -1127,24 +1127,6 @@ final class SnapshotTestingTests: XCTestCase {
     _ = manipulatingWKWebViewNavigationDelegate
   }
 
-  #if os(iOS) || os(macOS)
-  func testWebViewWithRealUrl() throws {
-    let manipulatingWKWebViewNavigationDelegate = ManipulatingWKWebViewNavigationDelegate()
-    let webView = WKWebView()
-    webView.navigationDelegate = manipulatingWKWebViewNavigationDelegate
-
-    webView.load(URLRequest(url: URL(string: "https://www.pointfree.co")!))
-    if !ProcessInfo.processInfo.environment.keys.contains("GITHUB_WORKFLOW") {
-      assertSnapshot(
-        matching: webView,
-        as: .image(size: .init(width: 800, height: 600)),
-        named: platform
-      )
-    }
-    _ = manipulatingWKWebViewNavigationDelegate
-  }
-  #endif
-
   final class CancellingWKWebViewNavigationDelegate: NSObject, WKNavigationDelegate {
     func webView(
       _ webView: WKWebView,
@@ -1154,6 +1136,7 @@ final class SnapshotTestingTests: XCTestCase {
       decisionHandler(.cancel)
     }
   }
+
   func testWebViewWithCancellingNavigationDelegate() throws {
     let cancellingWKWebViewNavigationDelegate = CancellingWKWebViewNavigationDelegate()
     let webView = WKWebView()

diff --git a/Tests/SnapshotTestingTests/__Snapshots__/SnapshotTestingTests/testCGPath.macOS.png b/Tests/SnapshotTestingTests/__Snapshots__/SnapshotTestingTests/testCGPath.macOS.png
diff --git a/...hotTestingTests/__Snapshots__/SnapshotTestingTests/testImagePrecision.exact.png b/...hotTestingTests/__Snapshots__/SnapshotTestingTests/testImagePrecision.exact.png
diff --git a/...stingTests/__Snapshots__/SnapshotTestingTests/testImagePrecision.perceptual.png b/...stingTests/__Snapshots__/SnapshotTestingTests/testImagePrecision.perceptual.png
diff --git a/...pshotTestingTests/__Snapshots__/SnapshotTestingTests/testNSBezierPath.macOS.png b/...pshotTestingTests/__Snapshots__/SnapshotTestingTests/testNSBezierPath.macOS.png
diff --git a/Tests/SnapshotTestingTests/__Snapshots__/SnapshotTestingTests/testNSView.1.png b/Tests/SnapshotTestingTests/__Snapshots__/SnapshotTestingTests/testNSView.1.png
diff --git a/Tests/SnapshotTestingTests/__Snapshots__/SnapshotTestingTests/testNSView.2.txt b/Tests/SnapshotTestingTests/__Snapshots__/SnapshotTestingTests/testNSView.2.txt
@@ -1,4 +1,4 @@
-[   AF    !   U ] h=--- v=--- NSButton "Push Me" f=(0,0,83,32) b=(-)
-  [   A     !   U ] h=--- v=--- NSButtonBezelView f=(0,0,83,32) b=(-)
-  [   AF    !   U ] h=--- v=--- NSButtonTextField "Push Me" f=(11,7,61,15) b=(-)
+[   AF    ! wLU ] h=--- v=--- NSButton "Push Me" f=(0,0,83,32) b=(-) => <_NSViewBackingLayer>
+  [   A     ! wLU ] h=--- v=--- NSButtonBezelView f=(0,0,83,32) b=(-) => <_NSViewBackingLayer>
+  [   AF    ! wLU ] h=--- v=--- NSButtonTextField "Push Me" f=(11,7,61,15) b=(-) => <NSTextLayer>
 A=autoresizesSubviews, C=canDrawConcurrently, D=needsDisplay, F=flipped, G=gstate, H=hidden (h=by ancestor), L=needsLayout (l=child needsLayout), U=needsUpdateConstraints (u=child needsUpdateConstraints), O=opaque, P=preservesContentDuringLiveResize, S=scaled/rotated, W=wantsLayer (w=ancestor wantsLayer), V=needsVibrancy (v=allowsVibrancy), #=has surface
diff --git a/...apshotTestingTests/__Snapshots__/SnapshotTestingTests/testNSViewWithLayer.1.png b/...apshotTestingTests/__Snapshots__/SnapshotTestingTests/testNSViewWithLayer.1.png
diff --git a/...SnapshotTestingTests/__Snapshots__/SnapshotTestingTests/testPrecision.macos.png b/...SnapshotTestingTests/__Snapshots__/SnapshotTestingTests/testPrecision.macos.png
diff --git a/...s/SnapshotTestingTests/__Snapshots__/SnapshotTestingTests/testWebView.macos.png b/...s/SnapshotTestingTests/__Snapshots__/SnapshotTestingTests/testWebView.macos.png
diff --git a/...__/SnapshotTestingTests/testWebViewWithManipulatingNavigationDelegate.macos.png b/...__/SnapshotTestingTests/testWebViewWithManipulatingNavigationDelegate.macos.png
diff --git a/...tTestingTests/__Snapshots__/SnapshotTestingTests/testWebViewWithRealUrl.ios.png b/...tTestingTests/__Snapshots__/SnapshotTestingTests/testWebViewWithRealUrl.ios.png
diff --git a/...estingTests/__Snapshots__/SnapshotTestingTests/testWebViewWithRealUrl.macos.png b/...estingTests/__Snapshots__/SnapshotTestingTests/testWebViewWithRealUrl.macos.png