Skip to content

Commit 0ee8bf4

Browse files
committed
refactor(docs): update generated code and golden files
1 parent 80a9a88 commit 0ee8bf4

2 files changed

Lines changed: 30 additions & 65 deletions

File tree

.gitignore

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,33 @@
1313

1414
*.swp
1515
.vscode/*
16+
17+
*.out
18+
*.test
19+
gengoalint
20+
21+
# OS generated files
22+
.DS_Store
23+
.DS_Store?
24+
._*
25+
.Spotlight-V100
26+
.Trashes
27+
ehthumbs.db
28+
Thumbs.db
29+
30+
# Binaries for programs and plugins
31+
*.so
32+
*.so.*
33+
*.a
34+
*.dll
35+
*.exe
36+
*.exe~
37+
*.test
38+
*.out
39+
*.log
40+
41+
# vendored dependencies
42+
vendor/
43+
44+
# protoc
45+
protoc-*/

docs/generate_test.go

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -292,71 +292,6 @@ func TestJSONTagsAndInlineRefs_Complex(t *testing.T) {
292292
}
293293
}
294294

295-
func TestInlineRefs_MethodRootPayloadResult(t *testing.T) {
296-
t.Cleanup(func() { plugexpr.Root.UseJSONTags = false; plugexpr.Root.InlineRefs = false })
297-
298-
docsMap := genDocs(t, func() {
299-
InlineRefs()
300-
API("Test", func() {})
301-
var PayloadType = Type("PayloadType", func() {
302-
Field(1, "Foo", String)
303-
Required("Foo")
304-
})
305-
var ResultType = Type("ResultType", func() {
306-
Field(1, "Bar", String)
307-
Required("Bar")
308-
})
309-
Service("S", func() {
310-
Method("M1", func() {
311-
Payload(PayloadType)
312-
Result(ResultType)
313-
HTTP(func() { GET("/") })
314-
GRPC(func() {})
315-
})
316-
})
317-
})
318-
319-
svc := docsMap["services"].(map[string]any)["S"].(map[string]any)
320-
methods := svc["methods"].(map[string]any)
321-
m1 := methods["M1"].(map[string]any)
322-
pt := m1["payload"].(map[string]any)["type"].(map[string]any)
323-
if _, hasRef := pt["$ref"]; hasRef {
324-
t.Fatalf("expected inlined payload schema at method root, found $ref: %#v", pt)
325-
}
326-
rt := m1["result"].(map[string]any)["type"].(map[string]any)
327-
if _, hasRef := rt["$ref"]; hasRef {
328-
t.Fatalf("expected inlined result schema at method root, found $ref: %#v", rt)
329-
}
330-
}
331-
332-
func TestInlineRefs_CrossPackage(t *testing.T) {
333-
t.Cleanup(func() { plugexpr.Root.UseJSONTags = false; plugexpr.Root.InlineRefs = false })
334-
docsMap := genDocs(t, func() {
335-
InlineRefs()
336-
API("Test", func() {})
337-
// Service "S1" uses a type from a different package.
338-
Service("S1", func() {
339-
Method("M1", func() {
340-
Payload(testdata.CrossPackageType)
341-
HTTP(func() { GET("/") })
342-
GRPC(func() {})
343-
})
344-
})
345-
})
346-
347-
svc := docsMap["services"].(map[string]any)["S1"].(map[string]any)
348-
methods := svc["methods"].(map[string]any)
349-
m1 := methods["M1"].(map[string]any)
350-
pt := m1["payload"].(map[string]any)["type"].(map[string]any)
351-
if _, hasRef := pt["$ref"]; hasRef {
352-
t.Fatalf("expected inlined payload schema for cross-package type, found $ref: %#v", pt)
353-
}
354-
assert.Equal(t, "object", pt["type"])
355-
props := pt["properties"].(map[string]any)
356-
_, hasA := props["A"]
357-
assert.True(t, hasA)
358-
}
359-
360295
func TestInlineRefs_CrossService(t *testing.T) {
361296
t.Cleanup(func() { plugexpr.Root.UseJSONTags = false; plugexpr.Root.InlineRefs = false })
362297
docsMap := genDocs(t, func() {

0 commit comments

Comments
 (0)