diff options
author | Chris <ccbrown112@gmail.com> | 2017-09-25 09:11:25 -0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-09-25 10:11:25 -0400 |
commit | 49fe5fbf3db56fc466b8997b182ee135d7a4365d (patch) | |
tree | 1252fea09aa3ce899e2e8edb1fb7b42900f50bca /api | |
parent | b2c5b97601b61f5748b46e4e386134203111ebb0 (diff) | |
download | chat-49fe5fbf3db56fc466b8997b182ee135d7a4365d.tar.gz chat-49fe5fbf3db56fc466b8997b182ee135d7a4365d.tar.bz2 chat-49fe5fbf3db56fc466b8997b182ee135d7a4365d.zip |
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
Diffstat (limited to 'api')
-rw-r--r-- | api/channel_test.go | 15 |
1 files changed, 8 insertions, 7 deletions
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) |