Skip to content

Commit b21eaa1

Browse files
committed
Update GitHub workflow
1 parent 54b6db3 commit b21eaa1

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

.github/workflows/workflows.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
name: Tests
22

3-
on: [ push ]
3+
on:
4+
push:
5+
workflow_dispatch:
46

57
jobs:
68
tests:
79
runs-on: ubuntu-latest
810
strategy:
911
matrix:
10-
java: [ 8, 11 ]
12+
java:
13+
- 17
1114

1215
steps:
1316
- uses: actions/checkout@v2
@@ -31,6 +34,10 @@ jobs:
3134

3235
steps:
3336
- uses: actions/checkout@v2
37+
- name: Set up JDK
38+
uses: actions/setup-java@v1
39+
with:
40+
java-version: 17
3441
- name: Run Dependency Check
3542
run: mvn -Powasp-dependency-check verify -DskipTests
3643
- name: Archive code coverage results

src/test/java/eu/openanalytics/shinyproxy/test/api/AppControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public void testProxy() {
193193
resp = apiTestHelper.callWithAuth(apiTestHelper.createRequest("/app_proxy/" + id + "/").addHeader("Accept", "text/html"));
194194
resp.assertHtmlSuccess();
195195
Assertions.assertTrue(resp.body().contains("Welcome to nginx!"));
196-
Assertions.assertTrue(resp.body().endsWith("<script src='/5e89c377af39026486b5a487ad46f0b55d6031aa/js/shiny.iframe.js'></script>"));
196+
Assertions.assertTrue(resp.body().endsWith("<script src='/dc8ccb537b895e1d7d3713e4de9e76058cdee04b/js/shiny.iframe.js'></script>"));
197197

198198
// normal sub-path request
199199
resp = apiTestHelper.callWithAuth(apiTestHelper.createRequest("/app_proxy/" + id + "/my-path"));

src/test/resources/application-test-api.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ proxy:
2626
- name: demo2
2727
password: demo2
2828

29-
docker:
30-
url: http://localhost:2375
31-
32-
3329
specs:
3430
- id: nobody
3531
container-image: openanalytics/shinyproxy-integration-test-app:latest

0 commit comments

Comments
 (0)