Skip to content

Commit eb7d1dc

Browse files
committed
final
1 parent 79c219b commit eb7d1dc

File tree

8 files changed

+6
-847
lines changed

8 files changed

+6
-847
lines changed

.github/workflows/npmTests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,5 @@ jobs:
4242

4343
- name: Run npm tests
4444
env:
45-
JFROG_CLI_LOG_LEVEL: DEBUG
4645
YARN_IGNORE_NODE: 1
4746
run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.npm

.jfrog/projects/yarn.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

.yarn/releases/yarn-3.2.1.cjs

Lines changed: 0 additions & 786 deletions
This file was deleted.

.yarnrc.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ require (
191191

192192
replace github.com/jfrog/jfrog-cli-core/v2 => github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250220100128-df6dfe522997
193193

194-
replace github.com/jfrog/jfrog-cli-artifactory => github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20250220111350-4932564cc094
194+
replace github.com/jfrog/jfrog-cli-artifactory => github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20250220122433-4e7e5544641e
195195

196196
replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.14.2-0.20250202122713-1525ceab5778
197197

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
9494
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
9595
github.com/fluxxBot/build-info-go v1.10.10-0.20250220111243-f49d1e9424dd h1:OD3FTM4c63Ps2/HG/lCmMypbHv547eYOmSJd3z7n9S4=
9696
github.com/fluxxBot/build-info-go v1.10.10-0.20250220111243-f49d1e9424dd/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE=
97-
github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20250220111350-4932564cc094 h1:6OKXTYAcI2UZ+ck1kVreookLhYXOQsTF5ljqwo+xCpY=
98-
github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20250220111350-4932564cc094/go.mod h1:Ufo60eJd+yncLxiOeVOvI3ORcn7RgU7pj4+plxJazN0=
97+
github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20250220122433-4e7e5544641e h1:sEIyGi0adoFZnGZMmby0xzSXxkNZ8uO1L++bADvj9EI=
98+
github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20250220122433-4e7e5544641e/go.mod h1:hj7R0pimmPKPY4hH2ey00vLodHoL1foiLANx3VyelBU=
9999
github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250220100128-df6dfe522997 h1:f8ZaNxFmdAWUmvDxuLPz+skItqZH/3zeB5eA0sZbAYI=
100100
github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250220100128-df6dfe522997/go.mod h1:Hx2houXADsNv0eRh4w5XCS2uSsPNPn1OmiSDdwGFB7g=
101101
github.com/fluxxBot/jfrog-client-go v1.28.1-0.20250205140905-08198f526976 h1:YpkNUJ5vkEWhdvGh08L1apRexYcpcTYok7BloXmC7ng=

npm_test.go

Lines changed: 3 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -867,59 +867,14 @@ func TestYarnChangeVersionInV4(t *testing.T) {
867867
assert.NoError(t, yarn.ConfigSet("unsafeHttpWhitelist", "[]", yarnExecPath, true))
868868
}()
869869

870-
pwdCmd := exec.Command("pwd")
871-
output, _ := pwdCmd.Output()
872-
log.Error("0 ", string(output))
873-
874-
lsCmd := exec.Command("ls", "-al")
875-
output, _ = lsCmd.Output()
876-
log.Error("1 ", string(output))
877-
878-
catCmd := exec.Command("cat", ".yarnrc.yml")
879-
output, _ = catCmd.Output()
880-
log.Error("2 ", string(output))
881-
882-
lsYarnCmd := exec.Command("ls", ".yarn/releases")
883-
output, _ = lsYarnCmd.Output()
884-
log.Error("3 ", string(output))
885-
886870
jfrogCli := coretests.NewJfrogCli(execMain, "jfrog", "")
887-
err = jfrogCli.Exec("yarn", "--version")
888-
assert.NoError(t, err)
889871

890872
err = jfrogCli.Exec("yarn", "set", "version", "3.2.1")
891873
assert.NoError(t, err)
892-
893-
pwdCmd1 := exec.Command("pwd")
894-
output, err = pwdCmd1.Output()
895-
if err != nil {
896-
log.Error("3.5 error ", err.Error())
897-
}
898-
log.Error("3.5 ", string(output))
899-
900-
lsCmd1 := exec.Command("ls", "-al")
901-
output, err = lsCmd1.Output()
902-
if err != nil {
903-
log.Error("4 error ", err.Error())
904-
}
905-
log.Error("4 ", string(output))
906-
907-
catCmd1 := exec.Command("cat", ".yarnrc.yml")
908-
output, err = catCmd1.Output()
909-
if err != nil {
910-
log.Error("5 error ", err.Error())
911-
}
912-
log.Error("5 ", string(output))
913-
914-
lsYarnCmd1 := exec.Command("ls", ".yarn/releases")
915-
output, err = lsYarnCmd1.Output()
916-
if err != nil {
917-
log.Error("6 error ", err.Error())
918-
}
919-
log.Error("6 ", string(output))
920-
921874
modifyExistingYarnRc(t, "3.2.1")
922-
_ = jfrogCli.Exec("yarn", "--version")
875+
876+
err = jfrogCli.Exec("yarn", "--version")
877+
assert.NoError(t, err)
923878
}
924879

925880
// Checks if the expected dependencies match the actual dependencies. Only the dependencies' IDs and scopes (not more than one scope) are compared.

package.json

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)