Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
Sabe Jones
2020-08-18 15:29:03 -05:00
parent 60ffc1fdaf 56df62cf49
commit 0e9ac6d4f2
117 changed files with 492 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/api/v3/integration/emails/GET-email-unsubscribe.test.js
+2 -2
View File
@@ -53,7 +53,7 @@ describe('GET /email/unsubscribe', () => {
const unsubscribedMessage = await user.get(`/email/unsubscribe?code=${code}`);
expect(unsubscribedMessage).to.equal('<h1>Unsubscribed successfully!</h1> You won\'t receive any other email from Habitica.');
expect(unsubscribedMessage).to.equal('<h1>Unsubscribed successfully!</h1> You won’t receive any other email from Habitica.');
});
it('returns okay when email is already unsubscribed', async () => {
@@ -63,6 +63,6 @@ describe('GET /email/unsubscribe', () => {
const unsubscribedMessage = await user.get(`/email/unsubscribe?code=${code}`);
expect(unsubscribedMessage).to.equal('<h1>Unsubscribed successfully!</h1> You won\'t receive any other email from Habitica.');
expect(unsubscribedMessage).to.equal('<h1>Unsubscribed successfully!</h1> You won’t receive any other email from Habitica.');
});
});
test/api/v3/integration/user/buy/POST-user_buy_gear.test.js
+1 -1
View File
@@ -61,7 +61,7 @@ describe('POST /user/buy-gear/:key', () => {
.to.eventually.be.rejected.and.eql({
code: 401,
error: 'NotAuthorized',
message: 'You can\'t buy this item.',
message: 'You can’t buy this item.',
});
});
});