Merge remote-tracking branch 'origin/pr/1158'

6 years ago · 0124aa63bd
parent 3d0d0482f5 967c32b92f
commit 0124aa63bd
2 changed files with 2 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -10,4 +10,4 @@ matrix:
  - jdk: openjdk8
  - jdk: oraclejdk9
  - jdk: openjdk11
-  
+  - jdk: openjdk12
--- a/integration-test/src/test/java/org/airsonic/test/cucumber/steps/api/StreamStepDef.java
+++ b/integration-test/src/test/java/org/airsonic/test/cucumber/steps/api/StreamStepDef.java
@ -43,7 +43,7 @@ public class StreamStepDef implements En {
    public StreamStepDef(AirsonicServer server) {
        mapper.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS);
        this.client = HttpClientBuilder.create().build();
-        Given("Media file (.*) is added", (String streamName) -> {
+        Given("Media file {word} is added", (String streamName) -> {
            this.streamName = streamName;
            server.uploadToDefaultMusicFolder(
                    Paths.get(this.getClass().getResource("/blobs/stream/" + streamName + "/input").toURI()),