Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Generate tests correctly when headers are defined only on resource #1127

Merged
merged 3 commits into from Mar 17, 2017
Merged

Generate tests correctly when headers are defined only on resource #1127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d22bfd1
Add failing test for headers inside resource
matteosuppo Mar 17, 2017
a9ef94b
Avoid polluting the resource headers
matteosuppo Mar 17, 2017
772fb6c
Send the resource headers when generating tests
matteosuppo Mar 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion goagen/gen_app/generator.go
View file
Open in desktop
Expand Up @@ -144,7 +144,17 @@ func (g *Generator) generateContexts() error {
err = g.API.IterateResources(func(r *design.ResourceDefinition) error {
return r.IterateActions(func(a *design.ActionDefinition) error {
ctxName := codegen.Goify(a.Name, true) + codegen.Goify(a.Parent.Name, true) + "Context"
headers := r.Headers.Merge(a.Headers)
headers := &design.AttributeDefinition{
Type: design.Object{},
}
if r.Headers != nil {
headers.Merge(r.Headers)
headers.Validation = r.Headers.Validation
}
if a.Headers != nil {
headers.Merge(a.Headers)
headers.Validation = a.Headers.Validation
}
if headers != nil && len(headers.Type.ToObject()) == 0 {
headers = nil // So that {{if .Headers}} returns false in templates
}
Expand Down
17 changes: 14 additions & 3 deletions goagen/gen_app/test_generator.go
View file
Open in desktop
Expand Up @@ -201,7 +201,7 @@ func (g *Generator) createTestMethod(resource *design.ResourceDefinition, action

path = pathParams(action, route)
query = queryParams(action)
header = headers(action)
header = headers(action, resource.Headers)

if action.Payload != nil {
payload = &ObjectType{}
Expand Down Expand Up @@ -245,8 +245,19 @@ func pathParams(action *design.ActionDefinition, route *design.RouteDefinition)

// headers builds the template data structure needed to proprely render the code
// for setting the headers for the given action.
func headers(action *design.ActionDefinition) []*ObjectType {
hds := action.Headers
func headers(action *design.ActionDefinition, headers *design.AttributeDefinition) []*ObjectType {
hds := &design.AttributeDefinition{
Type: design.Object{},
}
if headers != nil {
hds.Merge(headers)
hds.Validation = headers.Validation
}
if action.Headers != nil {
hds.Merge(action.Headers)
hds.Validation = action.Headers.Validation
}

if hds == nil {
return nil
}
Expand Down
14 changes: 12 additions & 2 deletions goagen/gen_app/test_generator_test.go
View file
Open in desktop
Expand Up @@ -93,6 +93,13 @@ var _ = Describe("Generate", func() {
Resources: map[string]*design.ResourceDefinition{
"foo": {
Name: "foo",
Headers: &design.AttributeDefinition{
Type: design.Object{
"optionalResourceHeader": &design.AttributeDefinition{Type: design.Integer},
"requiredResourceHeader": &design.AttributeDefinition{Type: design.String},
},
Validation: &dslengine.ValidationDefinition{Required: []string{"requiredResourceHeader"}},
},
Actions: map[string]*design.ActionDefinition{
"show": {
Name: "show",
Expand All @@ -112,7 +119,7 @@ var _ = Describe("Generate", func() {
"optionalHeader": &design.AttributeDefinition{Type: design.Integer},
"requiredHeader": &design.AttributeDefinition{Type: design.String},
},
Validation: &dslengine.ValidationDefinition{Required: []string{"requiredHeader"}},
Validation: &dslengine.ValidationDefinition{Required: []string{"requiredHeader", "requiredResourceHeader"}},
},
QueryParams: &design.AttributeDefinition{
Type: design.Object{
Expand Down Expand Up @@ -194,7 +201,7 @@ var _ = Describe("Generate", func() {
// Multiple Routes
Ω(content).Should(ContainSubstring("ShowFooOK1("))
// Get returns an error media type
Ω(content).Should(ContainSubstring("GetFooOK(t goatest.TInterface, ctx context.Context, service *goa.Service, ctrl app.FooController, payload app.CustomName) (http.ResponseWriter, error)"))
Ω(content).Should(ContainSubstring("GetFooOK(t goatest.TInterface, ctx context.Context, service *goa.Service, ctrl app.FooController, optionalResourceHeader *int, requiredResourceHeader string, payload app.CustomName) (http.ResponseWriter, error)"))
})

It("generates the route path parameters", func() {
Expand Down Expand Up @@ -223,6 +230,9 @@ var _ = Describe("Generate", func() {
Ω(content).Should(ContainSubstring(`if optionalHeader != nil`))
Ω(content).ShouldNot(ContainSubstring(`if requiredHeader != nil`))
Ω(content).Should(ContainSubstring(`req.Header["requiredHeader"] = sliceVal`))
Ω(content).Should(ContainSubstring(`if optionalResourceHeader != nil`))
Ω(content).ShouldNot(ContainSubstring(`if requiredResourceHeader != nil`))
Ω(content).Should(ContainSubstring(`req.Header["requiredResourceHeader"] = sliceVal`))
})

It("generates calls to new Context ", func() {
Expand Down