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

fix(tests): linting & more expects

Browse Source 
Also one more tweak for invite validation responsiveness
This commit is contained in:
Sabe Jones
2018-11-14 07:43:08 -06:00
committed by Phillip Thelen
parent dd2c2f62b8
commit 662e642729
10 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/api/v3/integration/challenges/GET-challenges_challengeId.test.js
View File

@@ -50,7 +50,7 @@ describe('GET /challenges/:challengeId', () => {
auth: { auth: {
local: { local: {
username: groupLeader.auth.local.username, username: groupLeader.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -116,7 +116,7 @@ describe('GET /challenges/:challengeId', () => {
auth: { auth: {
local: { local: {
username: challengeLeader.auth.local.username, username: challengeLeader.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -150,7 +150,7 @@ describe('GET /challenges/:challengeId', () => {
auth: { auth: {
local: { local: {
username: challengeLeader.auth.local.username, username: challengeLeader.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -206,7 +206,7 @@ describe('GET /challenges/:challengeId', () => {
auth: { auth: {
local: { local: {
username: challengeLeader.auth.local.username, username: challengeLeader.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -240,7 +240,7 @@ describe('GET /challenges/:challengeId', () => {
auth: { auth: {
local: { local: {
username: challengeLeader.auth.local.username, username: challengeLeader.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,

6
test/api/v3/integration/challenges/GET-challenges_challengeId_members.test.js
View File

@@ -63,7 +63,7 @@ describe('GET /challenges/:challengeId/members', () => {
auth: { auth: {
local: { local: {
username: groupLeader.auth.local.username, username: groupLeader.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -84,7 +84,7 @@ describe('GET /challenges/:challengeId/members', () => {
auth: { auth: {
local: { local: {
username: leader.auth.local.username, username: leader.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -107,7 +107,7 @@ describe('GET /challenges/:challengeId/members', () => {
auth: { auth: {
local: { local: {
username: anotherUser.auth.local.username, username: anotherUser.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,

2
test/api/v3/integration/challenges/GET-challenges_challengeId_members_memberId.test.js
View File

@@ -81,7 +81,7 @@ describe('GET /challenges/:challengeId/members/:memberId', () => {
await groupLeader.post(`/tasks/challenge/${challenge._id}`, [{type: 'habit', text: taskText}]); await groupLeader.post(`/tasks/challenge/${challenge._id}`, [{type: 'habit', text: taskText}]);
let memberProgress = await user.get(`/challenges/${challenge._id}/members/${groupLeader._id}`); let memberProgress = await user.get(`/challenges/${challenge._id}/members/${groupLeader._id}`);
expect(memberProgress).to.have.all.keys(['_id', 'id', 'profile', 'tasks']); expect(memberProgress).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile', 'tasks']);
expect(memberProgress.profile).to.have.all.keys(['name']); expect(memberProgress.profile).to.have.all.keys(['name']);
expect(memberProgress.tasks.length).to.equal(1); expect(memberProgress.tasks.length).to.equal(1);
}); });

28
test/api/v3/integration/challenges/GET-challenges_group_groupid.test.js
View File

@@ -42,7 +42,7 @@ describe('GET challenges/groups/:groupId', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -57,7 +57,7 @@ describe('GET challenges/groups/:groupId', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -77,7 +77,7 @@ describe('GET challenges/groups/:groupId', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -92,7 +92,7 @@ describe('GET challenges/groups/:groupId', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -160,7 +160,7 @@ describe('GET challenges/groups/:groupId', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -175,7 +175,7 @@ describe('GET challenges/groups/:groupId', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -286,7 +286,7 @@ describe('GET challenges/groups/:groupId', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -301,7 +301,7 @@ describe('GET challenges/groups/:groupId', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -321,7 +321,7 @@ describe('GET challenges/groups/:groupId', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -336,7 +336,7 @@ describe('GET challenges/groups/:groupId', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -371,7 +371,7 @@ describe('GET challenges/groups/:groupId', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -386,7 +386,7 @@ describe('GET challenges/groups/:groupId', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -406,7 +406,7 @@ describe('GET challenges/groups/:groupId', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -421,7 +421,7 @@ describe('GET challenges/groups/:groupId', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,

10
test/api/v3/integration/challenges/GET-challenges_user.test.js
View File

@@ -43,7 +43,7 @@ describe('GET challenges/user', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -73,7 +73,7 @@ describe('GET challenges/user', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -98,7 +98,7 @@ describe('GET challenges/user', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -128,7 +128,7 @@ describe('GET challenges/user', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -153,7 +153,7 @@ describe('GET challenges/user', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,

2
test/api/v3/integration/challenges/POST-challenges_challengeId_join.test.js
View File

@@ -82,7 +82,7 @@ describe('POST /challenges/:challengeId/join', () => {
auth: { auth: {
local: { local: {
username: groupLeader.auth.local.username, username: groupLeader.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,

2
test/api/v3/integration/challenges/PUT-challenges_challengeId.test.js
View File

@@ -82,7 +82,7 @@ describe('PUT /challenges/:challengeId', () => {
auth: { auth: {
local: { local: {
username: member.auth.local.username, username: member.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,

2
test/api/v3/integration/groups/GET-groups_groupId_invites.test.js
View File

@@ -53,7 +53,7 @@ describe('GET /groups/:groupId/invites', () => {
auth: { auth: {
local: { local: {
username: invited.auth.local.username, username: invited.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,

4
test/api/v3/integration/groups/GET-groups_groupId_members.test.js
View File

@@ -59,7 +59,7 @@ describe('GET /groups/:groupId/members', () => {
auth: { auth: {
local: { local: {
username: user.auth.local.username, username: user.auth.local.username,
} },
}, },
flags: { flags: {
verifiedUsername: true, verifiedUsername: true,
@@ -145,7 +145,7 @@ describe('GET /groups/:groupId/members', () => {
let res = await user.get('/groups/party/members?includeAllMembers=true'); let res = await user.get('/groups/party/members?includeAllMembers=true');
expect(res.length).to.equal(30); expect(res.length).to.equal(30);
res.forEach(member => { res.forEach(member => {
expect(member).to.have.all.keys(['_id', 'id', 'profile']); expect(member).to.have.all.keys(['_id', 'auth', 'flags', 'id', 'profile']);
expect(member.profile).to.have.all.keys(['name']); expect(member.profile).to.have.all.keys(['name']);
}); });
}); });

11
website/client/components/groups/inviteModal.vue
View File

@@ -11,7 +11,8 @@
type='text', type='text',
:placeholder='$t("emailOrUsernameInvite")', :placeholder='$t("emailOrUsernameInvite")',
v-model='invite.text', v-model='invite.text',
v-on:keyup='checkInviteList', v-on:keyup='expandInviteList',
v-on:change='checkInviteList',
:class='{"input-valid": invite.valid, "is-invalid input-invalid": invite.valid === false}', :class='{"input-valid": invite.valid, "is-invalid input-invalid": invite.valid === false}',
) )
.input-error.text-center.mt-2(v-if="invite.error") {{ invite.error }} .input-error.text-center.mt-2(v-if="invite.error") {{ invite.error }}
@@ -124,11 +125,10 @@
}, },
methods: { methods: {
checkInviteList: debounce(function checkList () { checkInviteList: debounce(function checkList () {
this.invites = filter(this.invites, (invite) => { this.invites = filter(this.invites, (invite, index) => {
return invite.text.length > 0; return invite.text.length > 0 || index === this.invites.length - 1;
}); });
while (this.invites.length < 2) this.invites.push(clone(INVITE_DEFAULTS)); while (this.invites.length < 2) this.invites.push(clone(INVITE_DEFAULTS));
if (this.invites[this.invites.length - 1].text.length > 0) this.invites.push(clone(INVITE_DEFAULTS));
forEach(this.invites, (value, index) => { forEach(this.invites, (value, index) => {
if (value.text.length < 1 || isEmail(value.text)) { if (value.text.length < 1 || isEmail(value.text)) {
return this.fillErrors(index); return this.fillErrors(index);
@@ -148,6 +148,9 @@
} }
}); });
}, 250), }, 250),
expandInviteList () {
if (this.invites[this.invites.length - 1].text.length > 0) this.invites.push(clone(INVITE_DEFAULTS));
},
fillErrors (index, res) { fillErrors (index, res) {
if (!res || res.status === 200) { if (!res || res.status === 200) {
this.invites[index].error = null; this.invites[index].error = null;