diff --git a/pkg/configuration/configuration.go b/pkg/configuration/configuration.go index 925fea81..0460fdb7 100644 --- a/pkg/configuration/configuration.go +++ b/pkg/configuration/configuration.go @@ -206,7 +206,7 @@ func (r VerificationConfig) AttemptsAllowed() int { } func (r VerificationConfig) MessageTemplate() string { - return commonconfig.GetString(r.c.MessageTemplate, "Developer Sandbox for Red Hat OpenShift: Your verification code is %s") + return commonconfig.GetString(r.c.MessageTemplate, "Your Developer Sandbox verification code is %s") } func (r VerificationConfig) ExcludedEmailDomains() []string { diff --git a/pkg/configuration/configuration_test.go b/pkg/configuration/configuration_test.go index f2c329ea..db9b1d26 100644 --- a/pkg/configuration/configuration_test.go +++ b/pkg/configuration/configuration_test.go @@ -56,7 +56,7 @@ func TestRegistrationService(t *testing.T) { assert.False(t, regServiceCfg.Verification().Enabled()) assert.Equal(t, 5, regServiceCfg.Verification().DailyLimit()) assert.Equal(t, 3, regServiceCfg.Verification().AttemptsAllowed()) - assert.Equal(t, "Developer Sandbox for Red Hat OpenShift: Your verification code is %s", regServiceCfg.Verification().MessageTemplate()) + assert.Equal(t, "Your Developer Sandbox verification code is %s", regServiceCfg.Verification().MessageTemplate()) assert.Empty(t, regServiceCfg.Verification().ExcludedEmailDomains()) assert.Equal(t, 5, regServiceCfg.Verification().CodeExpiresInMin()) assert.Empty(t, regServiceCfg.Verification().TwilioAccountSID()) diff --git a/pkg/verification/service/verification_service_test.go b/pkg/verification/service/verification_service_test.go index 4ac8979d..15b41402 100644 --- a/pkg/verification/service/verification_service_test.go +++ b/pkg/verification/service/verification_service_test.go @@ -151,7 +151,7 @@ func (s *TestVerificationServiceSuite) TestInitVerification() { params, err := url.ParseQuery(reqValue) require.NoError(s.T(), err) - require.Equal(s.T(), fmt.Sprintf("Developer Sandbox for Red Hat OpenShift: Your verification code is %s", + require.Equal(s.T(), fmt.Sprintf("Your Developer Sandbox verification code is %s", signup.Annotations[toolchainv1alpha1.UserSignupVerificationCodeAnnotationKey]), params.Get("Body")) require.Equal(s.T(), "CodeReady", params.Get("From")) @@ -187,7 +187,7 @@ func (s *TestVerificationServiceSuite) TestInitVerification() { params, err = url.ParseQuery(reqValue) require.NoError(s.T(), err) - require.Equal(s.T(), fmt.Sprintf("Developer Sandbox for Red Hat OpenShift: Your verification code is %s", + require.Equal(s.T(), fmt.Sprintf("Your Developer Sandbox verification code is %s", signup2.Annotations[toolchainv1alpha1.UserSignupVerificationCodeAnnotationKey]), params.Get("Body")) require.Equal(s.T(), "CodeReady", params.Get("From")) @@ -294,7 +294,7 @@ func (s *TestVerificationServiceSuite) TestInitVerificationClientFailure() { params, err := url.ParseQuery(reqValue) require.NoError(s.T(), err) - require.Equal(s.T(), fmt.Sprintf("Developer Sandbox for Red Hat OpenShift: Your verification code is %s", + require.Equal(s.T(), fmt.Sprintf("Your Developer Sandbox verification code is %s", signup.Annotations[toolchainv1alpha1.UserSignupVerificationCodeAnnotationKey]), params.Get("Body")) require.Equal(s.T(), "CodeReady", params.Get("From")) @@ -346,7 +346,7 @@ func (s *TestVerificationServiceSuite) TestInitVerificationPassesWhenMaxCountRea params, err := url.ParseQuery(reqValue) require.NoError(s.T(), err) - require.Equal(s.T(), fmt.Sprintf("Developer Sandbox for Red Hat OpenShift: Your verification code is %s", + require.Equal(s.T(), fmt.Sprintf("Your Developer Sandbox verification code is %s", signup.Annotations[toolchainv1alpha1.UserSignupVerificationCodeAnnotationKey]), params.Get("Body")) require.Equal(s.T(), "CodeReady", params.Get("From"))