refactor: use testify assert for chart_uploader tests

Signed-off-by: Jesse Simpson <jesse.simpson36@gmail.com>
pull/30807/head
Jesse Simpson 17 hours ago
parent c9e406f20a
commit c9975c9349
No known key found for this signature in database
GPG Key ID: 237495C89AB0AAFC

@ -17,10 +17,9 @@ limitations under the License.
package uploader package uploader
import ( import (
"fmt"
"strings"
"testing" "testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"helm.sh/helm/v4/pkg/cli" "helm.sh/helm/v4/pkg/cli"
@ -61,7 +60,7 @@ func TestChartUploader_UploadTo_Happy(t *testing.T) {
err := uploader.UploadTo("testdata/test-0.1.0.tgz", "oci://test") err := uploader.UploadTo("testdata/test-0.1.0.tgz", "oci://test")
mockedPusher.AssertCalled(t, "Push", "testdata/test-0.1.0.tgz", "oci://test") mockedPusher.AssertCalled(t, "Push", "testdata/test-0.1.0.tgz", "oci://test")
assert.NoError(err) assert.NoError(t, err)
} }
func TestChartUploader_UploadTo_InvalidChartUrlFormat(t *testing.T) { func TestChartUploader_UploadTo_InvalidChartUrlFormat(t *testing.T) {
@ -75,10 +74,7 @@ func TestChartUploader_UploadTo_InvalidChartUrlFormat(t *testing.T) {
err := uploader.UploadTo("main", "://invalid.com") err := uploader.UploadTo("main", "://invalid.com")
const expectedError = "invalid chart URL format" const expectedError = "invalid chart URL format"
fmt.Println(err.Error()) assert.ErrorContains(t, err, expectedError)
if !strings.Contains(err.Error(), expectedError) {
t.Errorf("Expected error to contain '" + expectedError + "'")
}
} }
func TestChartUploader_UploadTo_SchemePrefixMissingFromRemote(t *testing.T) { func TestChartUploader_UploadTo_SchemePrefixMissingFromRemote(t *testing.T) {
@ -93,10 +89,7 @@ func TestChartUploader_UploadTo_SchemePrefixMissingFromRemote(t *testing.T) {
err := uploader.UploadTo("main", "invalid.com") err := uploader.UploadTo("main", "invalid.com")
const expectedError = "scheme prefix missing from remote" const expectedError = "scheme prefix missing from remote"
fmt.Println(err.Error()) assert.ErrorContains(t, err, expectedError)
if !strings.Contains(err.Error(), expectedError) {
t.Errorf("Expected error to contain '" + expectedError + "'")
}
} }
func TestChartUploader_UploadTo_SchemeNotRegistered(t *testing.T) { func TestChartUploader_UploadTo_SchemeNotRegistered(t *testing.T) {
@ -111,8 +104,5 @@ func TestChartUploader_UploadTo_SchemeNotRegistered(t *testing.T) {
err := uploader.UploadTo("main", "grpc://invalid.com") err := uploader.UploadTo("main", "grpc://invalid.com")
const expectedError = "scheme \"grpc\" not supported" const expectedError = "scheme \"grpc\" not supported"
fmt.Println(err.Error()) assert.ErrorContains(t, err, expectedError)
if !strings.Contains(err.Error(), expectedError) {
t.Errorf("Expected error to contain '" + expectedError + "'")
}
} }

Loading…
Cancel
Save