Update test fixtures and related files for Actions API

Author: rossigee

models/fixtures/collaboration.yml

@@ -4,6 +4,18 @@
   user_id: 2
   mode: 2 # write
 
+-
+  id: 12
+  repo_id: 2
+  user_id: 4
+  mode: 1 # read
+
+-
+  id: 13
+  repo_id: 4
+  user_id: 2
+  mode: 1 # read
+
 -
   id: 2
   repo_id: 4

models/fixtures/repo_unit.yml

@@ -733,3 +733,17 @@
   type: 3
   config: "{\"IgnoreWhitespaceConflicts\":false,\"AllowMerge\":true,\"AllowRebase\":true,\"AllowRebaseMerge\":true,\"AllowSquash\":true}"
   created_unix: 946684810
+
+-
+  id: 111
+  repo_id: 2
+  type: 10
+  config: "{}"
+  created_unix: 946684810
+
+-
+  id: 112
+  repo_id: 4
+  type: 10
+  config: "{}"
+  created_unix: 946684810

models/repo/collaboration_test.go

@@ -65,7 +65,7 @@ func TestRepository_IsCollaborator(t *testing.T) {
 	}
 	test(3, 2, true)
 	test(3, unittest.NonexistentID, false)
-	test(4, 2, false)
+	test(4, 2, true)
 	test(4, 4, true)
 }
 

modules/git/notes_test.go

@@ -47,5 +47,5 @@ func TestGetNonExistentNotes(t *testing.T) {
 	note := Note{}
 	err = GetNote(t.Context(), bareRepo1, "non_existent_sha", &note)
 	assert.Error(t, err)
-	assert.IsType(t, ErrNotExist{}, err)
+	assert.ErrorAs(t, err, &ErrNotExist{})
 }

modules/setting/indexer_test.go

@@ -65,7 +65,7 @@ func checkGlobMatch(t *testing.T, globstr string, list []indexerMatchList) {
 			}
 		}
 		if !found {
-			assert.Equal(t, m.position, -1, "Test string `%s` doesn't match `%s` anywhere; expected @%d", m.value, globstr, m.position)
+			assert.Equal(t, -1, m.position, "Test string `%s` doesn't match `%s` anywhere; expected @%d", m.value, globstr, m.position)
 		}
 	}
 }