From 49fe5fbf3db56fc466b8997b182ee135d7a4365d Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 25 Sep 2017 09:11:25 -0500 Subject: Move sql store code into store/sqlstore package (#7502) * move sql store code into store/sqlstore package * move non-sql constants back up to store * fix api test * derp --- api/channel_test.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'api') diff --git a/api/channel_test.go b/api/channel_test.go index 692905e8b..b03a7efc1 100644 --- a/api/channel_test.go +++ b/api/channel_test.go @@ -11,6 +11,7 @@ import ( "github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/store" + "github.com/mattermost/mattermost-server/store/sqlstore" "github.com/mattermost/mattermost-server/utils" ) @@ -393,7 +394,7 @@ func TestUpdateChannel(t *testing.T) { utils.SetDefaultRolesBasedOnConfig() MakeUserChannelUser(th.BasicUser, channel2) MakeUserChannelUser(th.BasicUser, channel3) - store.ClearChannelCaches() + sqlstore.ClearChannelCaches() if _, err := Client.UpdateChannel(channel2); err == nil { t.Fatal("should have errored not channel admin") @@ -415,7 +416,7 @@ func TestUpdateChannel(t *testing.T) { MakeUserChannelAdmin(th.BasicUser, channel2) MakeUserChannelAdmin(th.BasicUser, channel3) - store.ClearChannelCaches() + sqlstore.ClearChannelCaches() if _, err := Client.UpdateChannel(channel2); err != nil { t.Fatal(err) @@ -629,7 +630,7 @@ func TestUpdateChannelHeader(t *testing.T) { utils.SetDefaultRolesBasedOnConfig() MakeUserChannelUser(th.BasicUser, channel2) MakeUserChannelUser(th.BasicUser, channel3) - store.ClearChannelCaches() + sqlstore.ClearChannelCaches() if _, err := Client.UpdateChannelHeader(data2); err == nil { t.Fatal("should have errored not channel admin") @@ -640,7 +641,7 @@ func TestUpdateChannelHeader(t *testing.T) { MakeUserChannelAdmin(th.BasicUser, channel2) MakeUserChannelAdmin(th.BasicUser, channel3) - store.ClearChannelCaches() + sqlstore.ClearChannelCaches() if _, err := Client.UpdateChannelHeader(data2); err != nil { t.Fatal(err) @@ -811,7 +812,7 @@ func TestUpdateChannelPurpose(t *testing.T) { utils.SetDefaultRolesBasedOnConfig() MakeUserChannelUser(th.BasicUser, channel2) MakeUserChannelUser(th.BasicUser, channel3) - store.ClearChannelCaches() + sqlstore.ClearChannelCaches() if _, err := Client.UpdateChannelPurpose(data2); err == nil { t.Fatal("should have errored not channel admin") @@ -822,7 +823,7 @@ func TestUpdateChannelPurpose(t *testing.T) { MakeUserChannelAdmin(th.BasicUser, channel2) MakeUserChannelAdmin(th.BasicUser, channel3) - store.ClearChannelCaches() + sqlstore.ClearChannelCaches() if _, err := Client.UpdateChannelPurpose(data2); err != nil { t.Fatal(err) @@ -1386,7 +1387,7 @@ func TestDeleteChannel(t *testing.T) { MakeUserChannelAdmin(th.BasicUser, channel2) MakeUserChannelAdmin(th.BasicUser, channel3) - store.ClearChannelCaches() + sqlstore.ClearChannelCaches() if _, err := Client.DeleteChannel(channel2.Id); err != nil { t.Fatal(err) -- cgit v1.2.3-1-g7c22