MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrew DeMaria
2019-07-03 19:50:54 -06:00
parent 3d0d0482f5 967c32b92f
commit 0124aa63bd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -10,4 +10,4 @@ matrix:
- jdk: openjdk8 - jdk: openjdk8
- jdk: oraclejdk9 - jdk: oraclejdk9
- jdk: openjdk11 - jdk: openjdk11
- jdk: openjdk12
integration-test/src/test/java/org/airsonic/test/cucumber/steps/api/StreamStepDef.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class StreamStepDef implements En {
public StreamStepDef(AirsonicServer server) { public StreamStepDef(AirsonicServer server) {
mapper.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS); mapper.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS);
this.client = HttpClientBuilder.create().build(); this.client = HttpClientBuilder.create().build();
Given("Media file (.*) is added", (String streamName) -> { Given("Media file {word} is added", (String streamName) -> {
this.streamName = streamName; this.streamName = streamName;
server.uploadToDefaultMusicFolder( server.uploadToDefaultMusicFolder(
Paths.get(this.getClass().getResource("/blobs/stream/" + streamName + "/input").toURI()), Paths.get(this.getClass().getResource("/blobs/stream/" + streamName + "/input").toURI()),