CR changes

Author: attiasas

.github/workflows/test.yml

@@ -2,6 +2,10 @@ name: JFrog CLI Security Tests
 
 on:
   push:
+    branches:
+      - '**'
+    tags-ignore:
+      - '**'
   # Triggers the workflow on labeled PRs only.
   pull_request_target:
     types: [ labeled ]

commands/curation/curationaudit_test.go

@@ -672,9 +672,9 @@ func getTestCasesForDoCurationAudit() []testCase {
 			pathToPreTest: "pretest",
 			preTestExec:   "mvn",
 			funcToGetGoals: func(t *testing.T) []string {
-				// We want to fill the cache with dependencies before the tests to only resolve in the test the blocked package
-				// Cache dir is determined by the project dir so we need to "fake" the cache dir when we run the pretest build.
-				// When we run the test we will resolve the blocked package from the same cache dir that was filled in the pretest build.
+				// We want to populate the cache with dependencies before running the tests, so that during the test only the blocked package needs to be resolved.
+				// The cache directory is determined by the project directory, so we need to "simulate" the cache directory when running the pretest build.
+				// During the test, the blocked package will be resolved from the same cache directory that was populated in the pretest build.
 				cleanUpTestDirChange := testUtils.ChangeWDWithCallback(t, filepath.Join("..", "test"))
 				curationCache, err := utils.GetCurationCacheFolderByTech(techutils.Maven)
 				require.NoError(t, err)

tests/utils/integration/test_integrationutils.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	"os/exec"
 	"path/filepath"
 	"testing"
 
@@ -156,10 +155,6 @@ func InitGitTest(t *testing.T) {
 	if !*configTests.TestGit {
 		t.Skip(getSkipTestMsg("Git commands integration", "--test.git"))
 	}
-	err := exec.Command("npm", "install").Run()
-	if err != nil {
-		t.Skipf("Skipping Git commands integration tests. Git is not installed. %s", err.Error())
-	}
 }
 
 func CreateJfrogHomeConfig(t *testing.T, encryptPassword bool) {

tests/utils/test_utils.go

@@ -24,7 +24,6 @@ import (
 	configTests "github.com/jfrog/jfrog-cli-security/tests"
 	"github.com/stretchr/testify/assert"
 
-	// coreTests "github.com/jfrog/jfrog-cli-core/v2/utils/tests"
 	"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 	clientTests "github.com/jfrog/jfrog-client-go/utils/tests"
@@ -129,17 +128,17 @@ func CreateTestWatch(t *testing.T, policyName string, watchName, severity xrayUt
 	}
 }
 
-func CreateTestProjectEnvInTempDir(t *testing.T, projectPath string) (string, func()) {
-	// We are not using coreTests.CreateTempDirWithCallbackAndAssert(t) since the callback fails to remove the temp dir on Windows. (Unknown reason)
-	// tempDirPath, createTempDirCallback := coreTests.CreateTempDirWithCallbackAndAssert(t)
+func CreateTestProjectInTempDir(t *testing.T, projectPath string) (string, func()) {
+	// TODO: We are not using coreTests.CreateTempDirWithCallbackAndAssert(t) since the callback fails to remove the temp dir on Windows.
+	// (Unknown reason, should be investigated)
 	tempDirPath := t.TempDir()
 	maskedPath := filepath.Join(tempDirPath, filepath.Base(projectPath))
 	assert.NoError(t, biutils.CopyDir(projectPath, maskedPath, true, nil))
-	return maskedPath, func(){}
+	return maskedPath, func() {}
 }
 
 func CreateTestProjectEnvAndChdir(t *testing.T, projectPath string) (string, func()) {
-	tempDirPath, createTempDirCallback := CreateTestProjectEnvInTempDir(t, projectPath)
+	tempDirPath, createTempDirCallback := CreateTestProjectInTempDir(t, projectPath)
 	prevWd := ChangeWD(t, tempDirPath)
 	return tempDirPath, func() {
 		clientTests.ChangeDirAndAssert(t, prevWd)