Renamed Channel.Description to Channel.Header on the server

Этот коммит содержится в:
hmhealey
2015-10-26 16:18:28 -04:00
родитель 95c464b167
Коммит 09b38404fa
8 изменённых файлов: 64 добавлений и 61 удалений

Просмотреть файл

@@ -173,12 +173,12 @@ func TestUpdateChannel(t *testing.T) {
Client.AddChannelMember(channel1.Id, userTeamAdmin.Id)
desc := "a" + model.NewId() + "a"
upChannel1 := &model.Channel{Id: channel1.Id, Description: desc}
header := "a" + model.NewId() + "a"
upChannel1 := &model.Channel{Id: channel1.Id, Header: header}
upChannel1 = Client.Must(Client.UpdateChannel(upChannel1)).Data.(*model.Channel)
if upChannel1.Description != desc {
t.Fatal("Channel admin failed to update desc")
if upChannel1.Header != header {
t.Fatal("Channel admin failed to update header")
}
if upChannel1.DisplayName != channel1.DisplayName {
@@ -187,12 +187,12 @@ func TestUpdateChannel(t *testing.T) {
Client.LoginByEmail(team.Name, userTeamAdmin.Email, "pwd")
desc = "b" + model.NewId() + "b"
upChannel1 = &model.Channel{Id: channel1.Id, Description: desc}
header = "b" + model.NewId() + "b"
upChannel1 = &model.Channel{Id: channel1.Id, Header: header}
upChannel1 = Client.Must(Client.UpdateChannel(upChannel1)).Data.(*model.Channel)
if upChannel1.Description != desc {
t.Fatal("Team admin failed to update desc")
if upChannel1.Header != header {
t.Fatal("Team admin failed to update header")
}
if upChannel1.DisplayName != channel1.DisplayName {
@@ -203,7 +203,7 @@ func TestUpdateChannel(t *testing.T) {
data := rget.Data.(*model.ChannelList)
for _, c := range data.Channels {
if c.Name == model.DEFAULT_CHANNEL {
c.Description = "new desc"
c.Header = "new header"
if _, err := Client.UpdateChannel(c); err == nil {
t.Fatal("should have errored on updating default channel")
}
@@ -218,7 +218,7 @@ func TestUpdateChannel(t *testing.T) {
}
}
func TestUpdateChannelDesc(t *testing.T) {
func TestUpdateChannelHeader(t *testing.T) {
Setup()
team := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN}
@@ -235,36 +235,36 @@ func TestUpdateChannelDesc(t *testing.T) {
data := make(map[string]string)
data["channel_id"] = channel1.Id
data["channel_description"] = "new desc"
data["channel_header"] = "new header"
var upChannel1 *model.Channel
if result, err := Client.UpdateChannelDesc(data); err != nil {
if result, err := Client.UpdateChannelHeader(data); err != nil {
t.Fatal(err)
} else {
upChannel1 = result.Data.(*model.Channel)
}
if upChannel1.Description != data["channel_description"] {
t.Fatal("Failed to update desc")
if upChannel1.Header != data["channel_header"] {
t.Fatal("Failed to update header")
}
data["channel_id"] = "junk"
if _, err := Client.UpdateChannelDesc(data); err == nil {
if _, err := Client.UpdateChannelHeader(data); err == nil {
t.Fatal("should have errored on junk channel id")
}
data["channel_id"] = "12345678901234567890123456"
if _, err := Client.UpdateChannelDesc(data); err == nil {
if _, err := Client.UpdateChannelHeader(data); err == nil {
t.Fatal("should have errored on non-existent channel id")
}
data["channel_id"] = channel1.Id
data["channel_description"] = ""
data["channel_header"] = ""
for i := 0; i < 1050; i++ {
data["channel_description"] += "a"
data["channel_header"] += "a"
}
if _, err := Client.UpdateChannelDesc(data); err == nil {
t.Fatal("should have errored on bad channel desc")
if _, err := Client.UpdateChannelHeader(data); err == nil {
t.Fatal("should have errored on bad channel header")
}
user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", Nickname: "Corey Hulen", Password: "pwd"}
@@ -274,9 +274,9 @@ func TestUpdateChannelDesc(t *testing.T) {
Client.LoginByEmail(team.Name, user2.Email, "pwd")
data["channel_id"] = channel1.Id
data["channel_description"] = "new desc"
if _, err := Client.UpdateChannelDesc(data); err == nil {
t.Fatal("should have errored non-channel member trying to update desc")
data["channel_header"] = "new header"
if _, err := Client.UpdateChannelHeader(data); err == nil {
t.Fatal("should have errored non-channel member trying to update header")
}
}