From 5832232b6d3d79023204d357b0de33eff9e00370 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Mon, 5 Oct 2015 13:50:54 -0400 Subject: Fixed preference tests --- api/preference_test.go | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/api/preference_test.go b/api/preference_test.go index d4046cc6e..77562bb06 100644 --- a/api/preference_test.go +++ b/api/preference_test.go @@ -51,6 +51,8 @@ func TestSetPreferences(t *testing.T) { user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + Client.LoginByEmail(team.Name, user2.Email, "pwd") + if _, err := Client.SetPreferences(preferences); err == nil { t.Fatal("shouldn't have been able to update another user's preferences") } @@ -71,25 +73,25 @@ func TestGetPreferencesByName(t *testing.T) { store.Must(Srv.Store.User().VerifyEmail(user2.Id)) preferences1 := []*model.Preference{ - &model.Preference{ + { UserId: user1.Id, Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, Name: model.PREFERENCE_NAME_SHOW, AltId: model.NewId(), }, - &model.Preference{ + { UserId: user1.Id, Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, Name: model.PREFERENCE_NAME_SHOW, AltId: model.NewId(), }, - &model.Preference{ + { UserId: user1.Id, Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, Name: model.PREFERENCE_NAME_TEST, AltId: model.NewId(), }, - &model.Preference{ + { UserId: user1.Id, Category: model.PREFERENCE_CATEGORY_TEST, Name: model.PREFERENCE_NAME_SHOW, @@ -97,21 +99,9 @@ func TestGetPreferencesByName(t *testing.T) { }, } - preferences2 := []*model.Preference{ - &model.Preference{ - UserId: user2.Id, - Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, - Name: model.PREFERENCE_NAME_SHOW, - AltId: model.NewId(), - }, - } - Client.LoginByEmail(team.Name, user1.Email, "pwd") Client.Must(Client.SetPreferences(preferences1)) - Client.LoginByEmail(team.Name, user2.Email, "pwd") - Client.Must(Client.SetPreferences(preferences2)) - Client.LoginByEmail(team.Name, user1.Email, "pwd") if result, err := Client.GetPreferencesByName(model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, model.PREFERENCE_NAME_SHOW); err != nil { @@ -124,12 +114,11 @@ func TestGetPreferencesByName(t *testing.T) { Client.LoginByEmail(team.Name, user2.Email, "pwd") + // note that user2 will start with a preference to show user1 in the sidebar by default 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") - } else if *data[0] != *preferences2[0] { - t.Fatal("received incorrect preference") } } -- cgit v1.2.3-1-g7c22