diff --git a/test/api/v4/faq/GET-faq.test.js b/test/api/v4/faq/GET-faq.test.js index f18eddd625..7b2f6439f6 100644 --- a/test/api/v4/faq/GET-faq.test.js +++ b/test/api/v4/faq/GET-faq.test.js @@ -12,7 +12,7 @@ describe('GET /faq', () => { expect(res).to.have.property('stillNeedHelp'); expect(res.stillNeedHelp.ios).to.equal(translate('iosFaqStillNeedHelp')); expect(res).to.have.property('questions'); - expect(res.questions[0].question).to.equal(translate('faqQuestion0')); + expect(res.questions[0].question).to.equal(translate('faqQuestion25')); }); it('returns faq not in English', async () => { @@ -29,20 +29,6 @@ describe('GET /faq', () => { }); describe('platform parameter', () => { - it('returns faq with answers for ios platform only', async () => { - const res = await requester().get('/faq?platform=ios'); - - expect(res).to.have.property('stillNeedHelp'); - expect(res.stillNeedHelp).to.eql({ ios: translate('iosFaqStillNeedHelp') }); - - expect(res).to.have.property('questions'); - expect(res.questions[0]).to.eql({ - exclusions: [], - heading: 'overview', - question: translate('faqQuestion0'), - ios: translate('iosFaqAnswer0'), - }); - }); it('returns an error when invalid platform parameter is specified', async () => { const request = requester().get('/faq?platform=wrong'); await expect(request) @@ -60,9 +46,9 @@ describe('GET /faq', () => { expect(res).to.have.property('questions'); expect(res.questions[0]).to.eql({ exclusions: [], - heading: 'overview', - question: translate('faqQuestion0'), - android: translate('androidFaqAnswer0'), + heading: 'task-types', + question: translate('faqQuestion25'), + web: translate('webFaqAnswer25'), }); }); }); diff --git a/test/content/faq.js b/test/content/faq.js index 96df559f55..e32f8d3d6b 100644 --- a/test/content/faq.js +++ b/test/content/faq.js @@ -15,12 +15,6 @@ describe('FAQ Locales', () => { }); }); - it('has a valid ios answers', () => { - each(questions, question => { - expectValidTranslationString(question.ios); - }); - }); - it('has a valid web answers', () => { each(questions, question => { expectValidTranslationString(question.web); @@ -29,10 +23,6 @@ describe('FAQ Locales', () => { }); describe('Still Need Help Message', () => { - it('has a valid ios message', () => { - expectValidTranslationString(stillNeedHelp.ios); - }); - it('has a valid web message', () => { expectValidTranslationString(stillNeedHelp.web); }); diff --git a/website/client/src/components/static/faq.vue b/website/client/src/components/static/faq.vue index 5ac636ddea..88e9d04a1a 100644 --- a/website/client/src/components/static/faq.vue +++ b/website/client/src/components/static/faq.vue @@ -1,85 +1,304 @@