|
5 | 5 | "flag" |
6 | 6 | "io" |
7 | 7 | "os" |
| 8 | + "os/exec" |
8 | 9 | "path/filepath" |
9 | 10 | "runtime" |
10 | 11 | "runtime/debug" |
@@ -210,8 +211,10 @@ func TestScaffoldSkillWritesLanguageSpecificEntrypoints(t *testing.T) { |
210 | 211 | t.Fatalf("skill.json = version %d language %q", generated.Version, generated.Language) |
211 | 212 | } |
212 | 213 | skill := readTestFile(t, filepath.Join(dir, "SKILL.md")) |
213 | | - if !strings.Contains(skill, tt.command) { |
214 | | - t.Fatalf("SKILL.md does not contain %q:\n%s", tt.command, skill) |
| 214 | + workflow := shellQuoteForPlatform(dir, runtime.GOOS) |
| 215 | + command := strings.Replace(tt.command, " .", " "+workflow, 1) |
| 216 | + if !strings.Contains(skill, command) { |
| 217 | + t.Fatalf("SKILL.md does not contain %q:\n%s", command, skill) |
215 | 218 | } |
216 | 219 | entrypoint := map[string]string{ |
217 | 220 | "typescript": "main.ts", |
@@ -244,6 +247,97 @@ func TestScaffoldSkillWritesLanguageSpecificEntrypoints(t *testing.T) { |
244 | 247 | } |
245 | 248 | } |
246 | 249 |
|
| 250 | +func TestPackageScaffoldsPrintCreatedWorkflowInNextCommands(t *testing.T) { |
| 251 | + previousVersion := version |
| 252 | + version = "0.1.28" |
| 253 | + t.Cleanup(func() { version = previousVersion }) |
| 254 | + |
| 255 | + for _, tt := range []struct { |
| 256 | + language string |
| 257 | + launcher string |
| 258 | + }{ |
| 259 | + {language: "typescript", launcher: "npm exec -- yskill"}, |
| 260 | + {language: "python", launcher: "python -m yieldskill"}, |
| 261 | + } { |
| 262 | + t.Run(tt.language, func(t *testing.T) { |
| 263 | + root := filepath.Join(t.TempDir(), "project with space") |
| 264 | + dir := filepath.Join(root, "skills", "safe-change") |
| 265 | + output := captureStdout(t, func() { |
| 266 | + if err := scaffoldSkill(dir, tt.language, "", "Check a safe change before applying it."); err != nil { |
| 267 | + t.Fatal(err) |
| 268 | + } |
| 269 | + }) |
| 270 | + workflow := shellQuoteForPlatform(dir, runtime.GOOS) |
| 271 | + for _, line := range []string{ |
| 272 | + "test: " + tt.launcher + " doctor " + workflow + " --test", |
| 273 | + "then: " + tt.launcher + " register " + workflow, |
| 274 | + } { |
| 275 | + if !strings.Contains(output, line) { |
| 276 | + t.Fatalf("init output does not contain %q:\n%s", line, output) |
| 277 | + } |
| 278 | + } |
| 279 | + }) |
| 280 | + } |
| 281 | +} |
| 282 | + |
| 283 | +func TestShellQuoteForPlatform(t *testing.T) { |
| 284 | + for _, tt := range []struct { |
| 285 | + name, value, goos, want string |
| 286 | + }{ |
| 287 | + {name: "relative", value: "skills/review", goos: "linux", want: "'skills/review'"}, |
| 288 | + {name: "explicit relative", value: "./skills/review", goos: "linux", want: "'./skills/review'"}, |
| 289 | + {name: "absolute", value: "/tmp/project/skills/review", goos: "linux", want: "'/tmp/project/skills/review'"}, |
| 290 | + {name: "nested with space", value: "workflows/team one/safe change's", goos: "linux", want: `'workflows/team one/safe change'"'"'s'`}, |
| 291 | + {name: "windows", value: `skills\safe change's`, goos: "windows", want: `'skills\safe change''s'`}, |
| 292 | + } { |
| 293 | + t.Run(tt.name, func(t *testing.T) { |
| 294 | + if got := shellQuoteForPlatform(tt.value, tt.goos); got != tt.want { |
| 295 | + t.Fatalf("quote = %q, want %q", got, tt.want) |
| 296 | + } |
| 297 | + }) |
| 298 | + } |
| 299 | +} |
| 300 | + |
| 301 | +func TestRustScaffoldNamesPrimaryBinary(t *testing.T) { |
| 302 | + previousVersion := version |
| 303 | + version = "0.1.28" |
| 304 | + t.Cleanup(func() { version = previousVersion }) |
| 305 | + dir := filepath.Join(t.TempDir(), "safe-change") |
| 306 | + if err := scaffoldSkill(dir, "rust", "", "Check a safe change before applying it."); err != nil { |
| 307 | + t.Fatal(err) |
| 308 | + } |
| 309 | + manifest := readTestFile(t, filepath.Join(dir, "skill.json")) |
| 310 | + if manifest != "{\"version\":1,\"language\":\"rust\",\"run\":[\"cargo\",\"run\",\"--quiet\",\"--bin\",\"safe-change\"]}\n" { |
| 311 | + t.Fatalf("skill.json = %q", manifest) |
| 312 | + } |
| 313 | +} |
| 314 | + |
| 315 | +func TestRustScaffoldRunsPrimaryBinaryWhenFixtureAddsAnotherBinary(t *testing.T) { |
| 316 | + if _, err := exec.LookPath("cargo"); err != nil { |
| 317 | + t.Skip("cargo is not installed") |
| 318 | + } |
| 319 | + dir := filepath.Join(t.TempDir(), "safe-change") |
| 320 | + if err := scaffoldSkill(dir, "rust", "", "Check a safe change before applying it."); err != nil { |
| 321 | + t.Fatal(err) |
| 322 | + } |
| 323 | + writeTestFile(t, filepath.Join(dir, "Cargo.toml"), "[package]\nname = \"safe-change\"\nversion = \"0.1.0\"\nedition = \"2021\"\n") |
| 324 | + writeTestFile(t, filepath.Join(dir, "src", "main.rs"), "fn main() { println!(\"workflow\"); }\n") |
| 325 | + writeTestFile(t, filepath.Join(dir, "src", "bin", "fixture-helper.rs"), "fn main() { println!(\"fixture\"); }\n") |
| 326 | + manifest, err := readSkillManifest(dir) |
| 327 | + if err != nil { |
| 328 | + t.Fatal(err) |
| 329 | + } |
| 330 | + cmd := exec.Command(manifest.Run[0], manifest.Run[1:]...) |
| 331 | + cmd.Dir = dir |
| 332 | + out, err := cmd.CombinedOutput() |
| 333 | + if err != nil { |
| 334 | + t.Fatalf("generated run command failed: %v\n%s", err, out) |
| 335 | + } |
| 336 | + if strings.TrimSpace(string(out)) != "workflow" { |
| 337 | + t.Fatalf("generated run command selected %q", out) |
| 338 | + } |
| 339 | +} |
| 340 | + |
247 | 341 | func TestGoScaffoldCanResolveItsPinnedModuleOnFirstRun(t *testing.T) { |
248 | 342 | previousVersion := version |
249 | 343 | previousTidyGoModule := tidyGoModule |
@@ -285,7 +379,7 @@ func TestLocalGoAndRustScaffoldsKeepTheInvokedRuntime(t *testing.T) { |
285 | 379 | } |
286 | 380 | skill := readTestFile(t, filepath.Join(dir, "SKILL.md")) |
287 | 381 | launcher := repositoryRuntimeLauncher(filepath.Join(".yield", "bin", filepath.Base(localRuntimePath(repo))), runtime.GOOS) |
288 | | - workflow := shellQuote("skills/safe-change") |
| 382 | + workflow := shellQuote(filepath.Join("skills", "safe-change")) |
289 | 383 | for _, command := range []string{ |
290 | 384 | launcher + " run " + workflow, |
291 | 385 | launcher + " respond <run-id> --value <answer> --skill " + workflow, |
|
0 commit comments