@newskit-render/core 1.49.0 → 1.54.0

package/cypress/e2e/account/account-subscription.spec.js

@@ -1,3 +1,4 @@
+// These tests are skiped now, until CPS resolves their issue with subsriptions.
 describe('Account Subscription & Cancellation', () => {
   it('Should show no subscription view', () => {
     cy.GetAcsSession('noSub')
@@ -81,9 +82,9 @@ describe('Account Subscription & Cancellation', () => {
     cy.contains(
       'All your subscription details, including payment info and transactions.'
     )
-    cy.contains('4AAA038786047')
+    cy.contains('4AAA038867017')
     cy.contains('************1111')
-    cy.contains('expiry date 01/24')
+    cy.contains('expiry date 01/25')
 
     cy.get('a[href="/account/cancellation"]').should('be.visible').click()
 
@@ -125,7 +126,7 @@ describe('Account Subscription & Cancellation', () => {
         })
       },
     })
-    cy.get('[data-testid="banner-container"]').should('be.visible')
+    cy.get('[data-testid="past-due-banner"]').should('be.visible')
     cy.contains('Your subscription will end soon.')
     cy.contains(
       `You have cancelled your subscription and will lose access to all benefits on ${date.getDate()}/${
@@ -178,14 +179,14 @@ describe('Account Subscription & Cancellation', () => {
         })
       },
     })
-    cy.get('[data-testid="banner-container"]').should('be.visible')
+    cy.get('[data-testid="past-due-banner"]').should('be.visible')
     cy.contains('Your subscription will end soon.')
-    cy.get('[data-testid="close-banner"]').click({
+    cy.get('button[data-testid="banner-close-button"]').click({
       force: true,
       multiple: true,
     })
     cy.reload()
-    cy.get('[data-testid="banner-container"]').should('not.exist')
+    cy.get('[data-testid="past-due-banner"]').should('not.exist')
   })
 
   it('Should not display banner if set date is passed current date', () => {
@@ -208,7 +209,7 @@ describe('Account Subscription & Cancellation', () => {
         })
       },
     })
-    cy.get('[data-testid="banner-container"]').should('be.visible')
+    cy.get('[data-testid="past-due-banner"]').should('be.visible')
     cy.contains('Your subscription has been cancelled.').then(() => {
       window.localStorage.setItem(
         'cancelledBanner',
@@ -216,7 +217,7 @@ describe('Account Subscription & Cancellation', () => {
       )
     })
     cy.reload()
-    cy.get('[data-testid="banner-container"]').should('not.exist')
+    cy.get('[data-testid="past-due-banner"]').should('not.exist')
     cy.clearLocalStorage()
   })
 

package/cypress/e2e/account/payment-failer.spec.js

@@ -21,7 +21,7 @@ describe('Payment Failer', () => {
         })
       },
     })
-    cy.get('[data-testid="banner-container"]').should('be.visible')
+    cy.get('[data-testid="past-due-banner"]').should('be.visible')
     cy.contains("We haven't been able to take payment")
     cy.contains(
       'You may need to update your payment details to keep your subscription.'
@@ -54,7 +54,7 @@ describe('Payment Failer', () => {
         })
       },
     })
-    cy.get('[data-testid="banner-container"]').should('be.visible')
+    cy.get('[data-testid="past-due-banner"]').should('be.visible')
     cy.contains('Act now to keep your subscription')
     cy.contains(
       'We’ve tried several times, but haven’t been able to take payment. Please update your payment details to keep your subscription.'
@@ -87,7 +87,7 @@ describe('Payment Failer', () => {
         })
       },
     })
-    cy.get('[data-testid="banner-container"]').should('be.visible')
+    cy.get('[data-testid="past-due-banner"]').should('be.visible')
     cy.contains('Your subscription has been terminated')
     cy.contains(
       'We didn’t receive payment for your subscription. To reactivate it, please call XXXX-XXX-XXXX.'

package/cypress/support/commands.js

@@ -23,8 +23,8 @@ const userMap = {
     password: 'Ad45p0-swq151@',
   },
   withSub: {
-    username: 'render-e2e-sub@yopmail.com',
-    password: 'testing123',
+    username: 'render-e2e-subscription@yopmail.com',
+    password: 'Testing123$',
   },
   paypalSub: {
     username: 'render-paypal-payment@yopmail.com',

package/helpers/__tests__/getUser.test.ts

@@ -1,10 +1,7 @@
+import fetch from 'cross-fetch'
 import { fetchUser } from '../getUser'
 
-let fetchMock: jest.Mock
-jest.mock('cross-fetch', () => {
-  fetchMock = jest.fn()
-  return fetchMock
-})
+jest.mock('cross-fetch', () => jest.fn().mockImplementation(() => {}))
 
 describe('getUser function', () => {
   beforeEach(() => {
@@ -12,7 +9,9 @@ describe('getUser function', () => {
   })
   it("should call console.error with 'Bad response from server' when Response.status >= 400", async () => {
     jest.spyOn(console, 'error')
-    fetchMock.mockImplementation(() => Promise.resolve({ status: 500 }))
+    ;(fetch as jest.Mock).mockImplementation(() =>
+      Promise.resolve({ status: 500 })
+    )
     await fetchUser(
       { Cookie: 'test' },
       'http://localhost:3000/api/account/query'
@@ -22,7 +21,7 @@ describe('getUser function', () => {
 
   it('should call response.json() when Response.status is < 400', async () => {
     const mockJson = jest.fn()
-    fetchMock.mockImplementation(() =>
+    ;(fetch as jest.Mock).mockImplementation(() =>
       Promise.resolve({ status: 200, json: mockJson })
     )
     await fetchUser(
@@ -34,7 +33,7 @@ describe('getUser function', () => {
 
   it('should return null if no cookie', async () => {
     const mockJson = jest.fn()
-    fetchMock.mockImplementation(() =>
+    ;(fetch as jest.Mock).mockImplementation(() =>
       Promise.resolve({ status: 200, json: mockJson })
     )
     await fetchUser(

package/helpers/setupTests.ts

@@ -3,3 +3,7 @@
 // expect(element).toHaveTextContent(/react/i)
 // learn more: https://github.com/testing-library/jest-dom
 import '@testing-library/jest-dom/extend-expect'
+
+
+// remove this variable once SITE_HOST is refactored
+process.env.SITE_HOST = 'https://newskit-render.ceng-dev.newsuk.tech'

package/infrastructure/.circleci/config.yml

@@ -259,6 +259,7 @@ orbs:
                 echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.SN_PASSWORD=${SN_PASSWORD}"' >> $BASH_ENV
                 echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.SN_USERNAME=${SN_USERNAME}"' >> $BASH_ENV
                 echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.SN_ENVIRONMENT=${SN_ENVIRONMENT}"' >> $BASH_ENV
+                echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.ZUORA_PAGE_ID=${ZUORA_PAGE_ID}"' >> $BASH_ENV
                 echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.ZUORA_RSA_SIGNATURE_URI=${ZUORA_RSA_SIGNATURE_URI}"' >> $BASH_ENV
                 echo 'export HELM_OPT_SET="$HELM_OPT_SET --set secret.items.OPTIMIZELY_SDK_KEY=${OPTIMIZELY_SDK_KEY}"' >> $BASH_ENV
                 echo 'export HELM_PATH="helm"' >> $BASH_ENV

package/jest.config.js

@@ -1,8 +1,15 @@
 process.env.TZ = 'GMT'
-module.exports = {
-  testEnvironment: 'jsdom',
+
+const nextJest = require('next/jest')
+
+const createJestConfig = nextJest({
+  // Provide the path to your Next.js app to load next.config.js and .env files in your test environment
+  dir: './',
+})
+
+const customJestConfig = {
   setupFilesAfterEnv: ['<rootDir>/helpers/setupTests.ts'],
-  coveragePathIgnorePatterns: ['<rootDir>/helpers/createApolloClient.ts'],
+  moduleDirectories: ['node_modules', '<rootDir>/'],
   coverageThreshold: {
     global: {
       branches: 50,
@@ -11,26 +18,21 @@ module.exports = {
       statements: 90,
     },
   },
-  globals: {
-    'ts-jest': {
-      tsconfig: 'tsconfig.test.json'
-    }
-  },
-  transform: {
-    '^.+\\.(ts|tsx)$': 'ts-jest',
+  moduleNameMapper: {
+    '^react$': '<rootDir>/node_modules/react',
+    '^newskit$': '<rootDir>/node_modules/newskit',
   },
+  testEnvironment: 'jest-environment-jsdom',
+  watchPlugins: [
+    'jest-watch-typeahead/filename',
+    'jest-watch-typeahead/testname',
+  ],
   testPathIgnorePatterns: [
     '<rootDir>/cypress/',
     '<rootDir>/node_modules/',
     '<rootDir>/.next/',
   ],
-  snapshotSerializers: ['@emotion/jest/serializer'],
-  watchPlugins: [
-    'jest-watch-typeahead/filename',
-    'jest-watch-typeahead/testname',
-  ],
-  moduleNameMapper: {
-    '^react$': '<rootDir>/node_modules/react',
-    '^newskit$': '<rootDir>/node_modules/newskit',
-  },
 }
+
+// createJestConfig is exported this way to ensure that next/jest can load the Next.js config which is async
+module.exports = createJestConfig(customJestConfig)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "1.49.0",
+  "version": "1.54.0",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -33,14 +33,14 @@
   },
   "dependencies": {
     "@apollo/client": "3.4.16",
-    "@newskit-render/api": "^0.21.0",
-    "@newskit-render/auth": "^0.33.0",
-    "@newskit-render/checkout": "^0.28.0",
+    "@newskit-render/api": "^0.23.0",
+    "@newskit-render/auth": "^0.34.0",
+    "@newskit-render/checkout": "^0.29.0",
     "@newskit-render/feature-flags": "^0.15.0",
-    "@newskit-render/feed": "^0.8.0",
-    "@newskit-render/my-account": "^0.155.0",
-    "@newskit-render/shared-components": "^0.48.0",
-    "@newskit-render/standalone-components": "^0.5.0",
+    "@newskit-render/feed": "^0.10.0",
+    "@newskit-render/my-account": "^0.158.0",
+    "@newskit-render/shared-components": "^0.51.0",
+    "@newskit-render/standalone-components": "^0.6.1",
     "@newskit-render/validation": "^0.41.0",
     "cross-fetch": "3.1.5",
     "graphql": "15.6.0",

package/pages/api/feed.ts

@@ -1,18 +1,24 @@
 import { NextApiRequest, NextApiResponse } from 'next'
 import { rssFeed, UpdatePeriod } from '@newskit-render/feed'
+import { Publisher } from '@newskit-render/api'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) =>
   rssFeed({
     res,
+    publisher:
+      process.env.PUBLISHER === 'DEMO'
+        ? Publisher.VIRGIN
+        : (process.env.PUBLISHER as Publisher),
+    domain: process.env.SITE_HOST,
     titeAttributes: {
       title: 'Demo Site',
-      link: `${process.env.SITE_HOST}/feed`,
+      link: '/feed',
       description: 'Newskit Render Demo site',
       lastBuildDate: new Date().toUTCString(),
       language: 'en-US',
       updatePeriod: 'hourly' as UpdatePeriod,
       updateFrequency: 1,
-      logoUrl: `${process.env.SITE_HOST}/favicon.ico`,
+      logoUrl: '/icon.png',
     },
   })
 

package/pages/help-hub/[id]/index.tsx

@@ -0,0 +1,11 @@
+import React from 'react'
+import { ResultsPage } from '@newskit-render/standalone-components'
+import Layout from '../../../components/layout'
+
+const HelpHubResultsPage = () => (
+  <Layout>
+    <ResultsPage />
+  </Layout>
+)
+
+export default HelpHubResultsPage

package/pages/help-hub/index.tsx

@@ -0,0 +1,11 @@
+import React from 'react'
+import { SearchPage } from '@newskit-render/standalone-components'
+import Layout from '../../components/layout'
+
+const HelpHub = () => (
+  <Layout>
+    <SearchPage />
+  </Layout>
+)
+
+export default HelpHub