Skip to content

Commit f91e081

Browse files
authored
Merge pull request #37 from elvinchan/36
#36 Allow same Tag for API groups
2 parents 498f237 + de47849 commit f91e081

File tree

3 files changed

+4
-16
lines changed

3 files changed

+4
-16
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: go
22

33
go:
4-
- 1.9.x
5-
- 1.10.x
64
- 1.11.x
5+
- 1.12.x
6+
- 1.13.x
77
- tip
88

99
before_install:

wrapper.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -277,18 +277,6 @@ func (r *Root) Group(name, prefix string, m ...echo.MiddlewareFunc) ApiGroup {
277277
defs: r.defs,
278278
},
279279
}
280-
var counter int
281-
LoopTags:
282-
for _, t := range r.groups {
283-
if t.tag.Name == name {
284-
if counter > 0 {
285-
name = name[:len(name)-2]
286-
}
287-
counter++
288-
name += "_" + strconv.Itoa(counter)
289-
goto LoopTags
290-
}
291-
}
292280
group.tag = Tag{Name: name}
293281
r.groups = append(r.groups, group)
294282
return &r.groups[len(r.groups)-1]

wrapper_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ func TestGroup(t *testing.T) {
144144

145145
t.Run("Repeat name", func(t *testing.T) {
146146
ga := r.Group("Users", "users")
147-
assert.Equal(t, ga.(*group).tag.Name, "Users_1")
147+
assert.Equal(t, ga.(*group).tag.Name, "Users")
148148

149149
gb := r.Group("Users", "users")
150-
assert.Equal(t, gb.(*group).tag.Name, "Users_2")
150+
assert.Equal(t, gb.(*group).tag.Name, "Users")
151151
})
152152
}
153153

0 commit comments

Comments
 (0)