Merge pull request #888 from ahoppen/ahoppen/older-toolchains

ahoppen · web-flow · commit 31152de26a13 · 2023-10-11T08:04:02.000-07:00
Make `PullDiagnosticsTests.testCodeActions` pass with older toolchains
diff --git a/Tests/SourceKitLSPTests/PullDiagnosticsTests.swift b/Tests/SourceKitLSPTests/PullDiagnosticsTests.swift
@@ -132,6 +132,13 @@ final class PullDiagnosticsTests: XCTestCase {
 
     XCTAssertEqual(actions.count, 1)
     let action = try XCTUnwrap(actions.first)
-    XCTAssertEqual(action.title, "add stubs for conformance")
+    // Allow the action message to be the one before or after
+    // https://github.com/apple/swift/pull/67909, ensuring this test passes with
+    // a sourcekitd that contains the change from that PR as well as older
+    // toolchains that don't contain the change yet.
+    XCTAssert([
+      "add stubs for conformance",
+      "do you want to add protocol stubs?"
+    ].contains(action.title))
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,13 @@ final class PullDiagnosticsTests: XCTestCase {`
`132`	`132`
`133`	`133`	`XCTAssertEqual(actions.count, 1)`
`134`	`134`	`let action = try XCTUnwrap(actions.first)`
`135`		`- XCTAssertEqual(action.title, "add stubs for conformance")`
	`135`	`+ // Allow the action message to be the one before or after`
	`136`	`+ // https://github.com/apple/swift/pull/67909, ensuring this test passes with`
	`137`	`+ // a sourcekitd that contains the change from that PR as well as older`
	`138`	`+ // toolchains that don't contain the change yet.`
	`139`	`+ XCTAssert([`
	`140`	`+ "add stubs for conformance",`
	`141`	`+ "do you want to add protocol stubs?"`
	`142`	`+ ].contains(action.title))`
`136`	`143`	`}`
`137`	`144`	`}`