diff options
| author | hmhealey <harrisonmhealey@gmail.com> | 2015-10-05 12:03:27 -0400 |
|---|---|---|
| committer | hmhealey <harrisonmhealey@gmail.com> | 2015-10-13 09:42:25 -0400 |
| commit | 599644fb2fa75d1760420806c8c821959fc6b645 (patch) | |
| tree | bd45794907dade690e9adc51736dc8797c79a3f5 /api | |
| parent | 415f959614f6a3fd7fcb6551e32b722df2b015c5 (diff) | |
| download | chat-599644fb2fa75d1760420806c8c821959fc6b645.tar.gz chat-599644fb2fa75d1760420806c8c821959fc6b645.tar.bz2 chat-599644fb2fa75d1760420806c8c821959fc6b645.zip | |
Renamed show_hide preference to show
Diffstat (limited to 'api')
| -rw-r--r-- | api/preference_test.go | 16 | ||||
| -rw-r--r-- | api/user.go | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/api/preference_test.go b/api/preference_test.go index 63aaeaf3e..d4046cc6e 100644 --- a/api/preference_test.go +++ b/api/preference_test.go @@ -27,7 +27,7 @@ func TestSetPreferences(t *testing.T) { preference := model.Preference{ UserId: user1.Id, Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, - Name: model.PREFERENCE_NAME_SHOWHIDE, + Name: model.PREFERENCE_NAME_SHOW, AltId: model.NewId(), } preferences = append(preferences, &preference) @@ -74,13 +74,13 @@ func TestGetPreferencesByName(t *testing.T) { &model.Preference{ UserId: user1.Id, Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, - Name: model.PREFERENCE_NAME_SHOWHIDE, + Name: model.PREFERENCE_NAME_SHOW, AltId: model.NewId(), }, &model.Preference{ UserId: user1.Id, Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, - Name: model.PREFERENCE_NAME_SHOWHIDE, + Name: model.PREFERENCE_NAME_SHOW, AltId: model.NewId(), }, &model.Preference{ @@ -92,7 +92,7 @@ func TestGetPreferencesByName(t *testing.T) { &model.Preference{ UserId: user1.Id, Category: model.PREFERENCE_CATEGORY_TEST, - Name: model.PREFERENCE_NAME_SHOWHIDE, + Name: model.PREFERENCE_NAME_SHOW, AltId: model.NewId(), }, } @@ -101,7 +101,7 @@ func TestGetPreferencesByName(t *testing.T) { &model.Preference{ UserId: user2.Id, Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, - Name: model.PREFERENCE_NAME_SHOWHIDE, + Name: model.PREFERENCE_NAME_SHOW, AltId: model.NewId(), }, } @@ -114,7 +114,7 @@ func TestGetPreferencesByName(t *testing.T) { Client.LoginByEmail(team.Name, user1.Email, "pwd") - if result, err := Client.GetPreferencesByName(model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, model.PREFERENCE_NAME_SHOWHIDE); err != nil { + if result, err := Client.GetPreferencesByName(model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, model.PREFERENCE_NAME_SHOW); err != nil { t.Fatal(err) } else if data := result.Data.([]*model.Preference); len(data) != 2 { t.Fatal("received the wrong number of preferences") @@ -124,7 +124,7 @@ func TestGetPreferencesByName(t *testing.T) { Client.LoginByEmail(team.Name, user2.Email, "pwd") - if result, err := Client.GetPreferencesByName(model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, model.PREFERENCE_NAME_SHOWHIDE); err != nil { + if result, err := Client.GetPreferencesByName(model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, model.PREFERENCE_NAME_SHOW); err != nil { t.Fatal(err) } else if data := result.Data.([]*model.Preference); len(data) != 1 { t.Fatal("received the wrong number of preferences") @@ -148,7 +148,7 @@ func TestSetAndGetProperties(t *testing.T) { p := model.Preference{ UserId: user.Id, Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, - Name: model.PREFERENCE_NAME_SHOWHIDE, + Name: model.PREFERENCE_NAME_SHOW, AltId: model.NewId(), Value: model.NewId(), } diff --git a/api/user.go b/api/user.go index e8e206ad3..b769a2912 100644 --- a/api/user.go +++ b/api/user.go @@ -242,7 +242,7 @@ func fireAndForgetAddDirectChannels(user *model.User, team *model.Team) { preference := &model.Preference{ UserId: user.Id, Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, - Name: model.PREFERENCE_NAME_SHOWHIDE, + Name: model.PREFERENCE_NAME_SHOW, AltId: profile.Id, Value: "true", } |