@@ -26,62 +26,38 @@ func TestNewKoolDeploy(t *testing.T) {
2626 }
2727}
2828
29- func fakeKoolDeploy () * KoolDeploy {
29+ func fakeKoolDeploy (pwd string ) * KoolDeploy {
3030 c := NewCloud ()
3131 c .Fake ()
3232 return & KoolDeploy {
3333 * (newDefaultKoolService ().Fake ()),
3434 c ,
35- setup .NewDefaultCloudSetupParser ("" ),
35+ setup .NewDefaultCloudSetupParser (pwd ),
3636 & KoolCloudDeployFlags {},
3737 environment .NewFakeEnvStorage (),
3838 nil ,
3939 }
4040}
4141
42- func TestHandleDeployEnv (t * testing.T ) {
43- fake := fakeKoolDeploy ()
42+ func TestCreateReleaseFileNoConfig (t * testing.T ) {
43+ fake := fakeKoolDeploy ("" )
4444
45- files := []string {}
46-
47- tmpDir := t .TempDir ()
48- fake .env .Set ("PWD" , tmpDir )
49-
50- files = fake .handleDeployEnv (files )
51-
52- if len (files ) != 0 {
53- t .Errorf ("expected files to continue empty - no kool.deploy.env exists" )
54- }
55-
56- if err := os .WriteFile (filepath .Join (tmpDir , "kool.deploy.env" ), []byte ("FOO=BAR" ), os .ModePerm ); err != nil {
57- t .Fatal (err )
58- }
59-
60- files = fake .handleDeployEnv (files )
61-
62- if len (files ) != 1 {
63- t .Errorf ("expected files to have added kool.deploy.env" )
64- }
65-
66- files = fake .handleDeployEnv (files )
67-
68- if len (files ) != 1 {
69- t .Errorf ("expected files to continue since was already there kool.deploy.env" )
45+ if _ , err := fake .createReleaseFile (); err == nil || ! strings .Contains (err .Error (), "no kool.cloud.yml config files found" ) {
46+ t .Errorf ("expected error on createReleaseFile when no kool.deploy.yml exists in current working directory; got: %v" , err )
7047 }
7148}
7249
73- func TestCreateReleaseFile (t * testing.T ) {
74- fake := fakeKoolDeploy ()
75-
50+ func TestCreateReleaseFileCreatesTgz (t * testing.T ) {
7651 tmpDir := t .TempDir ()
52+ mockConfig (tmpDir , t , nil )
53+
54+ fake := fakeKoolDeploy (tmpDir )
7755 fake .env .Set ("PWD" , tmpDir )
7856
79- if _ , err := fake .createReleaseFile (); err == nil || ! strings . Contains ( err . Error (), "no kool.cloud.yml config files found" ) {
80- t .Errorf ("expected error on createReleaseFile when no kool.deploy.yml exists in current working directory ; got: %v" , err )
57+ if err := fake .loadAndValidateConfig (); err != nil {
58+ t .Errorf ("unexpected error on loadAndValidateConfig ; got: %v" , err )
8159 }
8260
83- mockConfig (tmpDir , t , nil )
84-
8561 if tg , err := fake .createReleaseFile (); err != nil {
8662 t .Errorf ("unexpected error on createReleaseFile; got: %v" , err )
8763 } else if _ , err := os .Stat (tg ); err != nil {
@@ -90,13 +66,12 @@ func TestCreateReleaseFile(t *testing.T) {
9066}
9167
9268func TestCleanupReleaseFile (t * testing.T ) {
93- fake := fakeKoolDeploy ()
94-
9569 tmpDir := t .TempDir ()
96- fake .env .Set ("PWD" , tmpDir )
97-
9870 mockConfig (tmpDir , t , nil )
9971
72+ fake := fakeKoolDeploy ("" )
73+ fake .env .Set ("PWD" , tmpDir )
74+
10075 f := filepath .Join (tmpDir , "kool.cloud.yml" )
10176 fake .cleanupReleaseFile (f )
10277 if _ , err := os .Stat (f ); ! os .IsNotExist (err ) {
@@ -113,7 +88,7 @@ func TestCleanupReleaseFile(t *testing.T) {
11388}
11489
11590func TestLoadAndValidateConfig (t * testing.T ) {
116- fake := fakeKoolDeploy ()
91+ fake := fakeKoolDeploy ("" )
11792
11893 tmpDir := t .TempDir ()
11994 fake .env .Set ("PWD" , tmpDir )
0 commit comments