test

npm_test.go

@@ -806,32 +806,16 @@ func TestYarnInV4(t *testing.T) {
 	testDataTarget := filepath.Join(tempDirPath, tests.Out, "yarn")
 	assert.NoError(t, biutils.CopyDir(testDataSource, testDataTarget, true, nil))
 
-	yarnProjectPath := filepath.Join(testDataTarget, "yarnprojectV4")
-	assert.NoError(t, createConfigFileForTest([]string{yarnProjectPath}, tests.NpmRemoteRepo, "", t, project.Yarn, false))
-
 	wd, err := os.Getwd()
 	assert.NoError(t, err, "Failed to get current dir")
+
+	yarnProjectPath := filepath.Join(testDataTarget, "yarnprojectV4")
+	assert.NoError(t, createConfigFileForTest([]string{yarnProjectPath}, tests.NpmRemoteRepo, "", t, project.Yarn, false))
 	chdirCallback := clientTestUtils.ChangeDirWithCallback(t, wd, yarnProjectPath)
 	defer chdirCallback()
 	cleanUpYarnGlobalFolder := clientTestUtils.SetEnvWithCallbackAndAssert(t, "YARN_GLOBAL_FOLDER", tempDirPath)
 	defer cleanUpYarnGlobalFolder()
 
-	// Add "localhost" to http whitelist
-	yarnExecPath, err := exec.LookPath("yarn")
-	assert.NoError(t, err)
-	// Get original http white list config
-	origWhitelist, err := yarn.ConfigGet("unsafeHttpWhitelist", yarnExecPath, true)
-	log.Error("origWhiteList = ", origWhitelist)
-	if err != nil {
-		log.Error("error = ", err.Error())
-	}
-	assert.NoError(t, err)
-	assert.NoError(t, yarn.ConfigSet("unsafeHttpWhitelist", "[\"localhost\"]", yarnExecPath, true))
-	defer func() {
-		// Restore original whitelist config
-		assert.NoError(t, yarn.ConfigSet("unsafeHttpWhitelist", origWhitelist, yarnExecPath, true))
-	}()
-
 	jfrogCli := coretests.NewJfrogCli(execMain, "jfrog", "")
 	err = jfrogCli.Exec("yarn", "install")
 	assert.Error(t, err)
@@ -862,17 +846,35 @@ func TestYarnChangeVersionInV4(t *testing.T) {
 	// Add "localhost" to http whitelist
 	yarnExecPath, err := exec.LookPath("yarn")
 	assert.NoError(t, err)
-	// Get original http white list config
-	origWhitelist, err := yarn.ConfigGet("unsafeHttpWhitelist", yarnExecPath, true)
-	assert.NoError(t, err)
-	assert.NoError(t, yarn.ConfigSet("unsafeHttpWhitelist", "[\"localhost\"]", yarnExecPath, true))
 	defer func() {
 		// Restore original whitelist config
-		assert.NoError(t, yarn.ConfigSet("unsafeHttpWhitelist", origWhitelist, yarnExecPath, true))
+		assert.NoError(t, yarn.ConfigSet("unsafeHttpWhitelist", "[]", yarnExecPath, true))
 	}()
 
+	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", "set", "version", "3.2.1")
+
+	output, _ = lsCmd.Output()
+	log.Error("4 ", string(output))
+
+	output, _ = catCmd.Output()
+	log.Error("5 ", string(output))
+
+	output, _ = lsYarnCmd.Output()
+	log.Error("6 ", string(output))
+
 	assert.NoError(t, err)
 	modifyExistingYarnRc(t, "3.2.1")
 }