Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: true
- name: Echo
run: |
echo $JF_CLI_TEST_URL
echo ${{ secrets.JFROG_CLI_TEST_URL }}
echo $JF_CLI_TEST_USER

ref: ${{ github.event.pull_request.head.sha }}
- name: Unlabel 'safe to test'
uses: actions-ecosystem/action-remove-labels@v1
if: ${{ github.event_name != 'push' }}
with:
labels: "safe to test"
# Install required tools
- name: Set up Java
uses: actions/setup-java@v3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ public class JfrogCliDriverTest {
private final SimpleDateFormat timeStampFormat = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss");
private final Map<String, String> testEnv = new HashMap<>();
private JfrogCliDriver jfrogCliDriver;
private final String PASSWORD = "ide-plugins-common-test-password";
private final String USER_NAME = "ide-plugins-common-test-user";
private final String SERVER_URL = "https://ide/plugins/common/test/";
private final String PASSWORD = System.getenv("JF_CLI_TEST_PASSWORD");
private final String USER_NAME = System.getenv("JF_CLI_TEST_USER");
private final String SERVER_URL = System.getenv("JF_CLI_TEST_URL");
private final String ACCESS_TOKEN = System.getenv("JF_CLI_TEST_ACCESS_TOKEN");
private final String ARTIFACTORY_URL = SERVER_URL + "artifactory/";
private final String XRAY_URL = SERVER_URL + "xray/";
private String testServerId;
Expand Down Expand Up @@ -135,12 +136,11 @@ public void testAddCliServerConfig_withUsernameAndPassword() {

@Test
public void testAddCliServerConfig_withAccessToken() {
String accessToken = UUID.randomUUID().toString();
try {
jfrogCliDriver.addCliServerConfig(XRAY_URL, ARTIFACTORY_URL, testServerId, null, null, accessToken, tempDir);
jfrogCliDriver.addCliServerConfig(XRAY_URL, ARTIFACTORY_URL, testServerId, null, null, ACCESS_TOKEN, tempDir);
JfrogCliServerConfig serverConfig = jfrogCliDriver.getServerConfig(tempDir, Collections.emptyList());
assertNotNull(serverConfig);
assertEquals(serverConfig.getAccessToken(), accessToken);
assertEquals(serverConfig.getAccessToken(), ACCESS_TOKEN);
assertEquals(serverConfig.getArtifactoryUrl(), ARTIFACTORY_URL);
assertEquals(serverConfig.getXrayUrl(), XRAY_URL);
} catch (IOException e) {
Expand Down
Loading