Skip to content

Commit 90ef009

Browse files
committed
fix reading yarn version
continuation of #740 with tests added
1 parent 8509317 commit 90ef009

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/nodejs/supply/supply.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ func (s *Supplier) InstallYarn() error {
789789
}
790790

791791
buffer := new(bytes.Buffer)
792-
if err := s.Command.Execute(s.Stager.BuildDir(), buffer, buffer, "yarn", "--version"); err != nil {
792+
if err := s.Command.Execute(s.Stager.BuildDir(), buffer, buffer, "yarn", "--version", "--loglevel", "notice"); err != nil {
793793
return err
794794
}
795795

src/nodejs/supply/supply_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ var _ = Describe("Supply", func() {
596596
BeforeEach(func() {
597597
mockInstaller.EXPECT().InstallOnlyVersion("yarn", yarnInstallDir).Do(installOnlyYarn).Return(nil)
598598

599-
mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "yarn", "--version").Do(func(_ string, buffer io.Writer, _ io.Writer, _ string, _ string) {
599+
mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "yarn", "--version", "--loglevel", "notice").Do(func(_ string, buffer io.Writer, _ io.Writer, _ string, _ ...string) {
600600
buffer.Write([]byte("0.32.5\n"))
601601
}).Return(nil)
602602
})
@@ -630,7 +630,7 @@ var _ = Describe("Supply", func() {
630630
mockManifest.EXPECT().AllDependencyVersions("yarn").Return(versions)
631631
mockInstaller.EXPECT().InstallOnlyVersion("yarn", yarnInstallDir).Do(installOnlyYarn).Return(nil)
632632

633-
mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "yarn", "--version").Do(func(_ string, buffer io.Writer, _ io.Writer, _ string, _ string) {
633+
mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "yarn", "--version", "--loglevel", "notice").Do(func(_ string, buffer io.Writer, _ io.Writer, _ string, _ ...string) {
634634
buffer.Write([]byte("0.32.5\n"))
635635
}).Return(nil)
636636
})
@@ -661,7 +661,7 @@ var _ = Describe("Supply", func() {
661661

662662
Describe("InstallNPM", func() {
663663
BeforeEach(func() {
664-
mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "npm", "--version").Do(func(_ string, buffer io.Writer, _ io.Writer, _ string, _ string) {
664+
mockCommand.EXPECT().Execute(buildDir, gomock.Any(), gomock.Any(), "npm", "--version", "--loglevel", "notice").Do(func(_ string, buffer io.Writer, _ io.Writer, _ string, _ ...string) {
665665
buffer.Write([]byte("1.2.3\n"))
666666
}).Return(nil)
667667
})

0 commit comments

Comments
 (0)