Replacing require.nil in api layer (#16906)

* Replacing require.nil in api layer

* Fixing some tests

* Fixing tests

* Addressing PR review comments

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>

api4/role_test.go

@@ -26,7 +26,7 @@ func TestGetRole(t *testing.T) {
 	}
 
 	role, err := th.App.Srv().Store.Role().Save(role)
-	assert.Nil(t, err)
+	require.NoError(t, err)
 	defer th.App.Srv().Store.Job().Delete(role.Id)
 
 	th.TestForAllClients(t, func(t *testing.T, client *model.Client4) {
@@ -63,7 +63,7 @@ func TestGetRoleByName(t *testing.T) {
 	}
 
 	role, err := th.App.Srv().Store.Role().Save(role)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	defer th.App.Srv().Store.Job().Delete(role.Id)
 
 	th.TestForAllClients(t, func(t *testing.T, client *model.Client4) {
@@ -114,15 +114,15 @@ func TestGetRolesByNames(t *testing.T) {
 	}
 
 	role1, err := th.App.Srv().Store.Role().Save(role1)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	defer th.App.Srv().Store.Job().Delete(role1.Id)
 
 	role2, err = th.App.Srv().Store.Role().Save(role2)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	defer th.App.Srv().Store.Job().Delete(role2.Id)
 
 	role3, err = th.App.Srv().Store.Role().Save(role3)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	defer th.App.Srv().Store.Job().Delete(role3.Id)
 
 	th.TestForAllClients(t, func(t *testing.T, client *model.Client4) {
@@ -170,7 +170,7 @@ func TestPatchRole(t *testing.T) {
 	}
 
 	role, err := th.App.Srv().Store.Role().Save(role)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	defer th.App.Srv().Store.Job().Delete(role.Id)
 
 	patch := &model.RolePatch{
@@ -181,7 +181,7 @@ func TestPatchRole(t *testing.T) {
 
 		// Cannot edit a system admin
 		adminRole, err := th.App.Srv().Store.Role().GetByName("system_admin")
-		assert.Nil(t, err)
+		assert.NoError(t, err)
 		defer th.App.Srv().Store.Job().Delete(adminRole.Id)
 
 		_, resp := client.PatchRole(adminRole.Id, patch)
@@ -189,7 +189,7 @@ func TestPatchRole(t *testing.T) {
 
 		// Cannot give other roles read / write to system roles or manage roles because only system admin can do these actions
 		systemManager, err := th.App.Srv().Store.Role().GetByName("system_manager")
-		assert.Nil(t, err)
+		assert.NoError(t, err)
 		defer th.App.Srv().Store.Job().Delete(systemManager.Id)
 
 		patchWriteSystemRoles := &model.RolePatch{
@@ -272,7 +272,7 @@ func TestPatchRole(t *testing.T) {
 			th.App.Srv().SetLicense(license)
 
 			guestRole, err := th.App.Srv().Store.Role().GetByName("system_guest")
-			require.Nil(t, err)
+			require.NoError(t, err)
 			received, resp = client.PatchRole(guestRole.Id, patch)
 			CheckNotImplementedStatus(t, resp)
 		})
@@ -282,7 +282,7 @@ func TestPatchRole(t *testing.T) {
 			license.Features.GuestAccountsPermissions = model.NewBool(true)
 			th.App.Srv().SetLicense(license)
 			guestRole, err := th.App.Srv().Store.Role().GetByName("system_guest")
-			require.Nil(t, err)
+			require.NoError(t, err)
 			_, resp = client.PatchRole(guestRole.Id, patch)
 			CheckNoError(t, resp)
 		})