Skip to content

Run Windows games on Apple Silicon — free, open source, with an open compatibility database that tells you what actually works.

Engine ask: "New environment for EA app"; a test reads the EA recipe from the database checkout so a missing top-level engine fails here, not for the user

Gauthier Piarrette87a75e244441
diff --git a/Sources/HighballApp/HighballApp.swift b/Sources/HighballApp/HighballApp.swift
index 8ea1500..34fabea 100644
--- a/Sources/HighballApp/HighballApp.swift
+++ b/Sources/HighballApp/HighballApp.swift
@@ -247,7 +247,7 @@ struct ContentView: View {
.alert(state.pendingEngine.map { String(format: L("%@ needs the %@ engine"), $0.recipe.title, GamePageCopy.shortEngineName($0.manifest)) } ?? "",
isPresented: .init(get: { state.pendingEngine != nil }, set: { if !$0 { state.pendingEngine = nil } }),
presenting: state.pendingEngine) { pending in
- Button(String(format: L("Create a %@ environment"), pending.recipe.title)) { state.createEnvironment(for: pending.recipe, on: pending.manifest) }
+ Button(String(format: L("New environment for %@"), pending.recipe.title)) { state.createEnvironment(for: pending.recipe, on: pending.manifest) }
Button(L("Move this environment")) { state.moveEnvironment(for: pending.recipe, bottle: pending.bottle, to: pending.manifest) }
Button(L("Not now"), role: .cancel) { state.pendingEngine = nil }
} message: { pending in
diff --git a/Sources/HighballApp/L10n.swift b/Sources/HighballApp/L10n.swift
index 96bc3cb..d7dda2d 100644
--- a/Sources/HighballApp/L10n.swift
+++ b/Sources/HighballApp/L10n.swift
@@ -117,7 +117,7 @@ enum L10n {
"DXVK — D3D9/10/11 → Vulkan": "DXVK — D3D9/10/11 → Vulkan",
"Get beta builds": "Recevoir les versions bêta",
"%@ needs the %@ engine": "%@ a besoin du moteur %@",
- "Create a %@ environment": "Créer un environnement %@",
+ "New environment for %@": "Nouvel environnement pour %@",
"Move this environment": "Déplacer cet environnement",
"Creating the %@ environment on %@": "Création de l'environnement %@ sur %@",
"a download when the engine is new, then a first boot of about 90 seconds": "un téléchargement si le moteur est nouveau, puis un premier démarrage d'environ 90 secondes",
diff --git a/Tests/HighballKitTests/RecipeEngineTests.swift b/Tests/HighballKitTests/RecipeEngineTests.swift
index 500a63c..6432c34 100644
--- a/Tests/HighballKitTests/RecipeEngineTests.swift
+++ b/Tests/HighballKitTests/RecipeEngineTests.swift
@@ -47,6 +47,21 @@ final class RecipeEngineTests: XCTestCase {
XCTAssertNotNil(wine11.components["d3dmetal-tsshim"], "the timestamp shim rides along on every engine with D3DMetal")
}
+ /// The EA recipe in the sibling database checkout names the bundled Wine 11 engine at the top
+ /// level (a `lastVerified.engine` alone is provenance, not a requirement: that is exactly what
+ /// let the first screen check install straight onto Wine 10).
+ func testTheEARecipeInTheDatabaseNamesTheBundledWine11Engine() throws {
+ let root = URL(fileURLWithPath: #filePath).deletingLastPathComponent().deletingLastPathComponent().deletingLastPathComponent()
+ let recipeURL = root.deletingLastPathComponent().appending(path: "highball-db/recipes/launchers/ea-app.json")
+ guard FileManager.default.fileExists(atPath: recipeURL.path) else { throw XCTSkip("no highball-db checkout beside the repo") }
+ let ea = try Recipe.load(from: recipeURL)
+ let def = try EngineManifest.load(from: root.appending(path: "spike/engine-manifest.json"))
+ let wine11 = try EngineManifest.load(from: root.appending(path: "spike/engines/x64-crossover26.3-r4.json"))
+ XCTAssertEqual(ea.engine, wine11.id)
+ XCTAssertEqual(ea.engineToOffer(current: def, known: [def, wine11])?.id, wine11.id, "installing the EA app on the default engine offers Wine 11")
+ XCTAssertNil(ea.engineToOffer(current: wine11, known: [def, wine11]))
+ }
+
func testFreeBottleName() {
XCTAssertEqual(BottleStore.freeName("EA app", taken: []), "EA app")
XCTAssertEqual(BottleStore.freeName("EA app", taken: ["EA app"]), "EA app 2")