Merge remote-tracking branch 'origin/main' into tdstein/vscode-ci

posit-dev · Oct 26, 2023 · 5aef0db · 5aef0db
2 parents a0a813b + 4180b83
commit 5aef0db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/internal/services/api/deployments/services.go b/internal/services/api/deployments/services.go
@@ -46,7 +46,6 @@ func (s deploymentsService) SetDeploymentTitle(title string) *state.Deployment {
 
 	return s.deployment
 }
-<<<<<<< HEAD
 
 func (s deploymentsService) SetDeploymentAccount(lister accounts.AccountList, name string) (*state.Deployment, error) {
 	account, err := lister.GetAccountByName(name)
@@ -60,5 +59,3 @@ func (s deploymentsService) SetDeploymentAccount(lister accounts.AccountList, na
 
 	return s.deployment, nil
 }
-=======
->>>>>>> 928e4903 (Create api/deployment/title endpoint)
diff --git a/internal/services/api/test.go b/internal/services/api/test.go
@@ -27,6 +27,11 @@ func (m *MockDeploymentsService) SetDeploymentFiles(files []string) *state.Deplo
 	return args.Get(0).(*state.Deployment)
 }
 
+func (m *MockDeploymentsService) SetDeploymentTitle(title string) *state.Deployment {
+	args := m.Called()
+	return args.Get(0).(*state.Deployment)
+}
+
 func (m *MockDeploymentsService) SetDeploymentAccount(lister accounts.AccountList, account_name string) (*state.Deployment, error) {
 	args := m.Called()
 	return args.Get(0).(*state.Deployment), nil