-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
EPMUII-7850 make "name" not mandarory at registration
- Loading branch information
Showing
8 changed files
with
23 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1487,9 +1487,10 @@ func (s *UserTestSuite) TestUser_UpdateReadonlyAccess_InternalError() { | |
|
|
||
| func validUser(t *testing.T, id int) *ent.User { | ||
| t.Helper() | ||
| name := fmt.Sprintf("User%d", id) | ||
| return &ent.User{ | ||
| ID: id, | ||
| Name: fmt.Sprintf("User%d", id), | ||
| Name: &name, | ||
| Login: fmt.Sprintf("user_%d", id), | ||
| Email: fmt.Sprintf("user_%[email protected]", id), | ||
| Edges: ent.UserEdges{ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,16 +54,17 @@ func (s *EquipmentSuite) SetupTest() { | |
| t.Fatal(err) | ||
| } | ||
|
|
||
| name := "admin" | ||
| s.user = &ent.User{ | ||
| Login: "admin", Email: "[email protected]", Password: "12345", Name: "admin", | ||
| Login: "admin", Email: "[email protected]", Password: "12345", Name: &name, | ||
| } | ||
| _, err = s.client.User.Delete().Exec(s.ctx) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| u, err := s.client.User.Create(). | ||
| SetLogin(s.user.Login).SetEmail(s.user.Email). | ||
| SetPassword(s.user.Password).SetName(s.user.Name). | ||
| SetPassword(s.user.Password).SetName(*s.user.Name). | ||
| Save(s.ctx) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,16 +44,17 @@ func (s *OrderSuite) SetupTest() { | |
| s.orderRepository = NewOrderRepository() | ||
| s.orderStatusRepository = NewOrderStatusRepository() | ||
|
|
||
| name := "user1" | ||
| s.user = &ent.User{ | ||
| Login: "user1", Email: "[email protected]", Password: "1234", Name: "user1", | ||
| Login: "user1", Email: "[email protected]", Password: "1234", Name: &name, | ||
| } | ||
| _, err := s.client.User.Delete().Exec(s.ctx) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| u, err := s.client.User.Create(). | ||
| SetLogin(s.user.Login).SetEmail(s.user.Email). | ||
| SetPassword(s.user.Password).SetName(s.user.Name). | ||
| SetPassword(s.user.Password).SetName(*s.user.Name). | ||
| Save(s.ctx) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,11 +39,12 @@ func (s *UserSuite) SetupTest() { | |
|
|
||
| s.users = make(map[int]*ent.User) | ||
| for i := 1; i <= 12; i++ { | ||
| name := fmt.Sprintf("user%d", i) | ||
| s.users[i] = &ent.User{ | ||
| Login: fmt.Sprintf("user_%d", i), | ||
| Email: fmt.Sprintf("user_%[email protected]", i), | ||
| Password: "password", | ||
| Name: fmt.Sprintf("user%d", i), | ||
| Name: &name, | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -53,7 +54,7 @@ func (s *UserSuite) SetupTest() { | |
| } | ||
| for i, value := range s.users { | ||
| user, errCreate := s.client.User.Create(). | ||
| SetName(value.Name). | ||
| SetName(*value.Name). | ||
| SetLogin(value.Login). | ||
| SetPassword(value.Password). | ||
| SetEmail(value.Email). | ||
|
|
@@ -240,8 +241,8 @@ func (s *UserSuite) TestUserRepository_UserList_OrderByNameDesc() { | |
| prevUserName := "zzzzzzzzzzzzzzzzzzzzz" | ||
| for _, value := range users { | ||
| require.True(t, mapContainsUser(t, value, s.users)) | ||
| require.LessOrEqual(t, value.Name, prevUserName) | ||
| prevUserName = value.Name | ||
| require.LessOrEqual(t, *value.Name, prevUserName) | ||
| prevUserName = *value.Name | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -286,8 +287,8 @@ func (s *UserSuite) TestUserRepository_UserList_OrderByNameAsc() { | |
| prevUserName := "" | ||
| for _, value := range users { | ||
| require.True(t, mapContainsUser(t, value, s.users)) | ||
| require.GreaterOrEqual(t, value.Name, prevUserName) | ||
| prevUserName = value.Name | ||
| require.GreaterOrEqual(t, *value.Name, prevUserName) | ||
| prevUserName = *value.Name | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -431,7 +432,7 @@ func (s *UserSuite) TestUserRepository_DeleteUser_OK() { | |
| func mapContainsUser(t *testing.T, eq *ent.User, m map[int]*ent.User) bool { | ||
| t.Helper() | ||
| for _, v := range m { | ||
| if eq.Name == v.Name && eq.ID == v.ID && eq.Login == v.Login && eq.Email == v.Email { | ||
| if *eq.Name == *v.Name && eq.ID == v.ID && eq.Login == v.Login && eq.Email == v.Email { | ||
| return true | ||
| } | ||
| } | ||
|
|
||