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/scheme_test.go

@@ -309,7 +309,7 @@ func TestGetTeamsForScheme(t *testing.T) {
 	}
 
 	team1, err := th.App.Srv().Store.Team().Save(team1)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	l2, r2 := th.SystemAdminClient.GetTeamsForScheme(scheme1.Id, 0, 100)
 	CheckNoError(t, r2)
@@ -317,7 +317,7 @@ func TestGetTeamsForScheme(t *testing.T) {
 
 	team1.SchemeId = &scheme1.Id
 	team1, err = th.App.Srv().Store.Team().Update(team1)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 
 	l3, r3 := th.SystemAdminClient.GetTeamsForScheme(scheme1.Id, 0, 100)
 	CheckNoError(t, r3)
@@ -331,7 +331,7 @@ func TestGetTeamsForScheme(t *testing.T) {
 		SchemeId:    &scheme1.Id,
 	}
 	team2, err = th.App.Srv().Store.Team().Save(team2)
-	require.Nil(t, err)
+	require.NoError(t, err)
 
 	l4, r4 := th.SystemAdminClient.GetTeamsForScheme(scheme1.Id, 0, 100)
 	CheckNoError(t, r4)
@@ -402,7 +402,7 @@ func TestGetChannelsForScheme(t *testing.T) {
 	}
 
 	channel1, errCh := th.App.Srv().Store.Channel().Save(channel1, 1000000)
-	assert.Nil(t, errCh)
+	assert.NoError(t, errCh)
 
 	l2, r2 := th.SystemAdminClient.GetChannelsForScheme(scheme1.Id, 0, 100)
 	CheckNoError(t, r2)
@@ -410,7 +410,7 @@ func TestGetChannelsForScheme(t *testing.T) {
 
 	channel1.SchemeId = &scheme1.Id
 	channel1, err := th.App.Srv().Store.Channel().Update(channel1)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 
 	l3, r3 := th.SystemAdminClient.GetChannelsForScheme(scheme1.Id, 0, 100)
 	CheckNoError(t, r3)
@@ -425,7 +425,7 @@ func TestGetChannelsForScheme(t *testing.T) {
 		SchemeId:    &scheme1.Id,
 	}
 	channel2, nErr := th.App.Srv().Store.Channel().Save(channel2, 1000000)
-	assert.Nil(t, nErr)
+	assert.NoError(t, nErr)
 
 	l4, r4 := th.SystemAdminClient.GetChannelsForScheme(scheme1.Id, 0, 100)
 	CheckNoError(t, r4)
@@ -627,7 +627,7 @@ func TestDeleteScheme(t *testing.T) {
 			Type:        model.TEAM_OPEN,
 			SchemeId:    &s1.Id,
 		})
-		require.Nil(t, err)
+		require.NoError(t, err)
 
 		// Delete the Scheme.
 		_, r3 := th.SystemAdminClient.DeleteScheme(s1.Id)
@@ -696,7 +696,7 @@ func TestDeleteScheme(t *testing.T) {
 			Type:        model.CHANNEL_OPEN,
 			SchemeId:    &s1.Id,
 		}, -1)
-		assert.Nil(t, err)
+		assert.NoError(t, err)
 
 		// Delete the Scheme.
 		_, r3 := th.SystemAdminClient.DeleteScheme(s1.Id)