fix xray tests

jfrog · Jan 17, 2024 · a120a5b · a120a5b
1 parent 55cbe0b
commit a120a5b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/tests/config.go b/tests/config.go
@@ -20,7 +20,6 @@ var (
 	RtAuth        auth.ServiceDetails
 	RtHttpDetails httputils.HttpClientDetails
 
-	XrayCli     *coreTests.JfrogCli
 	PlatformCli *coreTests.JfrogCli
 
 	TestApplication *components.App

diff --git a/tests/utils/test_config.go b/tests/utils/test_config.go
@@ -52,9 +52,6 @@ func InitTestCliDetails() {
 	testApplication := cli.GetJfrogCliSecurityApp()
 
 	configTests.TestApplication = &testApplication
-	if configTests.XrayCli == nil {
-		configTests.XrayCli = coreTests.NewJfrogCli(func() error { return plugins.RunCliWithPlugin(*configTests.TestApplication)() }, "xr", creds)
-	}
 	if configTests.PlatformCli == nil {
 		configTests.PlatformCli = coreTests.NewJfrogCli(func() error { return plugins.RunCliWithPlugin(*configTests.TestApplication)() }, "", creds)
 	}

diff --git a/xray_test.go b/xray_test.go
@@ -16,10 +16,10 @@ func TestXrayCurl(t *testing.T) {
 	securityTestUtils.CreateJfrogHomeConfig(t, true)
 	defer securityTestUtils.CleanTestsHomeEnv()
 	// Check curl command with the default configured server.
-	err := securityTests.XrayCli.WithoutCredentials().Exec("curl", "-XGET", "/api/v1/system/version")
+	err := securityTests.PlatformCli.WithoutCredentials().Exec("xr", "curl", "-XGET", "/api/v1/system/version")
 	assert.NoError(t, err)
 	// Check curl command with '--server-id' flag
-	err = securityTests.XrayCli.WithoutCredentials().Exec("curl", "-XGET", "/api/system/version", "--server-id=default")
+	err = securityTests.PlatformCli.WithoutCredentials().Exec("xr", "curl", "-XGET", "/api/system/version", "--server-id=default")
 	assert.NoError(t, err)
 	// Check curl command with invalid server id - should get an error.
 	err = securityTests.PlatformCli.WithoutCredentials().Exec("xr", "curl", "-XGET", "/api/system/version", "--server-id=not_configured_name")