From 5fc4cdcc98da277ad7ebc1b462c1e734e0ba00e1 Mon Sep 17 00:00:00 2001
From: sophia <scastellarin95@gmail.com>
Date: Mon, 19 Jul 2021 11:04:01 -0500
Subject: [PATCH] Setup project for testing

---
 internal/core/project.go         | 10 ++++------
 internal/core/testing_project.go | 25 +++++++++++++++++++++----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/internal/core/project.go b/internal/core/project.go
index 39593f2c1..91ede806b 100644
--- a/internal/core/project.go
+++ b/internal/core/project.go
@@ -471,7 +471,7 @@ func WithProjectName(name string) ProjectOption {
 	}
 }
 
-// WithBasisRef is used to load or initialize the basis
+// WithBasisRef is used to load or initialize the project
 func WithProjectRef(r *vagrant_plugin_sdk.Ref_Project) ProjectOption {
 	return func(p *Project) (err error) {
 		// Basis must be set before we continue
@@ -495,11 +495,6 @@ func WithProjectRef(r *vagrant_plugin_sdk.Ref_Project) ProjectOption {
 			},
 		)
 		if err != nil {
-			return err
-		}
-		if result.Found {
-			project = result.Project
-		} else {
 			var result *vagrant_server.UpsertProjectResponse
 			result, err = p.Client().UpsertProject(p.ctx,
 				&vagrant_server.UpsertProjectRequest{
@@ -514,7 +509,10 @@ func WithProjectRef(r *vagrant_plugin_sdk.Ref_Project) ProjectOption {
 				return
 			}
 			project = result.Project
+		} else {
+			project = result.Project
 		}
+
 		// Before we init, validate basis is consistent
 		if project.Basis.ResourceId != r.Basis.ResourceId {
 			p.logger.Error("invalid basis for project", "request-basis", r.Basis,
diff --git a/internal/core/testing_project.go b/internal/core/testing_project.go
index be159f998..d588b2c31 100644
--- a/internal/core/testing_project.go
+++ b/internal/core/testing_project.go
@@ -12,10 +12,25 @@ import (
 	"github.com/hashicorp/vagrant-plugin-sdk/component"
 	componentmocks "github.com/hashicorp/vagrant-plugin-sdk/component/mocks"
 	"github.com/hashicorp/vagrant-plugin-sdk/datadir"
+	"github.com/hashicorp/vagrant-plugin-sdk/proto/vagrant_plugin_sdk"
 	"github.com/hashicorp/vagrant/internal/factory"
 	"github.com/hashicorp/vagrant/internal/server/singleprocess"
 )
 
+var TestingTypeMap = map[component.Type]interface{}{
+	component.AuthenticatorType: (*component.Authenticator)(nil),
+	component.CommandType:       (*component.Command)(nil),
+	component.CommunicatorType:  (*component.Communicator)(nil),
+	component.ConfigType:        (*component.Config)(nil),
+	component.GuestType:         (*component.Guest)(nil),
+	component.HostType:          (*component.Host)(nil),
+	component.LogPlatformType:   (*component.LogPlatform)(nil),
+	component.LogViewerType:     (*component.LogViewer)(nil),
+	component.ProviderType:      (*component.Provider)(nil),
+	component.ProvisionerType:   (*component.Provisioner)(nil),
+	component.SyncedFolderType:  (*component.SyncedFolder)(nil),
+}
+
 // TestProject returns a fully in-memory and side-effect free Project that
 // can be used for testing. Additional options can be given to provide your own
 // factories, configuration, etc.
@@ -30,12 +45,12 @@ func TestProject(t testing.T, opts ...BasisOption) *Project {
 	defaultOpts := []BasisOption{
 		WithClient(singleprocess.TestServer(t)),
 		WithBasisDataDir(projDir),
-		// WithBasisConfig
+		WithBasisRef(&vagrant_plugin_sdk.Ref_Basis{Name: "test-basis"}),
 	}
 
 	// Create the default factory for all component types
-	for typ := range component.TypeMap {
-		f, _ := TestFactorySingle(t, typ, "test")
+	for typ := range TestingTypeMap {
+		f, _ := TestFactorySingle(t, typ, "test-basis")
 		defaultOpts = append(defaultOpts, WithFactory(typ, f))
 	}
 
@@ -44,7 +59,9 @@ func TestProject(t testing.T, opts ...BasisOption) *Project {
 	// t.Cleanup(func() { p.Close() })
 	b, err := NewBasis(context.Background(), append(defaultOpts, opts...)...)
 
-	p, err := b.LoadProject()
+	p, err := b.LoadProject([]ProjectOption{
+		WithProjectRef(&vagrant_plugin_sdk.Ref_Project{Basis: b.Ref().(*vagrant_plugin_sdk.Ref_Basis), Name: "test-project"}),
+	}...)
 	return p
 }