Skip to content

Commit 40ce9ee

Browse files
committed
Mock os call
1 parent f738a51 commit 40ce9ee

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

go/porcelain/deploy.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -500,9 +500,11 @@ func (n *Netlify) uploadFile(ctx context.Context, d *models.Deploy, f *FileBundl
500500
}
501501
}
502502

503+
var getwd = os.Getwd
504+
503505
func walk(dir string, observer DeployObserver, useLargeMedia bool) (*deployFiles, error) {
504506
files := newDeployFiles()
505-
cwd, err := os.Getwd()
507+
cwd, err := getwd()
506508
if err != nil {
507509
return nil, err
508510
}

go/porcelain/deploy_test.go

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -150,23 +150,17 @@ func TestWalk_IgnoreNodeModulesInRoot(t *testing.T) {
150150
err = ioutil.WriteFile(filepath.Join(dir, "more", "node_modules", "inner-package"), []byte{}, 0644)
151151
require.Nil(t, err)
152152

153+
// When deploy directory != build directory, always deploy node_modules.
154+
getwd = func() (string, error) { return "elsewhere", nil }
153155
files, err := walk(dir, mockObserver{}, false)
154156
require.Nil(t, err)
155-
156-
// When deploy directory != build directory, always deploy node_modules.
157157
assert.NotNil(t, files.Files["node_modules/root-package"])
158158
assert.NotNil(t, files.Files["more/node_modules/inner-package"])
159159

160-
cwd, err := os.Getwd()
161-
require.Nil(t, err)
162-
err = os.Chdir(dir)
163-
require.Nil(t, err)
164-
defer os.Chdir(cwd)
165-
160+
// When deploy directory == build directory, ignore node_modules in deploy directory root.
161+
getwd = func() (string, error) { return dir, nil }
166162
files, err = walk(dir, mockObserver{}, false)
167163
require.Nil(t, err)
168-
169-
// When deploy directory == build directory, ignore node_modules in deploy directory root.
170164
assert.Nil(t, files.Files["node_modules/root-package"])
171165
assert.NotNil(t, files.Files["more/node_modules/inner-package"])
172166
}

0 commit comments

Comments
 (0)