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
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
b2c5b97601
Коммит
49fe5fbf3d
@@ -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)
|
||||
|
||||
Ссылка в новой задаче
Block a user