Skip to content

Commit

Permalink
final
Browse files Browse the repository at this point in the history
  • Loading branch information
fluxxBot committed Feb 20, 2025
1 parent 79c219b commit eb7d1dc
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 847 deletions.
1 change: 0 additions & 1 deletion .github/workflows/npmTests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,5 @@ jobs:

- name: Run npm tests
env:
JFROG_CLI_LOG_LEVEL: DEBUG
YARN_IGNORE_NODE: 1
run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.npm
5 changes: 0 additions & 5 deletions .jfrog/projects/yarn.yaml

This file was deleted.

786 changes: 0 additions & 786 deletions .yarn/releases/yarn-3.2.1.cjs

This file was deleted.

1 change: 0 additions & 1 deletion .yarnrc.yml

This file was deleted.

2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ require (

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

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

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

Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/fluxxBot/build-info-go v1.10.10-0.20250220111243-f49d1e9424dd h1:OD3FTM4c63Ps2/HG/lCmMypbHv547eYOmSJd3z7n9S4=
github.com/fluxxBot/build-info-go v1.10.10-0.20250220111243-f49d1e9424dd/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE=
github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20250220111350-4932564cc094 h1:6OKXTYAcI2UZ+ck1kVreookLhYXOQsTF5ljqwo+xCpY=
github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20250220111350-4932564cc094/go.mod h1:Ufo60eJd+yncLxiOeVOvI3ORcn7RgU7pj4+plxJazN0=
github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20250220122433-4e7e5544641e h1:sEIyGi0adoFZnGZMmby0xzSXxkNZ8uO1L++bADvj9EI=
github.com/fluxxBot/jfrog-cli-artifactory v0.0.0-20250220122433-4e7e5544641e/go.mod h1:hj7R0pimmPKPY4hH2ey00vLodHoL1foiLANx3VyelBU=
github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250220100128-df6dfe522997 h1:f8ZaNxFmdAWUmvDxuLPz+skItqZH/3zeB5eA0sZbAYI=
github.com/fluxxBot/jfrog-cli-core/v2 v2.31.1-0.20250220100128-df6dfe522997/go.mod h1:Hx2houXADsNv0eRh4w5XCS2uSsPNPn1OmiSDdwGFB7g=
github.com/fluxxBot/jfrog-client-go v1.28.1-0.20250205140905-08198f526976 h1:YpkNUJ5vkEWhdvGh08L1apRexYcpcTYok7BloXmC7ng=
Expand Down
51 changes: 3 additions & 48 deletions npm_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -867,59 +867,14 @@ func TestYarnChangeVersionInV4(t *testing.T) {
assert.NoError(t, yarn.ConfigSet("unsafeHttpWhitelist", "[]", yarnExecPath, true))
}()

pwdCmd := exec.Command("pwd")
output, _ := pwdCmd.Output()
log.Error("0 ", string(output))

lsCmd := exec.Command("ls", "-al")
output, _ = lsCmd.Output()
log.Error("1 ", string(output))

catCmd := exec.Command("cat", ".yarnrc.yml")
output, _ = catCmd.Output()
log.Error("2 ", string(output))

lsYarnCmd := exec.Command("ls", ".yarn/releases")
output, _ = lsYarnCmd.Output()
log.Error("3 ", string(output))

jfrogCli := coretests.NewJfrogCli(execMain, "jfrog", "")
err = jfrogCli.Exec("yarn", "--version")
assert.NoError(t, err)

err = jfrogCli.Exec("yarn", "set", "version", "3.2.1")
assert.NoError(t, err)

pwdCmd1 := exec.Command("pwd")
output, err = pwdCmd1.Output()
if err != nil {
log.Error("3.5 error ", err.Error())
}
log.Error("3.5 ", string(output))

lsCmd1 := exec.Command("ls", "-al")
output, err = lsCmd1.Output()
if err != nil {
log.Error("4 error ", err.Error())
}
log.Error("4 ", string(output))

catCmd1 := exec.Command("cat", ".yarnrc.yml")
output, err = catCmd1.Output()
if err != nil {
log.Error("5 error ", err.Error())
}
log.Error("5 ", string(output))

lsYarnCmd1 := exec.Command("ls", ".yarn/releases")
output, err = lsYarnCmd1.Output()
if err != nil {
log.Error("6 error ", err.Error())
}
log.Error("6 ", string(output))

modifyExistingYarnRc(t, "3.2.1")
_ = jfrogCli.Exec("yarn", "--version")

err = jfrogCli.Exec("yarn", "--version")
assert.NoError(t, err)
}

// Checks if the expected dependencies match the actual dependencies. Only the dependencies' IDs and scopes (not more than one scope) are compared.
Expand Down
3 changes: 0 additions & 3 deletions package.json

This file was deleted.

0 comments on commit eb7d1dc

Please sign in to comment.