1 files changed, 76 insertions, 3 deletions

diff --git a/store/sql_channel_store_test.go b/store/sql_channel_store_test.go
index 3cc6f3bc4..ed99575c2 100644
--- a/store/sql_channel_store_test.go
+++ b/store/sql_channel_store_test.go
@@ -149,10 +149,14 @@ func TestChannelStoreUpdate(t *testing.T) {
 	o1.DisplayName = "Name"
 	o1.Name = "a" + model.NewId() + "b"
 	o1.Type = model.CHANNEL_OPEN
+	Must(store.Channel().Save(&o1))
 
-	if err := (<-store.Channel().Save(&o1)).Err; err != nil {
-		t.Fatal(err)
-	}
+	o2 := model.Channel{}
+	o2.TeamId = o1.TeamId
+	o2.DisplayName = "Name"
+	o2.Name = "a" + model.NewId() + "b"
+	o2.Type = model.CHANNEL_OPEN
+	Must(store.Channel().Save(&o2))
 
 	time.Sleep(100 * time.Millisecond)
 
@@ -169,6 +173,11 @@ func TestChannelStoreUpdate(t *testing.T) {
 	if err := (<-store.Channel().Update(&o1)).Err; err == nil {
 		t.Fatal("Update should have faile because id change")
 	}
+
+	o2.Name = o1.Name
+	if err := (<-store.Channel().Update(&o2)).Err; err == nil {
+		t.Fatal("Update should have failed because of existing name")
+	}
 }
 
 func TestGetChannelUnread(t *testing.T) {
@@ -321,6 +330,15 @@ func TestChannelStoreGet(t *testing.T) {
 			t.Fatal("too little")
 		}
 	}
+
+	if r3 := <-store.Channel().GetTeamChannels(o1.TeamId); r3.Err != nil {
+		t.Fatal(r3.Err)
+	} else {
+		channels := r3.Data.(*model.ChannelList)
+		if len(*channels) == 0 {
+			t.Fatal("too little")
+		}
+	}
 }
 
 func TestChannelStoreGetForPost(t *testing.T) {
@@ -422,6 +440,10 @@ func TestChannelStoreDelete(t *testing.T) {
 	if cresult.Err.Id != "store.sql_channel.get_channels.not_found.app_error" {
 		t.Fatal("no channels should be found")
 	}
+
+	if r := <-store.Channel().PermanentDeleteByTeam(o1.TeamId); r.Err != nil {
+		t.Fatal(r.Err)
+	}
 }
 
 func TestChannelStoreGetByName(t *testing.T) {
@@ -1173,6 +1195,37 @@ func TestChannelStoreIncrementMentionCount(t *testing.T) {
 	}
 }
 
+func TestUpdateChannelMember(t *testing.T) {
+	Setup()
+
+	userId := model.NewId()
+
+	c1 := &model.Channel{
+		TeamId:      model.NewId(),
+		DisplayName: model.NewId(),
+		Name:        model.NewId(),
+		Type:        model.CHANNEL_OPEN,
+	}
+	Must(store.Channel().Save(c1))
+
+	m1 := &model.ChannelMember{
+		ChannelId:   c1.Id,
+		UserId:      userId,
+		NotifyProps: model.GetDefaultChannelNotifyProps(),
+	}
+	Must(store.Channel().SaveMember(m1))
+
+	m1.NotifyProps["test"] = "sometext"
+	if result := <-store.Channel().UpdateMember(m1); result.Err != nil {
+		t.Fatal(result.Err)
+	}
+
+	m1.UserId = ""
+	if result := <-store.Channel().UpdateMember(m1); result.Err == nil {
+		t.Fatal("bad user id - should fail")
+	}
+}
+
 func TestGetMember(t *testing.T) {
 	Setup()
 
@@ -1231,6 +1284,26 @@ func TestGetMember(t *testing.T) {
 	} else if member.UserId != userId {
 		t.Fatal("should've gotten member for user")
 	}
+
+	if result := <-store.Channel().GetAllChannelMembersNotifyPropsForChannel(c2.Id, false); result.Err != nil {
+		t.Fatal(result.Err)
+	} else {
+		props := result.Data.(map[string]model.StringMap)
+		if len(props) == 0 {
+			t.Fatal("should not be empty")
+		}
+	}
+
+	if result := <-store.Channel().GetAllChannelMembersNotifyPropsForChannel(c2.Id, true); result.Err != nil {
+		t.Fatal(result.Err)
+	} else {
+		props := result.Data.(map[string]model.StringMap)
+		if len(props) == 0 {
+			t.Fatal("should not be empty")
+		}
+	}
+
+	store.Channel().InvalidateCacheForChannelMembersNotifyProps(c2.Id)
 }
 
 func TestChannelStoreGetMemberForPost(t *testing.T) {