diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-11-19 19:41:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-19 19:41:40 +0800 |
| commit | 7a0347315995b25bcb2dca4786504fb699b5f004 (patch) | |
| tree | 803dfd39286216fd0521ad16539ffd9fc5f87fc0 /services/org/org_test.go | |
| parent | a09b40de8d1dae7107437cfba42cee201fcd6d42 (diff) | |
| download | gitea-7a0347315995b25bcb2dca4786504fb699b5f004.tar.gz gitea-7a0347315995b25bcb2dca4786504fb699b5f004.zip | |
Use a standalone struct name for Organization (#17632)
* Use a standalone struct name for Organization
* recover unnecessary change
* make the code readable
* Fix template failure
* Fix template failure
* Move HasMemberWithUserID to org
* Fix test
* Remove unnecessary user type check
* Fix test
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'services/org/org_test.go')
| -rw-r--r-- | services/org/org_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/org/org_test.go b/services/org/org_test.go index 5fec086d10..3c620c055b 100644 --- a/services/org/org_test.go +++ b/services/org/org_test.go @@ -20,18 +20,18 @@ func TestMain(m *testing.M) { func TestDeleteOrganization(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) - org := unittest.AssertExistsAndLoadBean(t, &models.User{ID: 6}).(*models.User) + org := unittest.AssertExistsAndLoadBean(t, &models.Organization{ID: 6}).(*models.Organization) assert.NoError(t, DeleteOrganization(org)) - unittest.AssertNotExistsBean(t, &models.User{ID: 6}) + unittest.AssertNotExistsBean(t, &models.Organization{ID: 6}) unittest.AssertNotExistsBean(t, &models.OrgUser{OrgID: 6}) unittest.AssertNotExistsBean(t, &models.Team{OrgID: 6}) - org = unittest.AssertExistsAndLoadBean(t, &models.User{ID: 3}).(*models.User) + org = unittest.AssertExistsAndLoadBean(t, &models.Organization{ID: 3}).(*models.Organization) err := DeleteOrganization(org) assert.Error(t, err) assert.True(t, models.IsErrUserOwnRepos(err)) - user := unittest.AssertExistsAndLoadBean(t, &models.User{ID: 5}).(*models.User) + user := unittest.AssertExistsAndLoadBean(t, &models.Organization{ID: 5}).(*models.Organization) assert.Error(t, DeleteOrganization(user)) unittest.CheckConsistencyFor(t, &models.User{}, &models.Team{}) } |