fix lints, tests

Author: meln5674

models/fixtures/login_source.yml

@@ -1,5 +1 @@
--
-  id: 1
-  type: 6
-  is_active: true
-  cfg: "{\"Source\":{\"A\":\"string\",\"B\":1}}"
+[]

models/fixtures/user.yml

@@ -1559,17 +1559,17 @@
 
 -
   id: 43
-  lower_name: nonlocaluser1
-  name: nonlocaluser1
-  full_name: User One
-  email: nonlocaluser1@example.com
+  lower_name: user43
+  name: user43
+  full_name: Non-Local User One
+  email: user43@example.com
   keep_email_private: false
   email_notifications_preference: enabled
   passwd: ZogKvWdyEx:password
   passwd_hash_algo: dummy
   must_change_password: false
   login_source: 1
-  login_name: nonlocaluser1
+  login_name: user43
   type: 0
   salt: ZogKvWdyEx
   max_repo_creation: -1
@@ -1581,7 +1581,7 @@
   allow_create_organization: true
   prohibit_login: false
   avatar: ""
-  avatar_email: nonlocaluser1@example.com
+  avatar_email: user43@example.com
   use_custom_avatar: true
   num_followers: 0
   num_following: 0
@@ -1596,17 +1596,17 @@
 
 -
   id: 44
-  lower_name: nonlocaluser2
-  name: nonlocaluser2
-  full_name: User Two
-  email: nonlocaluser2@example.com
+  lower_name: user44
+  name: user44
+  full_name: Non-Local User Two
+  email: user44@example.com
   keep_email_private: false
   email_notifications_preference: enabled
   passwd: ZogKvWdyEx:password
   passwd_hash_algo: dummy
   must_change_password: false
   login_source: 1
-  login_name: nonlocaluser2
+  login_name: user44
   type: 0
   salt: ZogKvWdyEx
   max_repo_creation: -1
@@ -1618,7 +1618,7 @@
   allow_create_organization: true
   prohibit_login: false
   avatar: ""
-  avatar_email: nonlocaluser2@example.com
+  avatar_email: user44@example.com
   use_custom_avatar: true
   num_followers: 0
   num_following: 0
@@ -1630,5 +1630,3 @@
   repo_admin_change_team_access: false
   theme: ""
   keep_activity_private: false
-
-

models/user/user_test.go

@@ -155,13 +155,13 @@ func TestSearchUsers(t *testing.T) {
 	}
 
 	testUserSuccess(user_model.SearchUserOptions{OrderBy: "id ASC", ListOptions: db.ListOptions{Page: 1}},
-		[]int64{1, 2, 4, 5, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, 20, 21, 24, 27, 28, 29, 30, 32, 34, 37, 38, 39, 40})
+		[]int64{1, 2, 4, 5, 8, 9, 10, 11, 12, 13, 14, 15, 16, 18, 20, 21, 24, 27, 28, 29, 30, 32, 34, 37, 38, 39, 40, 43, 44})
 
 	testUserSuccess(user_model.SearchUserOptions{ListOptions: db.ListOptions{Page: 1}, IsActive: optional.Some(false)},
 		[]int64{9})
 
 	testUserSuccess(user_model.SearchUserOptions{OrderBy: "id ASC", ListOptions: db.ListOptions{Page: 1}, IsActive: optional.Some(true)},
-		[]int64{1, 2, 4, 5, 8, 10, 11, 12, 13, 14, 15, 16, 18, 20, 21, 24, 27, 28, 29, 30, 32, 34, 37, 38, 39, 40})
+		[]int64{1, 2, 4, 5, 8, 10, 11, 12, 13, 14, 15, 16, 18, 20, 21, 24, 27, 28, 29, 30, 32, 34, 37, 38, 39, 40, 43, 44})
 
 	testUserSuccess(user_model.SearchUserOptions{Keyword: "user1", OrderBy: "id ASC", ListOptions: db.ListOptions{Page: 1}, IsActive: optional.Some(true)},
 		[]int64{1, 10, 11, 12, 13, 14, 15, 16, 18})
@@ -171,7 +171,7 @@ func TestSearchUsers(t *testing.T) {
 		[]int64{1, 10, 11, 12, 13, 14, 15, 16, 18})
 
 	testUserSuccess(user_model.SearchUserOptions{ListOptions: db.ListOptions{Page: 1}, IsAdmin: optional.Some(true)},
-		[]int64{1})
+		[]int64{1, 43})
 
 	testUserSuccess(user_model.SearchUserOptions{ListOptions: db.ListOptions{Page: 1}, IsRestricted: optional.Some(true)},
 		[]int64{29})

services/user/update_test.go

@@ -19,6 +19,12 @@ func TestUpdateUser(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 
 	admin := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
+	nonLocalAdmin := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 43})
+
+	// Need to make the nonlocal admin not an admin for the following checks to make sense
+	assert.NoError(t, UpdateUser(t.Context(), nonLocalAdmin, &UpdateOptions{
+		IsAdmin: UpdateOptionFieldFromValue(false),
+	}))
 
 	assert.Error(t, UpdateUser(t.Context(), admin, &UpdateOptions{
 		IsAdmin: UpdateOptionFieldFromValue(false),

tests/integration/api_nodeinfo_test.go

@@ -29,7 +29,7 @@ func TestNodeinfo(t *testing.T) {
 	DecodeJSON(t, resp, &nodeinfo)
 	assert.True(t, nodeinfo.OpenRegistrations)
 	assert.Equal(t, "gitea", nodeinfo.Software.Name)
-	assert.Equal(t, 29, nodeinfo.Usage.Users.Total)
+	assert.Equal(t, 31, nodeinfo.Usage.Users.Total)
 	assert.Equal(t, 22, nodeinfo.Usage.LocalPosts)
 	assert.Equal(t, 3, nodeinfo.Usage.LocalComments)
 }