From a087403e9f25373d5bdea5e10fafb0c5d496a703 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Thu, 1 Oct 2015 15:22:04 -0400 Subject: Added api to get and set preferences --- api/preference_test.go | 176 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) create mode 100644 api/preference_test.go (limited to 'api/preference_test.go') diff --git a/api/preference_test.go b/api/preference_test.go new file mode 100644 index 000000000..63aaeaf3e --- /dev/null +++ b/api/preference_test.go @@ -0,0 +1,176 @@ +// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. +// See License.txt for license information. + +package api + +import ( + "github.com/mattermost/platform/model" + "github.com/mattermost/platform/store" + "testing" +) + +func TestSetPreferences(t *testing.T) { + Setup() + + team := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN} + team = Client.Must(Client.CreateTeam(team)).Data.(*model.Team) + + user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", Nickname: "Corey Hulen", Password: "pwd"} + user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) + store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + + Client.LoginByEmail(team.Name, user1.Email, "pwd") + + // save 10 preferences + var preferences []*model.Preference + for i := 0; i < 10; i++ { + preference := model.Preference{ + UserId: user1.Id, + Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, + Name: model.PREFERENCE_NAME_SHOWHIDE, + AltId: model.NewId(), + } + preferences = append(preferences, &preference) + } + + if _, err := Client.SetPreferences(preferences); err != nil { + t.Fatal(err) + } + + // update 10 preferences + for _, preference := range preferences { + preference.Value = "1234garbage" + } + + if _, err := Client.SetPreferences(preferences); err != nil { + t.Fatal(err) + } + + // not able to update as a different user + user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", Nickname: "Corey Hulen", Password: "pwd"} + user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) + store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + + if _, err := Client.SetPreferences(preferences); err == nil { + t.Fatal("shouldn't have been able to update another user's preferences") + } +} + +func TestGetPreferencesByName(t *testing.T) { + Setup() + + team := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN} + team = Client.Must(Client.CreateTeam(team)).Data.(*model.Team) + + user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", Nickname: "Corey Hulen", Password: "pwd"} + user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) + store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + + user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", Nickname: "Corey Hulen", Password: "pwd"} + user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) + 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_SHOWHIDE, + AltId: model.NewId(), + }, + &model.Preference{ + UserId: user1.Id, + Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, + Name: model.PREFERENCE_NAME_SHOWHIDE, + 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_SHOWHIDE, + AltId: model.NewId(), + }, + } + + preferences2 := []*model.Preference{ + &model.Preference{ + UserId: user2.Id, + Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, + Name: model.PREFERENCE_NAME_SHOWHIDE, + 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_SHOWHIDE); err != nil { + t.Fatal(err) + } else if data := result.Data.([]*model.Preference); len(data) != 2 { + t.Fatal("received the wrong number of preferences") + } else if !((*data[0] == *preferences1[0] && *data[1] == *preferences1[1]) || (*data[0] == *preferences1[1] && *data[1] == *preferences1[0])) { + t.Fatal("received incorrect preferences") + } + + Client.LoginByEmail(team.Name, user2.Email, "pwd") + + if result, err := Client.GetPreferencesByName(model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, model.PREFERENCE_NAME_SHOWHIDE); 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") + } +} + +func TestSetAndGetProperties(t *testing.T) { + Setup() + + team := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN} + team = Client.Must(Client.CreateTeam(team)).Data.(*model.Team) + + user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", Nickname: "Corey Hulen", Password: "pwd"} + user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User) + store.Must(Srv.Store.User().VerifyEmail(user.Id)) + + Client.LoginByEmail(team.Name, user.Email, "pwd") + + p := model.Preference{ + UserId: user.Id, + Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, + Name: model.PREFERENCE_NAME_SHOWHIDE, + AltId: model.NewId(), + Value: model.NewId(), + } + + Client.Must(Client.SetPreferences([]*model.Preference{&p})) + + if result, err := Client.GetPreferencesByName(p.Category, p.Name); err != nil { + t.Fatal(err) + } else if data := result.Data.([]*model.Preference); len(data) != 1 { + t.Fatal("received too many preferences") + } else if *data[0] != p { + t.Fatal("preference saved incorrectly") + } + + p.Value = model.NewId() + Client.Must(Client.SetPreferences([]*model.Preference{&p})) + + if result, err := Client.GetPreferencesByName(p.Category, p.Name); err != nil { + t.Fatal(err) + } else if data := result.Data.([]*model.Preference); len(data) != 1 { + t.Fatal("received too many preferences") + } else if *data[0] != p { + t.Fatal("preference updated incorrectly") + } +} -- cgit v1.2.3-1-g7c22 From 599644fb2fa75d1760420806c8c821959fc6b645 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Mon, 5 Oct 2015 12:03:27 -0400 Subject: Renamed show_hide preference to show --- api/preference_test.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'api/preference_test.go') 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(), } -- cgit v1.2.3-1-g7c22 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(-) (limited to 'api/preference_test.go') 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 From 5cecf1afcd1d8e561a5b2d840e5bd1b588a74a27 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Fri, 9 Oct 2015 13:47:11 -0400 Subject: Made structural changes to server-side Preference code based on feedback --- api/preference_test.go | 48 +++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) (limited to 'api/preference_test.go') diff --git a/api/preference_test.go b/api/preference_test.go index 77562bb06..a0fc19896 100644 --- a/api/preference_test.go +++ b/api/preference_test.go @@ -22,7 +22,7 @@ func TestSetPreferences(t *testing.T) { Client.LoginByEmail(team.Name, user1.Email, "pwd") // save 10 preferences - var preferences []*model.Preference + var preferences model.Preferences for i := 0; i < 10; i++ { preference := model.Preference{ UserId: user1.Id, @@ -33,7 +33,7 @@ func TestSetPreferences(t *testing.T) { preferences = append(preferences, &preference) } - if _, err := Client.SetPreferences(preferences); err != nil { + if _, err := Client.SetPreferences(&preferences); err != nil { t.Fatal(err) } @@ -42,7 +42,7 @@ func TestSetPreferences(t *testing.T) { preference.Value = "1234garbage" } - if _, err := Client.SetPreferences(preferences); err != nil { + if _, err := Client.SetPreferences(&preferences); err != nil { t.Fatal(err) } @@ -53,7 +53,7 @@ func TestSetPreferences(t *testing.T) { Client.LoginByEmail(team.Name, user2.Email, "pwd") - if _, err := Client.SetPreferences(preferences); err == nil { + if _, err := Client.SetPreferences(&preferences); err == nil { t.Fatal("shouldn't have been able to update another user's preferences") } } @@ -72,7 +72,7 @@ func TestGetPreferencesByName(t *testing.T) { user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) store.Must(Srv.Store.User().VerifyEmail(user2.Id)) - preferences1 := []*model.Preference{ + preferences1 := model.Preferences{ { UserId: user1.Id, Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, @@ -100,13 +100,13 @@ func TestGetPreferencesByName(t *testing.T) { } Client.LoginByEmail(team.Name, user1.Email, "pwd") - Client.Must(Client.SetPreferences(preferences1)) + Client.Must(Client.SetPreferences(&preferences1)) Client.LoginByEmail(team.Name, user1.Email, "pwd") 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 { + } else if data := result.Data.(model.Preferences); len(data) != 2 { t.Fatal("received the wrong number of preferences") } else if !((*data[0] == *preferences1[0] && *data[1] == *preferences1[1]) || (*data[0] == *preferences1[1] && *data[1] == *preferences1[0])) { t.Fatal("received incorrect preferences") @@ -117,7 +117,7 @@ func TestGetPreferencesByName(t *testing.T) { // 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 { + } else if data := result.Data.(model.Preferences); len(data) != 1 { t.Fatal("received the wrong number of preferences") } } @@ -134,32 +134,34 @@ func TestSetAndGetProperties(t *testing.T) { Client.LoginByEmail(team.Name, user.Email, "pwd") - p := model.Preference{ - UserId: user.Id, - Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, - Name: model.PREFERENCE_NAME_SHOW, - AltId: model.NewId(), - Value: model.NewId(), + preferences := model.Preferences{ + { + UserId: user.Id, + Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, + Name: model.PREFERENCE_NAME_SHOW, + AltId: model.NewId(), + Value: model.NewId(), + }, } - Client.Must(Client.SetPreferences([]*model.Preference{&p})) + Client.Must(Client.SetPreferences(&preferences)) - if result, err := Client.GetPreferencesByName(p.Category, p.Name); err != nil { + if result, err := Client.GetPreferencesByName(preferences[0].Category, preferences[0].Name); err != nil { t.Fatal(err) - } else if data := result.Data.([]*model.Preference); len(data) != 1 { + } else if data := result.Data.(model.Preferences); len(data) != 1 { t.Fatal("received too many preferences") - } else if *data[0] != p { + } else if *data[0] != *preferences[0] { t.Fatal("preference saved incorrectly") } - p.Value = model.NewId() - Client.Must(Client.SetPreferences([]*model.Preference{&p})) + preferences[0].Value = model.NewId() + Client.Must(Client.SetPreferences(&preferences)) - if result, err := Client.GetPreferencesByName(p.Category, p.Name); err != nil { + if result, err := Client.GetPreferencesByName(preferences[0].Category, preferences[0].Name); err != nil { t.Fatal(err) - } else if data := result.Data.([]*model.Preference); len(data) != 1 { + } else if data := result.Data.(model.Preferences); len(data) != 1 { t.Fatal("received too many preferences") - } else if *data[0] != p { + } else if *data[0] != *preferences[0] { t.Fatal("preference updated incorrectly") } } -- cgit v1.2.3-1-g7c22 From 2a39e8dbfab8506b09d0d030f87cac4c079b975a Mon Sep 17 00:00:00 2001 From: hmhealey Date: Tue, 13 Oct 2015 11:52:17 -0400 Subject: Removed Preference.AltId --- api/preference_test.go | 106 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 70 insertions(+), 36 deletions(-) (limited to 'api/preference_test.go') diff --git a/api/preference_test.go b/api/preference_test.go index a0fc19896..d9fdc2877 100644 --- a/api/preference_test.go +++ b/api/preference_test.go @@ -26,11 +26,10 @@ func TestSetPreferences(t *testing.T) { for i := 0; i < 10; i++ { preference := model.Preference{ UserId: user1.Id, - Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, - Name: model.PREFERENCE_NAME_SHOW, - AltId: model.NewId(), + Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW, + Name: model.NewId(), } - preferences = append(preferences, &preference) + preferences = append(preferences, preference) } if _, err := Client.SetPreferences(&preferences); err != nil { @@ -58,7 +57,7 @@ func TestSetPreferences(t *testing.T) { } } -func TestGetPreferencesByName(t *testing.T) { +func TestGetPreferenceCategory(t *testing.T) { Setup() team := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN} @@ -72,30 +71,23 @@ func TestGetPreferencesByName(t *testing.T) { user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + category := model.PREFERENCE_CATEGORY_TEST + preferences1 := model.Preferences{ { UserId: user1.Id, - Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, - Name: model.PREFERENCE_NAME_SHOW, - AltId: model.NewId(), - }, - { - UserId: user1.Id, - Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, - Name: model.PREFERENCE_NAME_SHOW, - AltId: model.NewId(), + Category: category, + Name: model.PREFERENCE_NAME_TEST, }, { UserId: user1.Id, - Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, - Name: model.PREFERENCE_NAME_TEST, - AltId: model.NewId(), + Category: category, + Name: model.NewId(), }, { UserId: user1.Id, Category: model.PREFERENCE_CATEGORY_TEST, - Name: model.PREFERENCE_NAME_SHOW, - AltId: model.NewId(), + Name: model.PREFERENCE_NAME_TEST, }, } @@ -104,25 +96,72 @@ 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_SHOW); err != nil { + if result, err := Client.GetPreferenceCategory(category); err != nil { t.Fatal(err) } else if data := result.Data.(model.Preferences); len(data) != 2 { t.Fatal("received the wrong number of preferences") - } else if !((*data[0] == *preferences1[0] && *data[1] == *preferences1[1]) || (*data[0] == *preferences1[1] && *data[1] == *preferences1[0])) { + } else if !((data[0] == preferences1[0] && data[1] == preferences1[1]) || (data[0] == preferences1[1] && data[1] == preferences1[0])) { t.Fatal("received incorrect preferences") } 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 { + if result, err := Client.GetPreferenceCategory(category); err != nil { t.Fatal(err) - } else if data := result.Data.(model.Preferences); len(data) != 1 { + } else if data := result.Data.(model.Preferences); len(data) != 0 { t.Fatal("received the wrong number of preferences") } } -func TestSetAndGetProperties(t *testing.T) { +func TestGetDefaultDirectChannels(t *testing.T) { + Setup() + + team := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN} + team = Client.Must(Client.CreateTeam(team)).Data.(*model.Team) + + user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", Nickname: "Corey Hulen", Password: "pwd"} + user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User) + store.Must(Srv.Store.User().VerifyEmail(user1.Id)) + + for i := 0; i < 5; i++ { + user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", Nickname: "Corey Hulen", Password: "pwd"} + Client.Must(Client.CreateUser(user, "")) + } + + Client.Must(Client.LoginByEmail(team.Name, user1.Email, "pwd")) + + if result, err := Client.GetPreferenceCategory(model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW); err != nil { + t.Fatal(err) + } else if data := result.Data.(model.Preferences); len(data) != 5 { + t.Fatal("received the wrong number of direct channels") + } + + user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", Nickname: "Corey Hulen", Password: "pwd"} + user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) + store.Must(Srv.Store.User().VerifyEmail(user2.Id)) + + for i := 0; i < 10; i++ { + user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", Nickname: "Corey Hulen", Password: "pwd"} + Client.Must(Client.CreateUser(user, "")) + } + + // make sure user1's preferences don't change + if result, err := Client.GetPreferenceCategory(model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW); err != nil { + t.Fatal(err) + } else if data := result.Data.(model.Preferences); len(data) != 5 { + t.Fatal("received the wrong number of direct channels") + } + + Client.Must(Client.LoginByEmail(team.Name, user2.Email, "pwd")) + + if result, err := Client.GetPreferenceCategory(model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW); err != nil { + t.Fatal(err) + } else if data := result.Data.(model.Preferences); len(data) != 10 { + t.Fatal("received the wrong number of direct channels") + } +} + +func TestGetPreference(t *testing.T) { Setup() team := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN} @@ -137,31 +176,26 @@ func TestSetAndGetProperties(t *testing.T) { preferences := model.Preferences{ { UserId: user.Id, - Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNELS, - Name: model.PREFERENCE_NAME_SHOW, - AltId: model.NewId(), + Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW, + Name: model.NewId(), Value: model.NewId(), }, } Client.Must(Client.SetPreferences(&preferences)) - if result, err := Client.GetPreferencesByName(preferences[0].Category, preferences[0].Name); err != nil { + if result, err := Client.GetPreference(preferences[0].Category, preferences[0].Name); err != nil { t.Fatal(err) - } else if data := result.Data.(model.Preferences); len(data) != 1 { - t.Fatal("received too many preferences") - } else if *data[0] != *preferences[0] { + } else if data := result.Data.(*model.Preference); *data != preferences[0] { t.Fatal("preference saved incorrectly") } preferences[0].Value = model.NewId() Client.Must(Client.SetPreferences(&preferences)) - if result, err := Client.GetPreferencesByName(preferences[0].Category, preferences[0].Name); err != nil { + if result, err := Client.GetPreference(preferences[0].Category, preferences[0].Name); err != nil { t.Fatal(err) - } else if data := result.Data.(model.Preferences); len(data) != 1 { - t.Fatal("received too many preferences") - } else if *data[0] != *preferences[0] { + } else if data := result.Data.(*model.Preference); *data != preferences[0] { t.Fatal("preference updated incorrectly") } } -- cgit v1.2.3-1-g7c22 From 97b2f6ffe7fa09a2188163740865322582b00b59 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Tue, 13 Oct 2015 15:18:01 -0400 Subject: Made further changes based on feedback --- api/preference_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'api/preference_test.go') diff --git a/api/preference_test.go b/api/preference_test.go index d9fdc2877..318ce9582 100644 --- a/api/preference_test.go +++ b/api/preference_test.go @@ -71,13 +71,13 @@ func TestGetPreferenceCategory(t *testing.T) { user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User) store.Must(Srv.Store.User().VerifyEmail(user2.Id)) - category := model.PREFERENCE_CATEGORY_TEST + category := model.NewId() preferences1 := model.Preferences{ { UserId: user1.Id, Category: category, - Name: model.PREFERENCE_NAME_TEST, + Name: model.NewId(), }, { UserId: user1.Id, @@ -86,8 +86,8 @@ func TestGetPreferenceCategory(t *testing.T) { }, { UserId: user1.Id, - Category: model.PREFERENCE_CATEGORY_TEST, - Name: model.PREFERENCE_NAME_TEST, + Category: model.NewId(), + Name: model.NewId(), }, } @@ -113,7 +113,7 @@ func TestGetPreferenceCategory(t *testing.T) { } } -func TestGetDefaultDirectChannels(t *testing.T) { +func TestTransformPreferences(t *testing.T) { Setup() team := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN} -- cgit v1.2.3-1-g7c22