diff --git a/client/src/helpers/app-flavor.constants.ts b/client/src/helpers/app-flavor.constants.ts index aa569843..0222572e 100644 --- a/client/src/helpers/app-flavor.constants.ts +++ b/client/src/helpers/app-flavor.constants.ts @@ -42,7 +42,7 @@ export const myKvValues: FlavorValues = { textInstrumentFilterShowAll: 'Alles anzeigen', // myKV flags - showFooter: false, + showFooter: true, showObjectivesTitle: false, showInstrumentFilterSidebar: true, showPortfolio: true, diff --git a/client/src/layouts/DefaultLayout.vue b/client/src/layouts/DefaultLayout.vue index 7486b9e2..7efdece2 100644 --- a/client/src/layouts/DefaultLayout.vue +++ b/client/src/layouts/DefaultLayout.vue @@ -14,7 +14,8 @@ class="layout__content" :key="$route.fullPath" /> - @@ -24,7 +25,7 @@ diff --git a/client/src/layouts/PublicLayout.vue b/client/src/layouts/PublicLayout.vue index 4e7fbb77..7656e06f 100644 --- a/client/src/layouts/PublicLayout.vue +++ b/client/src/layouts/PublicLayout.vue @@ -9,7 +9,8 @@ - @@ -18,13 +19,13 @@ diff --git a/client/src/layouts/SimpleFooter.cy.js b/client/src/layouts/SimpleFooter.cy.js index bfc7e61e..2ff52b0d 100644 --- a/client/src/layouts/SimpleFooter.cy.js +++ b/client/src/layouts/SimpleFooter.cy.js @@ -1,10 +1,14 @@ -import SimpleFooter from './SimpleFooter.vue'; +import DynamicFooter from './DynamicFooter.vue'; import { Flavor } from '@/helpers/flavor.stubabble'; import { defaultFlavorValues, dhaValues, dhfValues, myKvValues } from '@/helpers/app-flavor.constants'; -const checkLinks = (baseUrl) => { - cy.mount(SimpleFooter); +const checkLinks = (baseUrl, simple = true) => { cy.viewport('macbook-15'); + cy.mount(DynamicFooter, { + props: { + simple, + }, + }); cy.get('a') .eq(0) .should('contain', 'Datenschutz') @@ -21,25 +25,44 @@ const checkLinks = (baseUrl) => { describe('', () => { it('renders for MySkillbox', () => { + cy.viewport('macbook-15'); // see: https://on.cypress.io/mounting-vue cy.stub(Flavor, 'getFlavor').returns(defaultFlavorValues); - cy.mount(SimpleFooter); - cy.viewport('macbook-15'); + cy.mount(DynamicFooter, { props: { simple: true } }); cy.get('p').eq(0).should('contain', 'Copyright'); }); it('renders for MyKV', () => { - // see: https://on.cypress.io/mounting-vue cy.stub(Flavor, 'getFlavor').returns(myKvValues); checkLinks('mykv.ch'); }); it('renders for MyDHA', () => { - // see: https://on.cypress.io/mounting-vue cy.stub(Flavor, 'getFlavor').returns(dhaValues); checkLinks('mydetailhandel.ch'); }); it('renders for MyDHF', () => { - // see: https://on.cypress.io/mounting-vue cy.stub(Flavor, 'getFlavor').returns(dhfValues); checkLinks('mydetailhandel.ch'); }); }); + +describe('', () => { + it('renders for MySkillbox', () => { + cy.viewport('macbook-15'); + // see: https://on.cypress.io/mounting-vue + cy.stub(Flavor, 'getFlavor').returns(defaultFlavorValues); + cy.mount(DynamicFooter, { props: { simple: false } }); + cy.get('h5').should('contain', 'Wer sind wir'); + }); + it('renders for MyKV', () => { + cy.stub(Flavor, 'getFlavor').returns(myKvValues); + checkLinks('mykv.ch', false); + }); + it('renders for MyDHA', () => { + cy.stub(Flavor, 'getFlavor').returns(dhaValues); + checkLinks('mydetailhandel.ch', false); + }); + it('renders for MyDHF', () => { + cy.stub(Flavor, 'getFlavor').returns(dhfValues); + checkLinks('mydetailhandel.ch', false); + }); +}); diff --git a/client/src/layouts/SimpleLayout.vue b/client/src/layouts/SimpleLayout.vue index cf44875b..6547790d 100644 --- a/client/src/layouts/SimpleLayout.vue +++ b/client/src/layouts/SimpleLayout.vue @@ -10,7 +10,8 @@ -