trying to fix scm_github_access_token_type mocking.

AnalogJ · AnalogJ · commit ec99f205926a · 2019-07-21T21:44:39.000-07:00
diff --git a/pkg/scm/factory_test.go b/pkg/scm/factory_test.go
@@ -46,6 +46,7 @@ func (suite *ScmTestSuite) TestCreate_Invalid() {
 
 func (suite *ScmTestSuite) TestCreate_Github() {
 	//setup
+	suite.Config.EXPECT().SetDefault(gomock.Any(), gomock.Any()).MinTimes(1)
 	suite.Config.EXPECT().GetString("scm_github_access_token").Return("placeholder")
 	suite.Config.EXPECT().IsSet("scm_github_api_endpoint").Return(false)
 	suite.Config.EXPECT().IsSet("scm_github_access_token").Return(true)
diff --git a/pkg/scm/scm_bitbucket_test.go b/pkg/scm/scm_bitbucket_test.go
@@ -275,6 +275,7 @@ func (suite *ScmBitbucketTestSuite) TestScmBitbucket_CheckoutPushPayload() {
 
 func (suite *ScmBitbucketTestSuite) TestScmBitbucket_CheckoutPushPayload_WithInvalidPayload() {
 	//setup
+	suite.Config.EXPECT().SetDefault(gomock.Any(), gomock.Any()).MinTimes(1)
 	suite.Config.EXPECT().IsSet("scm_github_access_token").Return(true) //used by the init function
 	suite.Config.EXPECT().IsSet("scm_github_api_endpoint").Return(false)
 	suite.Config.EXPECT().IsSet("scm_git_parent_path").Return(false)
diff --git a/pkg/scm/scm_github_test.go b/pkg/scm/scm_github_test.go
@@ -229,6 +229,7 @@ func TestScmGithub_CheckoutPushPayload(t *testing.T) {
 	mockConfig.EXPECT().IsSet("scm_github_access_token").Return(true) //used by the init function
 	mockConfig.EXPECT().IsSet("scm_github_api_endpoint").Return(false)
 	mockConfig.EXPECT().GetString("scm_github_access_token").Return("") //set the Access Token to empty string before doing checkout
+	mockConfig.EXPECT().GetString("scm_github_access_token_type").Return("user") //set the Access Token Type
 	// (so that git doesnt fail on placeholder token)
 	mockConfig.EXPECT().IsSet("scm_git_parent_path").Return(false)
 	mockConfig.EXPECT().IsSet("scm_pull_request").Return(false)
