Merging dev to main

.github/README.md

@@ -15,7 +15,8 @@ This project uses
 
 ## Test reports for Main 👩‍🔬 🧪
 
-![Default Tests Workflow Status](https://github.com/DTS-STN/secure-client-hub/actions/workflows/default-tests.yml/badge.svg?branch=main)
+[![end-to-end Workflow Status](https://img.shields.io/github/workflow/status/DTS-STN/next-template/E2E%20Test?label=E2E)](https://dts-stn.github.io/secure-client-hub/refs/heads/main/e2e-test-report/)
+[![Jest Workflow Status](https://img.shields.io/github/workflow/status/DTS-STN/next-template/Lint%20and%20Test?label=Jest)](https://dts-stn.github.io/secure-client-hub/refs/heads/main/unit-test-results/lcov-report/)
 
 ![Line Coverage Badge](https://img.shields.io/badge/dynamic/json?label=Line%20Coverage&query=%24.total.lines.pct&suffix=%25&url=https%3A%2F%2Fdts-stn.github.io%2Fsecure-client-hub%2Frefs%2Fheads%2Fmain%2Funit-test-results%2Fcoverage-summary.json)
 ![Statements Coverage Badge](https://img.shields.io/badge/dynamic/json?label=Statement%20Coverage&query=%24.total.statements.pct&suffix=%25&url=https%3A%2F%2Fdts-stn.github.io%2Fsecure-client-hub%2Frefs%2Fheads%2Fmain%2Funit-test-results%2Fcoverage-summary.json)

.github/workflows/pr-helper.yml

@@ -25,7 +25,7 @@ jobs:
           edit-mode: replace
           issue-number: ${{ github.event.pull_request.number }}
           body: |
-            [Integration Deployment :rocket: ](https://sch-d-${{ github.head_ref }}.bdm-dev-rhp.dts-stn.com) - [Build Status)](https://teamcity.dev.admin.dts-stn.com/buildConfiguration/DtsDevelopment_SecureClientHubProject_BuildDynamic?branch=${{ github.head_ref }}&buildTypeTab=overview&mode=builds)
+            [Integration Deployment :rocket: ](https://sch-d-${{ github.head_ref }}.bdm-dev-rhp.dts-stn.com) - [Build Status](https://teamcity.dev.admin.dts-stn.com/buildConfiguration/DtsDevelopment_SecureClientHubProject_BuildDynamic?branch=${{ github.head_ref }}&buildTypeTab=overview&mode=builds)
             ![Default Tests Workflow Status](https://github.com/DTS-STN/${{ github.event.pull_request.base.repo.name }}/actions/workflows/default-tests.yml/badge.svg?branch=${{ github.head_ref }})
             [Jest Coverage Report](https://dts-stn.github.io/${{ github.event.pull_request.base.repo.name }}/${{ github.ref }}/unit-test-results/lcov-report/) 
             [Cypress Coverage Report](https://dts-stn.github.io/${{ github.event.pull_request.base.repo.name }}/${{ github.ref }}/e2e-test-report/) 

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.9-alpine3.15 AS base
+FROM node:18.12-alpine3.16 AS base
 WORKDIR /base
 COPY package*.json ./
 RUN npm ci
@@ -17,7 +17,7 @@ WORKDIR /build
 COPY --from=base /base ./
 RUN npm run build
 
-FROM node:18.9-alpine3.15 AS production
+FROM node:18.12-alpine3.16 AS production
 ENV NODE_ENV=production
 WORKDIR /app
 COPY --from=build /build/next.config.js ./

__tests__/components/ExitBetaModal.test.js

@@ -12,25 +12,43 @@ describe('Exit Beta Modal', () => {
         closeModal={() => {}}
         closeModalAria={'close'}
         continueLink="/"
+        popupId={'Test Id'}
+        popupTitle={'Test Title'}
+        popupDescription={'Test Description'}
+        popupPrimaryBtn={{ id: 'Test Primary Id', text: 'Test Primary Text' }}
+        popupSecondaryBtn={{
+          id: 'Test Secondary Id',
+          text: 'Test Secondary Text',
+        }}
       />
     )
-    const title = screen.getByText('Exiting beta version')
-    const caption = screen.getByText(
-      'Thank you for trying the beta version. You are now returning to My Service Canada Account home page.'
-    )
+    const title = screen.getByText('Test Title')
+    const description = screen.getByText('Test Description')
+    const primaryBtnText = screen.getByText('Test Primary Text')
+    const secondaryBtnText = screen.getByText('Test Secondary Text')
     expect(title).toBeInTheDocument()
-    expect(caption).toBeInTheDocument()
+    expect(description).toBeInTheDocument()
+    expect(primaryBtnText).toBeInTheDocument()
+    expect(secondaryBtnText).toBeInTheDocument()
   })
-
   it('has no a11y viollations', async () => {
     const { container } = render(
       <ExitBetaModal
         closeModal={() => {}}
         closeModalAria={'close'}
         continueLink="/"
+        popupId={'Test Id'}
+        popupTitle={'Test Title'}
+        popupDescription={'Test Description'}
+        popupPrimaryBtn={{ id: 'Test Primary Id', text: 'Test Primary Text' }}
+        popupSecondaryBtn={{
+          id: 'Test Secondary Id',
+          text: 'Test Secondary Text',
+        }}
       />
     )
     const results = await axe(container)
     expect(results).toHaveNoViolations()
   })
+  it('placeholder', () => {})
 })

__tests__/components/contact/ContactProvince.test.js

@@ -0,0 +1,13 @@
+import { render } from '@testing-library/react'
+import '@testing-library/jest-dom/extend-expect'
+import { axe, toHaveNoViolations } from 'jest-axe'
+import ContactProvince from '../../../components/contact/ContactProvince'
+
+expect.extend(toHaveNoViolations)
+
+describe('ContactProvince', () => {
+  it('renders contactProvince', () => {
+    const primary = render(<ContactProvince title="" intro="" details={[]} />)
+    expect(primary).toBeTruthy()
+  })
+})

__tests__/components/contact/ContactSection.test.js

@@ -0,0 +1,15 @@
+import { render } from '@testing-library/react'
+import '@testing-library/jest-dom/extend-expect'
+import { axe, toHaveNoViolations } from 'jest-axe'
+import ContactSection from '../../../components/contact/ContactSection'
+
+expect.extend(toHaveNoViolations)
+
+describe('ContactSection', () => {
+  it('renders contactSection', () => {
+    const primary = render(
+      <ContactSection {...ContactSection.args} details={[]} intro="" />
+    )
+    expect(primary).toBeTruthy()
+  })
+})

__tests__/components/contact/ContactSectionRow.test.js

@@ -0,0 +1,13 @@
+import { render } from '@testing-library/react'
+import '@testing-library/jest-dom/extend-expect'
+import { axe, toHaveNoViolations } from 'jest-axe'
+import ContactSectionRow from '../../../components/contact/ContactSectionRow'
+
+expect.extend(toHaveNoViolations)
+
+describe('ContactSectionRow', () => {
+  it('renders contactSectionRow', () => {
+    const primary = render(<ContactSectionRow {...ContactSectionRow.args} />)
+    expect(primary).toBeTruthy()
+  })
+})

__tests__/components/sessionModals/CountDown.test.js

@@ -0,0 +1,21 @@
+import { render } from '@testing-library/react'
+import '@testing-library/jest-dom/extend-expect'
+import { axe, toHaveNoViolations } from 'jest-axe'
+import CountDown from '../../../components/sessionModals/CountDown'
+
+expect.extend(toHaveNoViolations)
+
+describe('CountDownModal', () => {
+  it('renders countDown', () => {
+    const primary = render(
+      <CountDown
+        closeModal={() => console.log('Close Modal')}
+        onSignOut={() => console.log('Sign Out Clicked')}
+        onStay={() => console.log('Stay Signed In Clicked')}
+        id="CountDown"
+        deadline="January, 31, 2023"
+      />
+    )
+    expect(primary).toBeTruthy()
+  })
+})

__tests__/components/sessionModals/SignedOut.test.js

@@ -0,0 +1,19 @@
+import { render } from '@testing-library/react'
+import '@testing-library/jest-dom/extend-expect'
+import { axe, toHaveNoViolations } from 'jest-axe'
+import SignedOut from '../../../components/sessionModals/SignedOut'
+
+expect.extend(toHaveNoViolations)
+
+describe('SignedOutModal', () => {
+  it('renders signedOut', () => {
+    const primary = render(
+      <SignedOut
+        closeModal={() => console.log('Close Modal')}
+        onContinue={() => console.log('Continue Clicked')}
+        id="SignedOut"
+      />
+    )
+    expect(primary).toBeTruthy()
+  })
+})

__tests__/components/skeletons/Dashboard.test.js

@@ -0,0 +1,16 @@
+import { render, screen } from '@testing-library/react'
+import '@testing-library/jest-dom/extend-expect'
+import { axe, toHaveNoViolations } from 'jest-axe'
+import Dashboard from '../../../components/skeletons/Dashboard'
+
+expect.extend(toHaveNoViolations)
+
+describe('Dashboard', () => {
+  it('renders dashboard skeleton', () => {
+    render(<Dashboard sections={1} />)
+
+    const box = screen.getByTestId('dashboard-skeleton')
+    console.log(box)
+    expect(box).toBeTruthy()
+  })
+})

__tests__/pages/contact-canada-pension-plan.test.js

@@ -0,0 +1,161 @@
+import { render, screen } from '@testing-library/react'
+import '@testing-library/jest-dom/extend-expect'
+import { axe, toHaveNoViolations } from 'jest-axe'
+import { useRouter } from 'next/router'
+import ContactCanadaPensionPlan, {
+  getStaticProps,
+} from '../../pages/contact-us/contact-canada-pension-plan'
+
+expect.extend(toHaveNoViolations)
+
+// mocks useRouter to be able to use component' router.asPath
+jest.mock('next/router', () => ({
+  useRouter: jest.fn(),
+}))
+
+jest.mock('../../graphql/mappers/beta-banner-opt-out', () => ({
+  getBetaBannerContent: () => {
+    return new Promise(function (resolve, reject) {
+      resolve({
+        en: {},
+        fr: {},
+      })
+    })
+  },
+}))
+
+jest.mock('../../graphql/mappers/beta-popup-exit', () => ({
+  getBetaPopupExitContent: () => {
+    return new Promise(function (resolve, reject) {
+      resolve({ en: {}, fr: {} })
+    })
+  },
+}))
+
+jest.mock('../../graphql/mappers/beta-popup-page-not-available', () => ({
+  getBetaPopupNotAvailableContent: () => {
+    return new Promise(function (resolve, reject) {
+      resolve({
+        en: {},
+        fr: {},
+      })
+    })
+  },
+}))
+
+jest.mock('../../graphql/mappers/contact-canada-pension-plan', () => ({
+  getContactCanadaPensionPlan: () => {
+    return new Promise(function (resolve, reject) {
+      resolve({
+        en: {},
+        fr: {},
+      })
+    })
+  },
+}))
+
+jest.mock('../../components/contact/ContactProvince', () => () => {
+  return <mock-province data-testid="mock-province" />
+})
+
+describe('CPP Contact Us Page', () => {
+  const content = {
+    title: 'test',
+    items: [
+      { title: 'test', link: 'test', id: 'test', intro: 'test', details: [] },
+    ],
+    heading: 'heading',
+    paragraph: 'paragraph',
+  }
+  const popupContent = { popupId: 'test' }
+
+  const meta = {
+    data_en: {
+      title: 'My Service Canada Account - Contact Canada Pension Plan',
+      desc: 'English',
+      author: 'Service Canada',
+      keywords: '',
+    },
+    data_fr: {
+      title: 'Mon dossier Service Canada - Régime de Pensions du Canada',
+      desc: 'Français',
+      author: 'Service Canada',
+      keywords: '',
+    },
+  }
+
+  beforeEach(() => {
+    useRouter.mockImplementation(() => ({
+      pathname: '/',
+      asPath: '/',
+    }))
+  })
+
+  it('should render the page', () => {
+    render(
+      <ContactCanadaPensionPlan
+        locale="en"
+        pageContent={content}
+        popupContent={popupContent}
+        meta={meta}
+      />
+    )
+    const contactCPPDiv = screen.getByTestId('contactCPP-test')
+    expect(contactCPPDiv).toBeInTheDocument
+  })
+
+  it('should contain a table of contents', () => {
+    render(
+      <ContactCanadaPensionPlan
+        locale="en"
+        pageContent={content}
+        popupContent={popupContent}
+        meta={meta}
+      />
+    )
+    const tocTable = screen.getByTestId('tableOfContents-test')
+    expect(tocTable).toBeInTheDocument()
+  })
+
+  it('should contain a contact section listing', () => {
+    render(
+      <ContactCanadaPensionPlan
+        locale="en"
+        pageContent={content}
+        popupContent={popupContent}
+        meta={meta}
+      />
+    )
+    const contactSection = screen.getByTestId('contactSection-test')
+    expect(contactSection).toBeInTheDocument()
+  })
+
+  it('Test getStaticProps', async () => {
+    const props = await getStaticProps({ locale: 'en' })
+
+    expect(props).toEqual({
+      props: {
+        pageContent: {},
+        bannerContent: {},
+        langToggleLink: '/fr/contact-us/contact-canada-pension-plan',
+        locale: 'en',
+        meta: {
+          data_en: {
+            desc: 'English',
+            author: 'Service Canada',
+            keywords: '',
+            title: 'My Service Canada Account - Contact Canada Pension Plan',
+          },
+          data_fr: {
+            author: 'Service Canada',
+            desc: 'Français',
+            keywords: '',
+            title: 'Mon dossier Service Canada - Régime de Pensions du Canada',
+          },
+        },
+        breadCrumbItems: undefined,
+        popupContent: {},
+      },
+    })
+  })
+})