Make sure empty Swagger base paths is keyed by / (#1287)

goadesign · Jun 28, 2017 · 4c3d4d9 · 4c3d4d9
1 parent 4786baf
commit 4c3d4d9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/goagen/gen_swagger/swagger.go b/goagen/gen_swagger/swagger.go
@@ -958,9 +958,6 @@ func buildPathFromDefinition(s *Swagger, api *design.APIDefinition, route *desig
 			return fmt.Sprintf("/{%s}", w[2:])
 		},
 	)
-	if key == "" {
-		key = "/"
-	}
 	bp := design.WildcardRegex.ReplaceAllStringFunc(
 		basePath,
 		func(w string) string {
@@ -970,6 +967,9 @@ func buildPathFromDefinition(s *Swagger, api *design.APIDefinition, route *desig
 	if bp != "/" {
 		key = strings.TrimPrefix(key, bp)
 	}
+	if key == "" {
+		key = "/"
+	}
 	var path interface{}
 	var ok bool
 	if path, ok = s.Paths[key]; !ok {

diff --git a/goagen/gen_swagger/swagger_test.go b/goagen/gen_swagger/swagger_test.go
@@ -655,7 +655,7 @@ var _ = Describe("New", func() {
 			})
 
 			It("should set the action tags", func() {
-				p := swagger.Paths[""].(*genswagger.Path)
+				p := swagger.Paths["/"].(*genswagger.Path)
 				Ω(p.Put.Tags).Should(HaveLen(2))
 				tags := []string{"res", "Update"}
 				Ω(p.Put.Tags).Should(Equal(tags))
@@ -664,7 +664,7 @@ var _ = Describe("New", func() {
 			It("should set the swagger extensions", func() {
 				Ω(swagger.Info.Extensions).Should(HaveLen(1))
 				Ω(swagger.Info.Extensions["x-api"]).Should(Equal(unmarshaled))
-				p := swagger.Paths[""].(*genswagger.Path)
+				p := swagger.Paths["/"].(*genswagger.Path)
 				Ω(p.Extensions).Should(HaveLen(1))
 				Ω(p.Extensions["x-action"]).Should(Equal(unmarshaled))
 				Ω(p.Put.Extensions).Should(HaveLen(1))