diff options
| author | Jack <jackdeng@gmail.com> | 2015-09-22 08:16:51 -0700 |
|---|---|---|
| committer | Jack <jackdeng@gmail.com> | 2015-09-22 08:16:51 -0700 |
| commit | 602bed85f2b32733f73e2edddb542fa36baac462 (patch) | |
| tree | 06a6ee9b609a9122bc2f0e6f6e6300f9ba79a3aa /api/channel_test.go | |
| parent | a31868336f97a91bfd5a7e91e99a9b294d131f90 (diff) | |
| parent | f439c82d7c885b4c530ba9da0a41b17910743b55 (diff) | |
| download | chat-602bed85f2b32733f73e2edddb542fa36baac462.tar.gz chat-602bed85f2b32733f73e2edddb542fa36baac462.tar.bz2 chat-602bed85f2b32733f73e2edddb542fa36baac462.zip | |
fix conflict
Diffstat (limited to 'api/channel_test.go')
| -rw-r--r-- | api/channel_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/channel_test.go b/api/channel_test.go index 7e9267192..14bfe1cf7 100644 --- a/api/channel_test.go +++ b/api/channel_test.go @@ -57,7 +57,7 @@ func TestCreateChannel(t *testing.T) { rchannel.Data.(*model.Channel).Id = "" if _, err := Client.CreateChannel(rchannel.Data.(*model.Channel)); err != nil { - if err.Message != "A channel with that handle already exists" { + if err.Message != "A channel with that URL already exists" { t.Fatal(err) } } @@ -68,7 +68,7 @@ func TestCreateChannel(t *testing.T) { Client.DeleteChannel(savedId) if _, err := Client.CreateChannel(rchannel.Data.(*model.Channel)); err != nil { - if err.Message != "A channel with that handle was previously created" { + if err.Message != "A channel with that URL was previously created" { t.Fatal(err) } } |