@newskit-render/core 4.22.1 → 4.22.2-alpha.1

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.22.1](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.22.1-alpha.0...@newskit-render/core@4.22.1) (2024-02-09)
+
+**Note:** Version bump only for package @newskit-render/core
+
+
+
+
+
 # [4.22.0](https://github.com/newscorp-ghfb/ncu-newskit-render/compare/@newskit-render/core@4.22.0-alpha.1...@newskit-render/core@4.22.0) (2024-02-07)
 
 **Note:** Version bump only for package @newskit-render/core

package/cypress/e2e/account/holiday-stop.cy.js

@@ -1,3 +1,5 @@
+import { getTestDates } from '../../fixtures/testDates'
+
 describe('Book a Holiday Stop', () => {
   beforeEach(() => {
     cy.GetTnlAcsSession('tnl')
@@ -11,96 +13,70 @@ describe('Book a Holiday Stop', () => {
   })
 })
 
-describe('Upcoming Holiday Stops', () => {
+describe('Add a Holiday Stop', () => {
   beforeEach(() => {
-    cy.clock(Date.UTC(2022, 10, 30), ['Date'])
     cy.GetTnlAcsSession('tnl')
-    cy.mockConsentAndVisit('/account/holiday-stop')
+    cy.mockConsentAndVisit('/account/add/holiday-stop')
   })
 
-  it('should display Upcoming Holiday Stops when there are more than 5 holiday stops', () => {
-    cy.get('a[href="/account/holiday-stop/upcoming-holiday-stops"]').should(
-      'exist'
-    )
-    cy.get('[data-testid="content-list"] > ul > li').should(
-      'have.length.of.at.least',
-      6
-    )
-  })
+  it('should display add Holiday Stop page', () => {
+    cy.get('[data-testid="introduction-title"]').contains('Add a Holiday Stop')
+    cy.get('[data-testid="create-holiday-stop"]').should('exist')
+    cy.get('[data-testid="create-holiday-stop"]').contains('Choose your dates')
 
-  it('should navigate to the Upcoming Holiday Stops and display the list of upcoming Holiday Stops', () => {
-    // eslint-disable-next-line cypress/no-unnecessary-waiting
-    cy.wait(1000)
-    cy.get('a[href="/account/holiday-stop/upcoming-holiday-stops"]').click()
-    cy.url().should('match', /account\/holiday-stop\/upcoming-holiday-stops/)
-  })
-})
+    cy.get('[id="startDate"]').should('exist')
+    cy.get('[id="endDate"]').should('exist')
 
-describe.skip('Cancel Holiday Stop', () => {
-  beforeEach(() => {
-    cy.clock(Date.UTC(2022, 10, 30), ['Date'])
-    cy.GetTnlAcsSession('tnl')
-    cy.mockConsentAndVisit('/account/holiday-stop')
+    cy.get('[data-testid="primary-button"]').should('exist')
+    cy.get('[data-testid="secondary-button"]')
+      .should('have.attr', 'href', '/account/holiday-stop')
+      .contains('Cancel')
   })
 
-  it('should show popup and cancel Holiday Stop', () => {
-    cy.intercept('POST', '/api/account/mutate', {
-      statusCode: 200,
-      body: { data: { deleteUserHolidayStop: { success: true } } },
-    })
-    cy.get('[data-testid="content-list"] > ul > li')
-      .contains('21/01/23')
-      .parents('li')
-      .contains('Cancel')
-      .click()
-    cy.get('[data-testid="primary-button"]').click()
-    cy.contains(
-      '[data-testid="toast-container"]',
-      'Your Holiday Stop was successfully cancelled. Cancelled Holiday Stops will not be displayed.'
+  it('should add a new Holiday Stop', () => {
+    const [startDate, endDate] = getTestDates()
+
+    cy.get('[id="startDate"]').should('be.visible').click({ force: true })
+    cy.get('input[name="startDate"]').type(startDate)
+    cy.get('input[name="endDate"]').type(endDate)
+
+    cy.get('[data-testid="primary-button"]')
+      .should('be.visible')
+      .click({ force: true })
+    cy.get('[data-testid="modal"]').should('exist')
+    cy.get('[data-testid="introduction-title"]').contains('Holiday Stop added')
+    cy.get('[data-testid="description-block"]').contains(
+      'You have successfully added a Holiday Stop to your account. Your account will be credited no more than 8 weeks after the holiday start date.'
     )
+    cy.get('[aria-label="Retun to Holiday Stops"]').click()
   })
 })
 
-describe.skip('Edit button Holiday Stop', () => {
+describe('Upcoming Holiday Stops - edit button', () => {
   beforeEach(() => {
-    cy.clock(Date.UTC(2022, 10, 30), ['Date'])
     cy.GetTnlAcsSession('tnl')
     cy.mockConsentAndVisit('/account/holiday-stop')
   })
 
-  it('should show redirect to edit page and show corrensponding data', () => {
-    cy.intercept('POST', '/api/account/mutate', {
-      statusCode: 200,
-      body: { data: { updateUserHolidayStop: { success: true } } },
-    })
+  const [startDate] = getTestDates(0, false)
+  const [fullStartDate, fullEndDate] = getTestDates()
+  const [newStartDate, newEndDate] = getTestDates(1)
 
+  it('should show redirect to edit page and show corresponding data', () => {
     cy.get('[data-testid="content-list"] > ul > li')
-      .contains('21/01/23')
+      .contains(startDate)
       .parents('li')
       .contains('Edit')
       .click()
     cy.url().should('match', /\/account\/edit\/holiday-stop?/)
 
-    cy.get('[name="startDate"]').invoke('val').should('equal', '21/01/2023')
-    cy.get('[name="endDate"]').invoke('val').should('equal', '31/01/2023')
+    cy.get('[name="startDate"]').invoke('val').should('equal', fullStartDate)
+    cy.get('[name="endDate"]').invoke('val').should('equal', fullEndDate)
 
-    const dateFormatOptions = {
-      year: 'numeric',
-      month: 'numeric',
-      day: 'numeric',
-    }
     cy.get('[id="startDate"]').should('be.visible').click({ force: true })
 
-    cy.get('input[name="startDate"]')
-      .clear()
-      .type(
-        new Date('21/01/2023').toLocaleDateString('en-GB', dateFormatOptions)
-      )
-    cy.get('input[name="endDate"]')
-      .clear()
-      .type(
-        new Date('31/01/2023').toLocaleDateString('en-GB', dateFormatOptions)
-      )
+    cy.get('input[name="startDate"]').type(`0{selectAll}${newStartDate}`)
+    cy.get('input[name="endDate"]').type(`0{selectAll}${newEndDate}`)
 
     cy.get('body').click({ force: true })
     cy.contains('[data-testid="primary-button"]', 'Save').click()
@@ -110,78 +86,24 @@ describe.skip('Edit button Holiday Stop', () => {
   })
 })
 
-describe('Add a Holiday Stop', () => {
+describe('Cancel Holiday Stop', () => {
   beforeEach(() => {
     cy.GetTnlAcsSession('tnl')
-    cy.mockConsentAndVisit('/account/add/holiday-stop')
+    cy.mockConsentAndVisit('/account/holiday-stop')
   })
-  it('should display add Holiday Stop page', () => {
-    cy.get('[data-testid="introduction-title"]').contains('Add a Holiday Stop')
-    cy.get('[data-testid="create-holiday-stop"]').should('exist')
-    cy.get('[data-testid="create-holiday-stop"]').contains('Choose your dates')
 
-    cy.get('[id="startDate"]').should('exist')
-    cy.get('[id="endDate"]').should('exist')
+  it('should show popup and cancel Holiday Stop', () => {
+    const [newStartDate] = getTestDates(1, false)
 
-    cy.get('[data-testid="primary-button"]').should('exist')
-    cy.get('[data-testid="secondary-button"]')
-      .should('have.attr', 'href', '/account/holiday-stop')
+    cy.get('[data-testid="content-list"] > ul > li')
+      .contains(newStartDate)
+      .parents('li')
       .contains('Cancel')
-  })
-  it('should able to select startDate and endDate', () => {
-    const dateFormatOptions = {
-      year: 'numeric',
-      month: 'numeric',
-      day: 'numeric',
-    }
-    cy.get('[id="startDate"]').should('be.visible').click({ force: true })
-
-    cy.get('input[name="startDate"]').type(
-      new Date('10/18/2022').toLocaleDateString('en-GB', dateFormatOptions)
-    )
-    cy.get('input[name="endDate"]').type(
-      new Date('10/20/2022').toLocaleDateString('en-GB', dateFormatOptions)
-    )
-
-    cy.intercept('POST', '/api/account/mutate', {
-      statusCode: 200,
-      body: { data: { createUserHolidayStop: { success: true } } },
-    })
-    cy.get('[data-testid="primary-button"]')
-      .should('be.visible')
-      .click({ force: true })
-    cy.get('[data-testid="modal"]').should('exist')
-    cy.get('[data-testid="introduction-title"]').contains('Holiday Stop added')
-    cy.get('[data-testid="description-block"]').contains(
-      'You have successfully added a Holiday Stop to your account. Your account will be credited no more than 8 weeks after the holiday start date.'
-    )
-    cy.get('[aria-label="Retun to Holiday Stops"]').click()
-  })
-})
-
-describe('Edit Holiday Stops', () => {
-  beforeEach(() => {
-    cy.GetTnlAcsSession('tnl')
-    cy.visitAndOverrideNextData(
-      '/account/edit/holiday-stop?id=a2U7Y000001r8aSUAQ',
-      'props.pageProps.data.fields',
-      [
-        {
-          value: [
-            {
-              id: 'a2U7Y000001r8aSUAQ',
-              startDate: '2022-10-12T00:00:00',
-              endDate: '2022-10-13T00:00:00',
-            },
-          ],
-        },
-      ]
+      .click()
+    cy.get('[data-testid="primary-button"]').click()
+    cy.contains(
+      '[data-testid="toast-container"]',
+      'Your Holiday Stop was successfully cancelled. Cancelled Holiday Stops will not be displayed.'
     )
   })
-  it('should display edit Holiday Stop page', () => {
-    cy.get('[data-testid="introduction-title"]').contains('Edit a Holiday Stop')
-    cy.get('[data-testid="update-holiday-stop"]').should('exist')
-    cy.get('[name="startDate"]').invoke('val').should('equal', '12/10/2022')
-    cy.get('[name="endDate"]').invoke('val').should('equal', '13/10/2022')
-  })
 })

package/cypress/fixtures/testDates.js

@@ -0,0 +1,26 @@
+export const getTestDates = (modifier = 0, fullYear = true) => {
+  const dateFormatOptions = {
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+  }
+
+  if (!fullYear) {
+    dateFormatOptions.year = '2-digit'
+  }
+
+  const today = new Date()
+
+  const startDate = new Date(today)
+  startDate.setDate(today.getDate() + 2 + modifier)
+  startDate.setMonth(today.getMonth() + 1)
+
+  const endDate = new Date(today)
+  endDate.setDate(today.getDate() + 4 + modifier)
+  endDate.setMonth(today.getMonth() + 1)
+
+  return [
+    startDate.toLocaleDateString('en-GB', dateFormatOptions),
+    endDate.toLocaleDateString('en-GB', dateFormatOptions),
+  ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "4.22.1",
+  "version": "4.22.2-alpha.1",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -44,13 +44,13 @@
     "@newrelic/winston-enricher": "4.0.1",
     "@newskit-render/api": "^1.11.0",
     "@newskit-render/auth": "^1.8.0",
-    "@newskit-render/checkout": "^3.9.5",
+    "@newskit-render/checkout": "^3.9.6-alpha.0",
     "@newskit-render/feature-flags": "^1.7.0",
     "@newskit-render/feed": "^1.8.5",
-    "@newskit-render/my-account": "^7.23.1",
-    "@newskit-render/shared-components": "^4.12.1",
-    "@newskit-render/standalone-components": "^3.19.5",
-    "@newskit-render/validation": "^1.13.0",
+    "@newskit-render/my-account": "^7.24.0-alpha.0",
+    "@newskit-render/shared-components": "^4.13.0-alpha.0",
+    "@newskit-render/standalone-components": "^3.19.6-alpha.0",
+    "@newskit-render/validation": "^1.14.0-alpha.0",
     "cross-fetch": "3.1.5",
     "graphql": "16.6.0",
     "lodash.get": "4.4.2",