[MM-62179] Fix: mmctl debug error when setting email (#29953)
* only GetUserByEmail if arg is an email * fixing tests * fix typo
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
05ca61c784
Коммит
28c561d643
@@ -38,12 +38,6 @@ func (s *MmctlUnitTestSuite) TestAssignUsersCmd() {
|
||||
Return(mockRole, &model.Response{}, nil).
|
||||
Times(1)
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByEmail(context.TODO(), mockUser.Username, "").
|
||||
Return(nil, &model.Response{}, nil).
|
||||
Times(1)
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByUsername(context.TODO(), mockUser.Username, "").
|
||||
@@ -91,12 +85,6 @@ func (s *MmctlUnitTestSuite) TestAssignUsersCmd() {
|
||||
Times(1)
|
||||
|
||||
for _, user := range []*model.User{mockUser1, mockUser2} {
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByEmail(context.TODO(), user.Username, "").
|
||||
Return(nil, &model.Response{}, nil).
|
||||
Times(1)
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByUsername(context.TODO(), user.Username, "").
|
||||
@@ -110,12 +98,6 @@ func (s *MmctlUnitTestSuite) TestAssignUsersCmd() {
|
||||
Times(1)
|
||||
}
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByEmail(context.TODO(), notFoundUser.Username, "").
|
||||
Return(nil, &model.Response{}, nil).
|
||||
Times(1)
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByUsername(context.TODO(), notFoundUser.Username, "").
|
||||
@@ -171,12 +153,6 @@ func (s *MmctlUnitTestSuite) TestAssignUsersCmd() {
|
||||
Return(mockRole, &model.Response{}, nil).
|
||||
Times(1)
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByEmail(context.TODO(), mockUser.Username, "").
|
||||
Return(nil, &model.Response{}, nil).
|
||||
Times(1)
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByUsername(context.TODO(), mockUser.Username, "").
|
||||
@@ -203,12 +179,6 @@ func (s *MmctlUnitTestSuite) TestAssignUsersCmd() {
|
||||
Return(mockRole, &model.Response{}, nil).
|
||||
Times(1)
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByEmail(context.TODO(), requestedUser, "").
|
||||
Return(nil, &model.Response{}, nil).
|
||||
Times(1)
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByUsername(context.TODO(), requestedUser, "").
|
||||
@@ -241,12 +211,6 @@ func (s *MmctlUnitTestSuite) TestUnassignUsersCmd() {
|
||||
Roles: fmt.Sprintf("system_user %s team_admin", roleName),
|
||||
}
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByEmail(context.TODO(), mockUser.Username, "").
|
||||
Return(nil, &model.Response{}, nil).
|
||||
Times(1)
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByUsername(context.TODO(), mockUser.Username, "").
|
||||
@@ -284,12 +248,6 @@ func (s *MmctlUnitTestSuite) TestUnassignUsersCmd() {
|
||||
}
|
||||
|
||||
for _, user := range []*model.User{mockUser1, mockUser2} {
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByEmail(context.TODO(), user.Username, "").
|
||||
Return(nil, &model.Response{}, nil).
|
||||
Times(1)
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByUsername(context.TODO(), user.Username, "").
|
||||
@@ -303,12 +261,6 @@ func (s *MmctlUnitTestSuite) TestUnassignUsersCmd() {
|
||||
Times(1)
|
||||
}
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByEmail(context.TODO(), notFoundUser.Username, "").
|
||||
Return(nil, &model.Response{}, nil).
|
||||
Times(1)
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByUsername(context.TODO(), notFoundUser.Username, "").
|
||||
@@ -335,12 +287,6 @@ func (s *MmctlUnitTestSuite) TestUnassignUsersCmd() {
|
||||
Roles: "system_user",
|
||||
}
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByEmail(context.TODO(), mockUser.Username, "").
|
||||
Return(nil, &model.Response{}, nil).
|
||||
Times(1)
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByUsername(context.TODO(), mockUser.Username, "").
|
||||
@@ -355,12 +301,6 @@ func (s *MmctlUnitTestSuite) TestUnassignUsersCmd() {
|
||||
s.Run("Unassigning a user that is not found", func() {
|
||||
requestedUser := "user99"
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByEmail(context.TODO(), requestedUser, "").
|
||||
Return(nil, &model.Response{}, nil).
|
||||
Times(1)
|
||||
|
||||
s.client.
|
||||
EXPECT().
|
||||
GetUserByUsername(context.TODO(), requestedUser, "").
|
||||
|
||||
Ссылка в новой задаче
Block a user