Skip to content

Commit 60ad5ed

Browse files
committed
fix fixtures inconsistency
1 parent 2ab1083 commit 60ad5ed

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

models/fixtures/org_user.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,9 @@
129129
uid: 2
130130
org_id: 35
131131
is_public: true
132+
133+
-
134+
id: 23
135+
uid: 20
136+
org_id: 17
137+
is_public: false

models/fixtures/user.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@
623623
num_stars: 0
624624
num_repos: 2
625625
num_teams: 3
626-
num_members: 4
626+
num_members: 5
627627
visibility: 0
628628
repo_admin_change_team_access: false
629629
theme: ""

models/organization/org_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ func TestRestrictedUserOrgMembers(t *testing.T) {
205205
Doer: restrictedUser,
206206
IsDoerMember: true,
207207
},
208-
expectedUIDs: []int64{2, 15, 29}, // Public members (2) + teammates in team9 (15, 29) // note: user 20 is team_user but not org_user
208+
expectedUIDs: []int64{2, 15, 20, 29}, // Public members (2) + teammates in team9 (15, 20, 29)
209209
},
210210
{
211211
name: "restricted user sees only public members when not member",
@@ -229,15 +229,15 @@ func TestRestrictedUserOrgMembers(t *testing.T) {
229229
Doer: unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 15}),
230230
IsDoerMember: true,
231231
},
232-
expectedUIDs: []int64{2, 15, 18, 29}, // All members
232+
expectedUIDs: []int64{2, 15, 18, 20, 29}, // All members
233233
},
234234
}
235235

236236
for _, tc := range testCases {
237237
t.Run(tc.name, func(t *testing.T) {
238238
count, err := organization.CountOrgMembers(db.DefaultContext, tc.opts)
239239
assert.NoError(t, err)
240-
assert.Equal(t, len(tc.expectedUIDs), count)
240+
assert.EqualValues(t, len(tc.expectedUIDs), count)
241241

242242
members, err := organization.GetOrgUsersByOrgID(db.DefaultContext, tc.opts)
243243
assert.NoError(t, err)

0 commit comments

Comments
 (0)