@newskit-render/core 0.131.1 → 0.138.1

package/__tests__/pages/home.test.tsx

@@ -3,19 +3,24 @@ import SectionPage from '../../components/section'
 import { renderWithTheme } from '../../helpers/test-utils'
 import { getPageMock } from '../../helpers/mocks'
 
-jest.mock('../../helpers/createApolloClient', () => () => ({
-  query: jest.fn(() =>
-    Promise.resolve({
-      data: {
-        page: {
-          data: {
-            id: '123',
-            title: 'Test title',
+jest.mock('@newskit-render/api', () => ({
+  ClientTypes: { nkapi: 'nkapi' },
+  createApolloClient: jest.fn().mockImplementation(() => {
+    return Promise.resolve({
+      query: jest.fn().mockResolvedValueOnce({
+        data: {
+          page: {
+            data: {
+              id: '123',
+              title: 'Test title',
+            },
           },
         },
-      },
+      }),
     })
-  ),
+  }),
+  sessionParser: jest.fn(),
+  getMainSession: jest.fn(),
 }))
 
 jest.mock('cross-fetch', () =>
@@ -44,8 +49,10 @@ describe('getServerSideProps', () => {
     expect(asFragment()).toMatchSnapshot()
   })
   test('should call newskit api and return Page data', async () => {
+    const setHeaderMock = jest.fn()
     const response = await getServerSideProps({
       req: { headers: { cookie: 'session-cookie' } },
+      res: { setHeader: setHeaderMock },
     })
     expect(response).toEqual(
       expect.objectContaining({
@@ -62,5 +69,10 @@ describe('getServerSideProps', () => {
         },
       })
     )
+
+    expect(setHeaderMock).toHaveBeenCalledWith(
+      'Cache-Control',
+      'public, s-maxage=10, stale-while-revalidate=59'
+    )
   })
 })

package/components/404/404.tsx

@@ -4,13 +4,13 @@ import {
   Cell,
   Image,
   TextBlock,
-  LinkStandalone,
   IconFilledKeyboardArrowLeft,
   styled,
   getMediaQueryFromTheme,
   getSizingCssFromTheme,
 } from 'newskit'
 import Head from 'next/head'
+import { NextLink } from '@newskit-render/shared-components'
 import Layout from '../layout'
 import { headerSize } from '../header'
 
@@ -46,9 +46,12 @@ const StyledMain = styled.main`
     max-width: 440px;
   }
 `
+const paddingCB = (size: string) => ({
+  padding: `${size} 0`,
+})
 
-const StyledLinkStandalone = styled(LinkStandalone)`
-  padding: 14px 0;
+const StyledLink = styled(NextLink)`
+  ${getSizingCssFromTheme(paddingCB, 'sizing030')}
 `
 
 const gridOverride = {
@@ -101,7 +104,8 @@ const FourOhFour = () => (
           <Block
             spaceStack={{ xs: 'space070', sm: 'space080', md: 'space090' }}
           >
-            <StyledLinkStandalone
+            <StyledLink
+              type="standalone"
               data-test-id="StyledLinkStandalone"
               href="/"
               external={false}
@@ -114,7 +118,7 @@ const FourOhFour = () => (
                 }}
               />
               Back to ...
-            </StyledLinkStandalone>
+            </StyledLink>
           </Block>
         </StyledMain>
       </Cell>