From 965b7a3be7058bd0b5e69989c06539eed9a16e84 Mon Sep 17 00:00:00 2001 From: Isabelle Lavandero <30595954+thefifthisa@users.noreply.github.com> Date: Mon, 30 Jul 2018 10:05:00 -0400 Subject: [PATCH] Mana bar no longer shown on profile if user has opted out of class system (#10560) * no more mana bar shown on profile if user has opted out of class system * edit tests for preferences --- .../v3/integration/groups/GET-groups_groupId_members.test.js | 4 ++-- test/api/v3/integration/members/GET-members_id.test.js | 2 +- website/server/models/user/index.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/api/v3/integration/groups/GET-groups_groupId_members.test.js b/test/api/v3/integration/groups/GET-groups_groupId_members.test.js index d2f321c1fa..cbbe45b546 100644 --- a/test/api/v3/integration/groups/GET-groups_groupId_members.test.js +++ b/test/api/v3/integration/groups/GET-groups_groupId_members.test.js @@ -77,7 +77,7 @@ describe('GET /groups/:groupId/members', () => { expect(Object.keys(memberRes.auth)).to.eql(['timestamps']); expect(Object.keys(memberRes.preferences).sort()).to.eql([ 'size', 'hair', 'skin', 'shirt', - 'chair', 'costume', 'sleep', 'background', 'tasks', + 'chair', 'costume', 'sleep', 'background', 'tasks', 'disableClasses', ].sort()); expect(memberRes.stats.maxMP).to.exist; @@ -98,7 +98,7 @@ describe('GET /groups/:groupId/members', () => { expect(Object.keys(memberRes.auth)).to.eql(['timestamps']); expect(Object.keys(memberRes.preferences).sort()).to.eql([ 'size', 'hair', 'skin', 'shirt', - 'chair', 'costume', 'sleep', 'background', 'tasks', + 'chair', 'costume', 'sleep', 'background', 'tasks', 'disableClasses', ].sort()); expect(memberRes.stats.maxMP).to.exist; diff --git a/test/api/v3/integration/members/GET-members_id.test.js b/test/api/v3/integration/members/GET-members_id.test.js index 7a4f23fb80..1dca0284b9 100644 --- a/test/api/v3/integration/members/GET-members_id.test.js +++ b/test/api/v3/integration/members/GET-members_id.test.js @@ -37,7 +37,7 @@ describe('GET /members/:memberId', () => { expect(Object.keys(memberRes.auth)).to.eql(['timestamps']); expect(Object.keys(memberRes.preferences).sort()).to.eql([ 'size', 'hair', 'skin', 'shirt', - 'chair', 'costume', 'sleep', 'background', 'tasks', + 'chair', 'costume', 'sleep', 'background', 'tasks', 'disableClasses', ].sort()); expect(memberRes.stats.maxMP).to.exist; diff --git a/website/server/models/user/index.js b/website/server/models/user/index.js index 6875d58df8..5521f21290 100644 --- a/website/server/models/user/index.js +++ b/website/server/models/user/index.js @@ -7,7 +7,7 @@ require('./methods'); // A list of publicly accessible fields (not everything from preferences because there are also a lot of settings tha should remain private) export let publicFields = `preferences.size preferences.hair preferences.skin preferences.shirt - preferences.chair preferences.costume preferences.sleep preferences.background preferences.tasks profile stats + preferences.chair preferences.costume preferences.sleep preferences.background preferences.tasks preferences.disableClasses profile stats achievements party backer contributor auth.timestamps items inbox.optOut loginIncentives flags.classSelected`; // The minimum amount of data needed when populating multiple users