@newskit-render/core 4.20.5-alpha.0 → 4.20.5

package/cypress/e2e/account/personal-details.cy.js

@@ -662,6 +662,7 @@ describe('Personal detail edit pages', () => {
         expect(loc.pathname).to.eq('/account')
       })
     })
+
     it('Should change user address', () => {
       cy.get('a[href="/account/edit/address"]').should('be.visible').click()
 
@@ -699,6 +700,7 @@ describe('Personal detail edit pages', () => {
         'Your address was successfully updated'
       )
     })
+
     it.skip('Should search for address and automatically populate it', () => {
       cy.get('a[href="/account/edit/address"]').should('be.visible').click()
 
@@ -748,6 +750,7 @@ describe('Personal detail edit pages', () => {
         'Your address was successfully updated'
       )
     })
+
     it('Should show input validation error messages when user tries to add invalid address', () => {
       cy.get('a[href="/account/edit/address"]').should('be.visible').click()
 
@@ -772,7 +775,8 @@ describe('Personal detail edit pages', () => {
         'Updating your address...'
       ).should('not.exist')
     })
-    it('Should show error toast when updating address if internal server error occures', () => {
+
+    it('Should show error toast when updating address and internal server error occures', () => {
       cy.intercept('POST', '/api/account/mutate', { statusCode: 500 })
 
       cy.get('a[href="/account/edit/address"]').should('be.visible').click()
@@ -793,7 +797,44 @@ describe('Personal detail edit pages', () => {
       )
     })
 
-    it('Should show modal when postcode is outside delivery area and user has print subscription', () => {
+    it('Should show modal when selected country is not UK, Isle of Man, Guernsey or Jersey and user has print with vouchers subscription', () => {
+      cy.GetTnlAcsSession('printVouchers')
+      cy.mockConsentAndVisit('/account/edit/address')
+
+      cy.get('input[name="line1"]').clear().type('620 Atlantic Ave')
+      cy.get('input[name="line2"]').clear().type('Brooklyn')
+      cy.get('input[name="city"]').clear().type('New York')
+      cy.get('input[name="postcode"]').clear().type('11217')
+
+      cy.get('[data-testid="select-country"]').click()
+      cy.get('[data-testid="United Kingdom"]').should('be.visible')
+
+      cy.get('[data-testid="United States of America"]').click()
+
+      cy.contains('Save').click()
+
+      cy.get('[data-testid="modal"]')
+        .should('exist')
+        .should('have.length.of.at.most', 1)
+      cy.contains(
+        '[data-testid="introduction-title"]',
+        'Address Outside Delivery Area'
+      ).should('exist')
+      cy.contains(
+        '[data-testid="description-block"]',
+        'Unfortunately the address you entered is outside of our delivery area so cannot be updated online.'
+      ).should('exist')
+      cy.contains('[data-testid="primary-button"]', 'Return to My Account')
+        .should('exist')
+        .click()
+      cy.contains(
+        '[data-testid="toast-container"]',
+        'As your new address is outside of our delivery area it has not been updated.'
+      )
+      cy.url().should('eq', 'http://localhost:3000/account')
+    })
+
+    it('Should show modal when selected country is UK but postcode is outside delivery area and user has print subscription', () => {
       cy.GetTnlAcsSession('print')
       cy.mockConsentAndVisit('/account')
 
@@ -818,14 +859,15 @@ describe('Personal detail edit pages', () => {
       ).should('exist')
       cy.contains('[data-testid="primary-button"]', 'Return to My Account')
         .should('exist')
-        .click({ multiple: true })
+        .click()
       cy.contains(
         '[data-testid="toast-container"]',
         'As your new address is outside of our delivery area it has not been updated.'
       )
       cy.url().should('eq', 'http://localhost:3000/account')
     })
-    it('Should show modal when postcode is outside delivery area and user has digi-print subscription', () => {
+
+    it('Should show modal when selected country is UK but postcode is outside delivery area and user has digi-print subscription', () => {
       cy.GetTnlAcsSession('digiprint')
       cy.mockConsentAndVisit('/account')
 
@@ -850,14 +892,52 @@ describe('Personal detail edit pages', () => {
       ).should('exist')
       cy.contains('[data-testid="primary-button"]', 'Return to My Account')
         .should('exist')
-        .click({ multiple: true })
+        .click()
       cy.contains(
         '[data-testid="toast-container"]',
         'As your new address is outside of our delivery area it has not been updated.'
       )
       cy.url().should('eq', 'http://localhost:3000/account')
     })
-    it('Should not show modal when postcode is outside delivery area and user has print with vouchers subscription', () => {
+
+    it('Should show modal when selected country is not UK, Isle of Man, Guernsey or Jersey and user has digi-print with vouchers subscription', () => {
+      cy.GetTnlAcsSession('digiprintVouchers')
+      cy.mockConsentAndVisit('/account/edit/address')
+
+      cy.get('input[name="line1"]').clear().type('620 Atlantic Ave')
+      cy.get('input[name="line2"]').clear().type('Brooklyn')
+      cy.get('input[name="city"]').clear().type('New York')
+      cy.get('input[name="postcode"]').clear().type('11217')
+
+      cy.get('[data-testid="select-country"]').click()
+      cy.get('[data-testid="United Kingdom"]').should('be.visible')
+
+      cy.get('[data-testid="United States of America"]').click()
+
+      cy.contains('Save').click()
+
+      cy.get('[data-testid="modal"]')
+        .should('exist')
+        .should('have.length.of.at.most', 1)
+      cy.contains(
+        '[data-testid="introduction-title"]',
+        'Address Outside Delivery Area'
+      ).should('exist')
+      cy.contains(
+        '[data-testid="description-block"]',
+        'Unfortunately the address you entered is outside of our delivery area so cannot be updated online.'
+      ).should('exist')
+      cy.contains('[data-testid="primary-button"]', 'Return to My Account')
+        .should('exist')
+        .click()
+      cy.contains(
+        '[data-testid="toast-container"]',
+        'As your new address is outside of our delivery area it has not been updated.'
+      )
+      cy.url().should('eq', 'http://localhost:3000/account')
+    })
+
+    it('Should not show modal when selected country is UK and user has print with vouchers subscription', () => {
       cy.GetTnlAcsSession('printVouchers')
       cy.mockConsentAndVisit('/account')
 
@@ -890,7 +970,8 @@ describe('Personal detail edit pages', () => {
       )
       cy.url().should('eq', 'http://localhost:3000/account')
     })
-    it('Should not show modal when postcode is outside delivery area and user has digi-print with vouchers subscription', () => {
+
+    it('Should not show modal when selected country is UK and user has digi-print with vouchers subscription', () => {
       cy.GetTnlAcsSession('digiprintVouchers')
       cy.mockConsentAndVisit('/account')
 
@@ -922,7 +1003,8 @@ describe('Personal detail edit pages', () => {
       )
       cy.url().should('eq', 'http://localhost:3000/account')
     })
-    it('Should not show modal when postcode is outside delivery area and user has digital subscription', () => {
+
+    it('Should not show modal when selected country is UK, postcode is outside delivery area and user has digital subscription', () => {
       cy.GetTnlAcsSession('tnl')
       cy.mockConsentAndVisit('/account')
 
@@ -954,5 +1036,42 @@ describe('Personal detail edit pages', () => {
       )
       cy.url().should('eq', 'http://localhost:3000/account')
     })
+
+    it('Should not show modal when selected country is not UK, Isle of Man, Guernsey or Jersey and user has digital subscription', () => {
+      cy.mockConsentAndVisit('/account')
+
+      cy.get('a[href="/account/edit/address"]').click()
+
+      cy.get('input[name="line1"]').clear().type('620 Atlantic Ave')
+      cy.get('input[name="line2"]').clear().type('Brooklyn')
+      cy.get('input[name="city"]').clear().type('New York')
+      cy.get('input[name="postcode"]').clear().type('11217')
+
+      cy.get('[data-testid="select-country"]').click()
+      cy.get('[data-testid="United Kingdom"]').should('be.visible')
+
+      cy.get('[data-testid="United States of America"]').click()
+
+      cy.contains('Save').click()
+
+      cy.get('[data-testid="modal"]').should('not.exist')
+      cy.contains(
+        '[data-testid="introduction-title"]',
+        'Address Outside Delivery Area'
+      ).should('not.exist')
+      cy.contains(
+        '[data-testid="description-block"]',
+        'Unfortunately the address you entered is outside of our delivery area so cannot be updated online.'
+      ).should('not.exist')
+      cy.contains(
+        '[data-testid="primary-button"]',
+        'Return to My Account'
+      ).should('not.exist')
+      cy.contains(
+        '[data-testid="toast-container"]',
+        'Your address was successfully updated'
+      )
+      cy.url().should('eq', 'http://localhost:3000/account')
+    })
   })
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "4.20.5-alpha.0",
+  "version": "4.20.5",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -47,7 +47,7 @@
     "@newskit-render/checkout": "^3.9.1",
     "@newskit-render/feature-flags": "^1.7.0",
     "@newskit-render/feed": "^1.8.4",
-    "@newskit-render/my-account": "^7.20.2",
+    "@newskit-render/my-account": "^7.20.3",
     "@newskit-render/shared-components": "^4.10.1",
     "@newskit-render/standalone-components": "^3.19.1",
     "@newskit-render/validation": "^1.13.0",