diff options
Diffstat (limited to 'models/userlist_test.go')
| -rw-r--r-- | models/userlist_test.go | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/models/userlist_test.go b/models/userlist_test.go index 2b8518c92f..c16a7b6eec 100644 --- a/models/userlist_test.go +++ b/models/userlist_test.go @@ -33,10 +33,11 @@ func TestUserListIsPublicMember(t *testing.T) { } func testUserListIsPublicMember(t *testing.T, orgID int64, expected map[int64]bool) { - org, err := GetUserByID(orgID) + org, err := GetOrgByID(orgID) assert.NoError(t, err) - assert.NoError(t, org.GetMembers()) - assert.Equal(t, expected, org.MembersIsPublic) + _, membersIsPublic, err := org.GetMembers() + assert.NoError(t, err) + assert.Equal(t, expected, membersIsPublic) } func TestUserListIsUserOrgOwner(t *testing.T) { @@ -59,10 +60,11 @@ func TestUserListIsUserOrgOwner(t *testing.T) { } func testUserListIsUserOrgOwner(t *testing.T, orgID int64, expected map[int64]bool) { - org, err := GetUserByID(orgID) + org, err := GetOrgByID(orgID) + assert.NoError(t, err) + members, _, err := org.GetMembers() assert.NoError(t, err) - assert.NoError(t, org.GetMembers()) - assert.Equal(t, expected, org.Members.IsUserOrgOwner(orgID)) + assert.Equal(t, expected, members.IsUserOrgOwner(orgID)) } func TestUserListIsTwoFaEnrolled(t *testing.T) { @@ -85,8 +87,9 @@ func TestUserListIsTwoFaEnrolled(t *testing.T) { } func testUserListIsTwoFaEnrolled(t *testing.T, orgID int64, expected map[int64]bool) { - org, err := GetUserByID(orgID) + org, err := GetOrgByID(orgID) + assert.NoError(t, err) + members, _, err := org.GetMembers() assert.NoError(t, err) - assert.NoError(t, org.GetMembers()) - assert.Equal(t, expected, org.Members.GetTwoFaStatus()) + assert.Equal(t, expected, members.GetTwoFaStatus()) } |