Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix tests #389

Merged
merged 1 commit into from
Aug 25, 2024
Merged
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
23 changes: 9 additions & 14 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,23 @@ jobs:
gradlewSuffix: .bat
runs-on: ${{ matrix.os }}-latest
steps:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.20.x
cache: false
- name: Checkout code
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Setup Artifactory
run: |
go install github.com/jfrog/jfrog-testing-infra/local-rt-setup@latest
~/go/bin/local-rt-setup
env:
RTLIC: ${{secrets.RTLIC}}
GOPROXY: direct
- name: Setup Go with cache
uses: jfrog/.github/actions/install-go-with-cache@main

- name: Install local Artifactory
uses: jfrog/.github/actions/install-local-artifactory@main
with:
RTLIC: ${{ secrets.RTLIC }}

- name: Install Java
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: "8"
distribution: "temurin"
distribution: "zulu"

- name: Run tests
run: ./gradlew${{ matrix.gradlewSuffix }} clean test
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ class BowerPackageTypeRepositoryTests extends BaseRepositoryTests {
assertThat(vcsType, CoreMatchers.is(expectedSettings.getVcsType()))

// virtual
assertFalse(externalDependenciesEnabled)
assertThat(externalDependenciesPatterns, CoreMatchers.nullValue())
assertThat(externalDependenciesRemoteRepo, CoreMatchers.nullValue())
assertThat(externalDependenciesEnabled, CoreMatchers.is(expectedSettings.getExternalDependenciesEnabled()))
assertThat(externalDependenciesPatterns, CoreMatchers.is(expectedSettings.getExternalDependenciesPatterns()))
assertThat(externalDependenciesRemoteRepo, CoreMatchers.is(expectedSettings.getExternalDependenciesRemoteRepo()))
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,10 @@ public void testGetPermissionTarget() {
PermissionTarget permissionTarget = artifactory.security().permissionTarget("Anything");
assertEquals("Anything", permissionTarget.getName());
assertTrue(permissionTarget.getIncludesPattern().contains("**"));
assertTrue(permissionTarget.getRepositories().size() > 0);
assertFalse(permissionTarget.getRepositories().isEmpty());
assertEquals("ANY", permissionTarget.getRepositories().get(0));
assertNotNull(permissionTarget.getPrincipals());
assertNotNull(permissionTarget.getPrincipals().getUsers());
final String user = permissionTarget.getPrincipals().getUsers().get(0).getName();
assertFalse(permissionTarget.getPrincipals().getUser(user).getPrivileges().contains(Privilege.ADMIN));
assertFalse(permissionTarget.getPrincipals().getUser(user).getPrivileges().contains(Privilege.DELETE));
assertTrue(permissionTarget.getPrincipals().getUser(user).getPrivileges().contains(Privilege.READ));
assertNotNull(permissionTarget.getPrincipals().getGroups());
}

Expand Down
Loading