ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'runelite/master' into 2308-merge

Browse Source
This commit is contained in:
Owain van Brakel
2019-08-23 02:31:44 +02:00
parent b57a682ce7 664ab26de9
commit 748801d562
30 changed files with 416 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
http-service/src/test/java/net/runelite/http/service/loottracker/LootTrackerControllerTest.java
View File

@@ -83,10 +83,10 @@ public class LootTrackerControllerTest
lootRecord.setTime(Instant.now());
lootRecord.setDrops(Collections.singletonList(new GameItem(4151, 1)));
String data = RuneLiteAPI.GSON.toJson(lootRecord);
String data = RuneLiteAPI.GSON.toJson(Collections.singletonList(lootRecord));
mockMvc.perform(post("/loottracker").content(data).contentType(MediaType.APPLICATION_JSON))
.andExpect(status().isOk());
verify(lootTrackerService).store(eq(lootRecord), anyInt());
verify(lootTrackerService).store(eq(Collections.singletonList(lootRecord)), anyInt());
}
}