refactor(core): simplify integration test fixtures (#33292)

packages/core/test/plugin/provider-sap-ai-core.test.ts

@@ -1,16 +1,54 @@
 import { describe, expect } from "bun:test"
 import { Effect } from "effect"
+import { ModelV2 } from "@opencode-ai/core/model"
 import { PluginV2 } from "@opencode-ai/core/plugin"
+import { PluginHost } from "@opencode-ai/core/plugin/host"
 import { Npm } from "@opencode-ai/core/npm"
 import { SapAICorePlugin } from "@opencode-ai/core/plugin/provider/sap-ai-core"
-import { fixtureProvider, it, model, npmLayer, withEnv } from "./provider-helper"
-import { host } from "./host"
+import { ProviderV2 } from "@opencode-ai/core/provider"
+import { testEffect } from "../lib/effect"
+import { PluginTestLayer } from "./fixture"
 
-const pluginWithNpm = {
-  id: SapAICorePlugin.id,
-  effect: Effect.gen(function* () {
-    yield* SapAICorePlugin.effect(host({ npm: yield* Npm.Service }))
-  }).pipe(Effect.provide(npmLayer)),
+const fixtureProvider = new URL("./fixtures/provider-factory.ts", import.meta.url).href
+const it = testEffect(PluginTestLayer)
+const npm = Npm.Service.of({
+  add: () => Effect.succeed({ directory: "", entrypoint: undefined }),
+  install: () => Effect.void,
+  which: () => Effect.succeed(undefined),
+})
+
+const addPlugin = Effect.fn(function* () {
+  const plugin = yield* PluginV2.Service
+  const host = yield* PluginHost.make()
+  yield* plugin.add({ id: SapAICorePlugin.id, effect: SapAICorePlugin.effect({ ...host, npm }) })
+})
+
+function withEnv<A, E, R>(vars: Record<string, string | undefined>, effect: () => Effect.Effect<A, E, R>) {
+  return Effect.acquireUseRelease(
+    Effect.sync(() => {
+      const previous = Object.fromEntries(Object.keys(vars).map((key) => [key, process.env[key]]))
+      for (const [key, value] of Object.entries(vars)) {
+        if (value === undefined) delete process.env[key]
+        else process.env[key] = value
+      }
+      return previous
+    }),
+    effect,
+    (previous) =>
+      Effect.sync(() => {
+        for (const [key, value] of Object.entries(previous)) {
+          if (value === undefined) delete process.env[key]
+          else process.env[key] = value
+        }
+      }),
+  )
+}
+
+function model(providerID: string) {
+  return new ModelV2.Info({
+    ...ModelV2.Info.empty(ProviderV2.ID.make(providerID), ModelV2.ID.make("sap-model")),
+    api: { id: ModelV2.ID.make("sap-model"), type: "aisdk", package: fixtureProvider },
+  })
 }
 
 describe("SapAICorePlugin", () => {
@@ -20,11 +58,11 @@ describe("SapAICorePlugin", () => {
       () =>
         Effect.gen(function* () {
           const plugin = yield* PluginV2.Service
-          yield* plugin.add(pluginWithNpm)
+          yield* addPlugin()
           const sdk = yield* plugin.trigger(
             "aisdk.sdk",
             {
-              model: model("sap-ai-core", "sap-model"),
+              model: model("sap-ai-core"),
               package: fixtureProvider,
               options: { name: "sap-ai-core", serviceKey: "service-key" },
             },
@@ -46,11 +84,11 @@ describe("SapAICorePlugin", () => {
       () =>
         Effect.gen(function* () {
           const plugin = yield* PluginV2.Service
-          yield* plugin.add(pluginWithNpm)
+          yield* addPlugin()
           const sdk = yield* plugin.trigger(
             "aisdk.sdk",
             {
-              model: model("sap-ai-core", "sap-model"),
+              model: model("sap-ai-core"),
               package: fixtureProvider,
               options: { name: "sap-ai-core", serviceKey: "option-service-key" },
             },
@@ -68,10 +106,10 @@ describe("SapAICorePlugin", () => {
       () =>
         Effect.gen(function* () {
           const plugin = yield* PluginV2.Service
-          yield* plugin.add(pluginWithNpm)
+          yield* addPlugin()
           const sdk = yield* plugin.trigger(
             "aisdk.sdk",
-            { model: model("sap-ai-core", "sap-model"), package: fixtureProvider, options: { name: "sap-ai-core" } },
+            { model: model("sap-ai-core"), package: fixtureProvider, options: { name: "sap-ai-core" } },
             {},
           )
           expect(process.env.AICORE_SERVICE_KEY).toBeUndefined()
@@ -83,7 +121,7 @@ describe("SapAICorePlugin", () => {
   it.effect("uses the callable SDK for language selection", () =>
     Effect.gen(function* () {
       const plugin = yield* PluginV2.Service
-      yield* plugin.add(pluginWithNpm)
+      yield* addPlugin()
       const sdk = Object.assign((modelID: string) => ({ modelID, provider: "callable" }), {
         languageModel() {
           throw new Error("SAP AI Core should call the SDK directly")
@@ -91,7 +129,7 @@ describe("SapAICorePlugin", () => {
       })
       const language = yield* plugin.trigger(
         "aisdk.language",
-        { model: model("sap-ai-core", "sap-model"), sdk, options: {} },
+        { model: model("sap-ai-core"), sdk, options: {} },
         {},
       )
       expect(language.language as unknown).toEqual({ modelID: "sap-model", provider: "callable" })
@@ -104,11 +142,11 @@ describe("SapAICorePlugin", () => {
       () =>
         Effect.gen(function* () {
           const plugin = yield* PluginV2.Service
-          yield* plugin.add(pluginWithNpm)
+          yield* addPlugin()
           const sdk = yield* plugin.trigger(
             "aisdk.sdk",
             {
-              model: model("openai", "sap-model"),
+              model: model("openai"),
               package: fixtureProvider,
               options: { name: "openai", serviceKey: "service-key" },
             },
@@ -117,7 +155,7 @@ describe("SapAICorePlugin", () => {
           const language = yield* plugin.trigger(
             "aisdk.language",
             {
-              model: model("openai", "sap-model"),
+              model: model("openai"),
               sdk: () => {
                 throw new Error("SAP AI Core should ignore other providers")
               },