update integration tests

Signed-off-by: Adolfo García Veytia (Puerco) <puerco@carabiner.dev>

Author: puerco

pkg/sourcetool/tool_test.go

@@ -71,16 +71,6 @@ func TestConfigureControls(t *testing.T) {
 				return i
 			},
 		},
-		{
-			name: "GetVcsBackend-fails", mustErr: true,
-			controls: []models.ControlConfiguration{models.CONFIG_BRANCH_RULES},
-			prepare: func(t *testing.T) toolImplementation {
-				t.Helper()
-				i := &sourcetoolfakes.FakeToolImplementation{}
-				i.GetVcsBackendReturns(nil, syntErr)
-				return i
-			},
-		},
 		{
 			name: "CheckPolicyFork-fails", mustErr: true,
 			controls: []models.ControlConfiguration{models.CONFIG_POLICY},
@@ -291,50 +281,62 @@ func TestOnboardRepository(t *testing.T) {
 	t.Parallel()
 	for _, tt := range []struct {
 		name    string
-		getSut  func(t *testing.T) toolImplementation
+		impl    func(t *testing.T) toolImplementation
+		backend func(t *testing.T) models.VcsBackend
 		mustErr bool
 	}{
-		{"normal", func(t *testing.T) toolImplementation {
-			t.Helper()
-			timp := &sourcetoolfakes.FakeToolImplementation{}
-			timp.GetVcsBackendReturns(&modelsfakes.FakeVcsBackend{}, nil)
-			timp.VerifyOptionsForFullOnboardReturns(nil)
-			timp.ConfigureControlsReturns(nil)
-			return timp
-		}, false},
-		{"get-vcs-fails", func(t *testing.T) toolImplementation {
-			t.Helper()
-			timp := &sourcetoolfakes.FakeToolImplementation{}
-			timp.GetVcsBackendReturns(nil, errors.New("vcsborked"))
-			timp.VerifyOptionsForFullOnboardReturns(nil)
-			timp.ConfigureControlsReturns(nil)
-			return timp
-		}, true},
-		{"get-verifyoptions-fails", func(t *testing.T) toolImplementation {
-			t.Helper()
-			timp := &sourcetoolfakes.FakeToolImplementation{}
-			timp.GetVcsBackendReturns(&modelsfakes.FakeVcsBackend{}, nil)
-			timp.VerifyOptionsForFullOnboardReturns(errors.New("onboarderr"))
-			return timp
-		}, true},
-		{"backend-configure-controls-fails", func(t *testing.T) toolImplementation {
-			t.Helper()
-			bend := modelsfakes.FakeVcsBackend{}
-			bend.ConfigureControlsReturns(errors.New("configure-error"))
-
-			timp := &sourcetoolfakes.FakeToolImplementation{}
-			timp.GetVcsBackendReturns(&bend, nil)
-			timp.VerifyOptionsForFullOnboardReturns(nil)
-			return timp
-		}, true},
+		{
+			name: "normal",
+			impl: func(t *testing.T) toolImplementation {
+				t.Helper()
+				timp := &sourcetoolfakes.FakeToolImplementation{}
+				timp.VerifyOptionsForFullOnboardReturns(nil)
+				return timp
+			},
+			backend: func(t *testing.T) models.VcsBackend {
+				t.Helper()
+				return &modelsfakes.FakeVcsBackend{}
+			},
+			mustErr: false,
+		},
+		{
+			name: "get-verifyoptions-fails",
+			impl: func(t *testing.T) toolImplementation {
+				t.Helper()
+				timp := &sourcetoolfakes.FakeToolImplementation{}
+				timp.VerifyOptionsForFullOnboardReturns(errors.New("onboarderr"))
+				return timp
+			},
+			backend: func(t *testing.T) models.VcsBackend {
+				t.Helper()
+				return &modelsfakes.FakeVcsBackend{}
+			},
+			mustErr: true,
+		},
+		{
+			name: "backend-configure-controls-fails",
+			impl: func(t *testing.T) toolImplementation {
+				t.Helper()
+				timp := &sourcetoolfakes.FakeToolImplementation{}
+				timp.VerifyOptionsForFullOnboardReturns(nil)
+				return timp
+			},
+			backend: func(t *testing.T) models.VcsBackend {
+				t.Helper()
+				bend := &modelsfakes.FakeVcsBackend{}
+				bend.ConfigureControlsReturns(errors.New("configure-error"))
+				return bend
+			},
+			mustErr: true,
+		},
 	} {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
-			impl := tt.getSut(t)
-			tool, err := New()
-			require.NoError(t, err)
-			tool.impl = impl
-			err = tool.OnboardRepository(t.Context(), &models.Repository{Path: "example/repo"}, []*models.Branch{{Name: "main"}})
+			tool := &Tool{
+				impl:    tt.impl(t),
+				backend: tt.backend(t),
+			}
+			err := tool.OnboardRepository(t.Context(), &models.Repository{Path: "example/repo"}, []*models.Branch{{Name: "main"}})
 			if tt.mustErr {
 				require.Error(t, err)
 				return