diff --git a/webapp/components/DonationInfo/DonationInfo.spec.js b/webapp/components/DonationInfo/DonationInfo.spec.js index 8d20042b0..5b4e95435 100644 --- a/webapp/components/DonationInfo/DonationInfo.spec.js +++ b/webapp/components/DonationInfo/DonationInfo.spec.js @@ -21,12 +21,6 @@ describe('DonationInfo.vue', () => { const Wrapper = () => mount(DonationInfo, { mocks, localVue }) - it('includes a link to the ocelot.social donations website', () => { - expect(Wrapper().find('a').attributes('href')).toBe( - 'https://ocelot-social.herokuapp.com/donations', - ) - }) - it('displays a call to action button', () => { expect(Wrapper().find('.base-button').text()).toBe('donations.donate-now') }) diff --git a/webapp/components/LoginButton/LoginButton.spec.js b/webapp/components/LoginButton/LoginButton.spec.js index f28045612..62e663714 100644 --- a/webapp/components/LoginButton/LoginButton.spec.js +++ b/webapp/components/LoginButton/LoginButton.spec.js @@ -1,9 +1,9 @@ import { config, mount } from '@vue/test-utils' -import InviteButton from './InviteButton.vue' +import LoginButton from './LoginButton.vue' config.stubs['v-popover'] = '' -describe('InviteButton.vue', () => { +describe('LoginButton.vue', () => { let wrapper let mocks let propsData @@ -22,7 +22,7 @@ describe('InviteButton.vue', () => { describe('mount', () => { const Wrapper = () => { - return mount(InviteButton, { mocks, propsData }) + return mount(LoginButton, { mocks, propsData }) } beforeEach(() => { @@ -30,24 +30,12 @@ describe('InviteButton.vue', () => { }) it('renders', () => { - expect(wrapper.contains('.invite-button')).toBe(true) + expect(wrapper.contains('.login-button')).toBe(true) }) it('open popup', () => { wrapper.find('.base-button').trigger('click') - expect(wrapper.contains('.invite-button')).toBe(true) - }) - - it('invite codes not available', async () => { - wrapper.find('.base-button').trigger('click') // open popup - wrapper.find('.invite-button').trigger('click') // click copy button - expect(mocks.$t).toHaveBeenCalledWith('invite-codes.not-available') - }) - - it.skip('invite codes copied to clipboard', async () => { - wrapper.find('.base-button').trigger('click') // open popup - wrapper.find('.invite-button').trigger('click') // click copy button - expect(mocks.$t).toHaveBeenCalledWith('invite-codes.not-available') + expect(wrapper.contains('.login-button')).toBe(true) }) }) }) diff --git a/webapp/components/PageFooter/PageFooter.spec.js b/webapp/components/PageFooter/PageFooter.spec.js index c0c32c4c4..7b104add2 100644 --- a/webapp/components/PageFooter/PageFooter.spec.js +++ b/webapp/components/PageFooter/PageFooter.spec.js @@ -29,8 +29,8 @@ describe('PageFooter.vue', () => { wrapper = Wrapper() }) - it('renders four links', () => { - expect(wrapper.findAll('a')).toHaveLength(4) + it('renders five links', () => { + expect(wrapper.findAll('a')).toHaveLength(5) }) it('renders three nuxt-links', () => { @@ -56,12 +56,12 @@ describe('PageFooter.vue', () => { beforeEach(async () => { const links = { ...linksDefault, - ORGANIZATION: { ...linksDefault.ORGANIZATION, externalLink: null }, - IMPRINT: { ...linksDefault.IMPRINT, externalLink: null }, - TERMS_AND_CONDITIONS: { ...linksDefault.TERMS_AND_CONDITIONS, externalLink: null }, - CODE_OF_CONDUCT: { ...linksDefault.CODE_OF_CONDUCT, externalLink: null }, - DATA_PRIVACY: { ...linksDefault.DATA_PRIVACY, externalLink: null }, - FAQ: { ...linksDefault.FAQ, externalLink: null }, + ORGANIZATION: linksDefault.ORGANIZATION.overwrite({ externalLink: null }), + IMPRINT: linksDefault.IMPRINT.overwrite({ externalLink: null }), + TERMS_AND_CONDITIONS: linksDefault.TERMS_AND_CONDITIONS.overwrite({ externalLink: null }), + CODE_OF_CONDUCT: linksDefault.CODE_OF_CONDUCT.overwrite({ externalLink: null }), + DATA_PRIVACY: linksDefault.DATA_PRIVACY.overwrite({ externalLink: null }), + FAQ: linksDefault.FAQ.overwrite({ externalLink: null }), } wrapper = Wrapper() wrapper.setData({ links }) @@ -99,21 +99,22 @@ describe('PageFooter.vue', () => { beforeEach(async () => { const links = { ...linksDefault, - ORGANIZATION: { ...linksDefault.ORGANIZATION, externalLink: 'https://ocelot.social' }, - IMPRINT: { ...linksDefault.IMPRINT, externalLink: 'https://ocelot.social/IMPRINT' }, - TERMS_AND_CONDITIONS: { - ...linksDefault.TERMS_AND_CONDITIONS, + ORGANIZATION: linksDefault.ORGANIZATION.overwrite({ + externalLink: 'https://ocelot.social', + }), + IMPRINT: linksDefault.IMPRINT.overwrite({ + externalLink: 'https://ocelot.social/IMPRINT', + }), + TERMS_AND_CONDITIONS: linksDefault.TERMS_AND_CONDITIONS.overwrite({ externalLink: 'https://ocelot.social/TERMS_AND_CONDITIONS', - }, - CODE_OF_CONDUCT: { - ...linksDefault.CODE_OF_CONDUCT, + }), + CODE_OF_CONDUCT: linksDefault.CODE_OF_CONDUCT.overwrite({ externalLink: 'https://ocelot.social/CODE_OF_CONDUCT', - }, - DATA_PRIVACY: { - ...linksDefault.DATA_PRIVACY, + }), + DATA_PRIVACY: linksDefault.DATA_PRIVACY.overwrite({ externalLink: 'https://ocelot.social/DATA_PRIVACY', - }, - FAQ: { ...linksDefault.FAQ, externalLink: 'https://ocelot.social/FAQ' }, + }), + FAQ: linksDefault.FAQ.overwrite({ externalLink: 'https://ocelot.social/FAQ' }), } wrapper = Wrapper() wrapper.setData({ links }) diff --git a/webapp/components/_new/features/InternalPage/InternalPage.vue b/webapp/components/_new/features/InternalPage/InternalPage.vue index 0c1d8d633..99982e89b 100644 --- a/webapp/components/_new/features/InternalPage/InternalPage.vue +++ b/webapp/components/_new/features/InternalPage/InternalPage.vue @@ -27,11 +27,6 @@