krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

resolving conflicts

Browse Source
This commit is contained in:
Victor Piousbox
2016-04-04 16:37:51 +00:00
parent 14b0ec8b03 68ff26e6d6
commit 4c0f9ed1c8
20 changed files with 582 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/api/v3/integration/user/PUT-user_update_webhook.test.js
View File

@@ -25,7 +25,7 @@ describe('PUT /user/webhook/:id', () => {
await user.sync();
expect(user.preferences.webhooks[response.id].url).to.not.eql(url);
let response2 = await user.put(`/user/webhook/${response.id}`, {url, enabled});
expect(response2).to.eql({});
expect(response2.url).to.eql(url);
await user.sync();
expect(user.preferences.webhooks[response.id].url).to.eql(url);
});