cws
/
catbase
mirror of https://github.com/velour/catbase.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #41 from velour/tea-bug 

Fixed error in Tea. Earl Grey. Hot. regex, updated tests.
This commit is contained in:
Chris Sexton 2017-02-20 16:48:56 -05:00 committed by GitHub
parent 4f7908370f 39d5dec694
commit b0210fd240
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/counter/counter.go
View File

@ -136,7 +136,7 @@ func (p *CounterPlugin) Message(message msg.Message) bool {
return false return false
} }
if tea, _ := regexp.MatchString("(?i)^tea\\. [0-9A-Za-z_ ]*\\. (hot)|(iced)\\.?$", message.Body); tea { if tea, _ := regexp.MatchString("(?i)^tea\\. [0-9A-Za-z_ ]*\\. ((hot)|(iced))\\.?$", message.Body); tea {
item, err := GetItem(p.DB, nick, ":tea:") item, err := GetItem(p.DB, nick, ":tea:")
if err != nil { if err != nil {
log.Printf("Error finding item %s.%s: %s.", nick, ":tea:", err) log.Printf("Error finding item %s.%s: %s.", nick, ":tea:", err)

16
plugins/counter/counter_test.go
View File

@ -32,7 +32,7 @@ func TestTeaEarlGreyHot(t *testing.T) {
assert.NotNil(t, c) assert.NotNil(t, c)
c.Message(makeMessage("Tea. Earl Grey. Hot.")) c.Message(makeMessage("Tea. Earl Grey. Hot."))
c.Message(makeMessage("Tea. Earl Grey. Hot.")) c.Message(makeMessage("Tea. Earl Grey. Hot."))
item, err := GetItem(mb.DB(), "tester", "🍵") item, err := GetItem(mb.DB(), "tester", ":tea:")
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, 2, item.Count) assert.Equal(t, 2, item.Count)
} }
@ -44,7 +44,7 @@ func TestTeaGreenHot(t *testing.T) {
c.Message(makeMessage("Tea. Green. Hot.")) c.Message(makeMessage("Tea. Green. Hot."))
c.Message(makeMessage("Tea. Green. Hot")) c.Message(makeMessage("Tea. Green. Hot"))
c.Message(makeMessage("Tea. Green. Iced.")) c.Message(makeMessage("Tea. Green. Iced."))
item, err := GetItem(mb.DB(), "tester", "🍵") item, err := GetItem(mb.DB(), "tester", ":tea:")
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, 3, item.Count) assert.Equal(t, 3, item.Count)
} }
@ -55,7 +55,17 @@ func TestTeaUnrelated(t *testing.T) {
assert.NotNil(t, c) assert.NotNil(t, c)
c.Message(makeMessage("Tea.")) c.Message(makeMessage("Tea."))
c.Message(makeMessage("Tea. It's great.")) c.Message(makeMessage("Tea. It's great."))
item, err := GetItem(mb.DB(), "tester", "🍵") item, err := GetItem(mb.DB(), "tester", ":tea:")
assert.Nil(t, err)
assert.Equal(t, 0, item.Count)
}
func TestTeaSkieselQuote(t *testing.T) {
mb := bot.NewMockBot()
c := New(mb)
assert.NotNil(t, c)
c.Message(makeMessage("blah, this is a whole page of explanation where \"we did local search and used a tabu list\" would have sufficed"))
item, err := GetItem(mb.DB(), "tester", ":tea:")
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, 0, item.Count) assert.Equal(t, 0, item.Count)
} }