Migrate store methods to use request.Context instead of context.Context (#24836)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
0d5a8b8841
Коммит
13c05a571f
@@ -1027,7 +1027,7 @@ func TestLeaveTeamPanic(t *testing.T) {
|
||||
mockLicenseStore.On("Get", "").Return(&model.LicenseRecord{}, nil)
|
||||
|
||||
mockTeamStore := mocks.TeamStore{}
|
||||
mockTeamStore.On("GetMember", sqlstore.WithMaster(context.Background()), "myteam", "userID").Return(&model.TeamMember{TeamId: "myteam", UserId: "userID"}, nil)
|
||||
mockTeamStore.On("GetMember", sqlstore.RequestContextWithMaster(th.Context), "myteam", "userID").Return(&model.TeamMember{TeamId: "myteam", UserId: "userID"}, nil)
|
||||
mockTeamStore.On("UpdateMember", mock.Anything).Return(nil, errors.New("repro error")) // This is the line that triggers the error
|
||||
|
||||
mockStore.On("Channel").Return(&mockChannelStore)
|
||||
@@ -1297,7 +1297,7 @@ func TestUpdateTeamMemberRolesChangingGuest(t *testing.T) {
|
||||
_, _, err := th.App.AddUserToTeam(th.Context, th.BasicTeam.Id, ruser.Id, "")
|
||||
require.Nil(t, err)
|
||||
|
||||
_, err = th.App.UpdateTeamMemberRoles(th.BasicTeam.Id, ruser.Id, "team_user")
|
||||
_, err = th.App.UpdateTeamMemberRoles(th.Context, th.BasicTeam.Id, ruser.Id, "team_user")
|
||||
require.NotNil(t, err, "Should fail when try to modify the guest role")
|
||||
})
|
||||
|
||||
@@ -1308,7 +1308,7 @@ func TestUpdateTeamMemberRolesChangingGuest(t *testing.T) {
|
||||
_, _, err := th.App.AddUserToTeam(th.Context, th.BasicTeam.Id, ruser.Id, "")
|
||||
require.Nil(t, err)
|
||||
|
||||
_, err = th.App.UpdateTeamMemberRoles(th.BasicTeam.Id, ruser.Id, "team_guest")
|
||||
_, err = th.App.UpdateTeamMemberRoles(th.Context, th.BasicTeam.Id, ruser.Id, "team_guest")
|
||||
require.NotNil(t, err, "Should fail when try to modify the guest role")
|
||||
})
|
||||
|
||||
@@ -1319,7 +1319,7 @@ func TestUpdateTeamMemberRolesChangingGuest(t *testing.T) {
|
||||
_, _, err := th.App.AddUserToTeam(th.Context, th.BasicTeam.Id, ruser.Id, "")
|
||||
require.Nil(t, err)
|
||||
|
||||
_, err = th.App.UpdateTeamMemberRoles(th.BasicTeam.Id, ruser.Id, "team_user team_admin")
|
||||
_, err = th.App.UpdateTeamMemberRoles(th.Context, th.BasicTeam.Id, ruser.Id, "team_user team_admin")
|
||||
require.Nil(t, err, "Should work when you not modify guest role")
|
||||
})
|
||||
|
||||
@@ -1333,7 +1333,7 @@ func TestUpdateTeamMemberRolesChangingGuest(t *testing.T) {
|
||||
_, err = th.App.CreateRole(&model.Role{Name: "custom", DisplayName: "custom", Description: "custom"})
|
||||
require.Nil(t, err)
|
||||
|
||||
_, err = th.App.UpdateTeamMemberRoles(th.BasicTeam.Id, ruser.Id, "team_guest custom")
|
||||
_, err = th.App.UpdateTeamMemberRoles(th.Context, th.BasicTeam.Id, ruser.Id, "team_guest custom")
|
||||
require.Nil(t, err, "Should work when you not modify guest role")
|
||||
})
|
||||
|
||||
@@ -1344,7 +1344,7 @@ func TestUpdateTeamMemberRolesChangingGuest(t *testing.T) {
|
||||
_, _, err := th.App.AddUserToTeam(th.Context, th.BasicTeam.Id, ruser.Id, "")
|
||||
require.Nil(t, err)
|
||||
|
||||
_, err = th.App.UpdateTeamMemberRoles(th.BasicTeam.Id, ruser.Id, "team_guest team_user")
|
||||
_, err = th.App.UpdateTeamMemberRoles(th.Context, th.BasicTeam.Id, ruser.Id, "team_guest team_user")
|
||||
require.NotNil(t, err, "Should work when you not modify guest role")
|
||||
})
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user