update dockerfile test

Optum · Nov 18, 2021 · 89fd907 · 89fd907
1 parent 473709a
commit 89fd907
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/cmd/cli/cmd/deploy.go b/cmd/cli/cmd/deploy.go
@@ -232,9 +232,9 @@ func getDockerfileForBuild() string {
 	if Dockerfile != "" {
 		//Dockerfile = Dockerfile
 	} else if viper.GetString("dockerfile") != "" {
-		Dockerfile = viper.GetString("dockerfile")
+		return viper.GetString("dockerfile")
 	} else {
-		Dockerfile = DefaultDockerfile
+		return DefaultDockerfile
 	}
 	return Dockerfile
 }

diff --git a/cmd/cli/cmd/deploy_test.go b/cmd/cli/cmd/deploy_test.go
@@ -43,10 +43,8 @@ func TestGetBuildArguments_ShouldSetBuildArgContainerOnlyWhenValueExists(t *test
 func TestGetDockerfileForBuild(t *testing.T) {
 	result := getDockerfileForBuild()
 	require.Equal(t, ".runiac/Dockerfile", result)
-}
-
-func TestGetDockerfileForBuildViper(t *testing.T) {
 	viper.Set("dockerfile", "mock")
-	result := getDockerfileForBuild()
-	require.Equal(t, "mock", result)
+	result2 := getDockerfileForBuild()
+	require.Equal(t, "mock", result2)
+	viper.Set("dockerfile", "")
 }