@newskit-render/core 4.19.4-alpha.0 → 4.19.4-alpha.1

package/cypress/e2e/account/account-page.cy.js

@@ -1,6 +1,3 @@
-import * as printSubscriptionPageProps from '../../fixtures/print-subscriptions/print-subscription-response.json'
-import * as voucherSubscriptionPageProps from '../../fixtures/print-subscriptions/voucher-subscription-response.json'
-
 describe('Account without user', () => {
   beforeEach(() => {
     cy.mockConsentAndVisit('/account')
@@ -101,6 +98,7 @@ describe('My account personal details', () => {
       'Your last name can’t contain special characters. Please try again.'
     )
   })
+
   // TODO: Uncomment and change the dob when we have a test account with date of birth. Current one fails because it's set to null
   // it('Should Display date of birth', () => {
   //   cy.contains('21/03/1988')
@@ -288,55 +286,6 @@ describe('My account personal details', () => {
       "Sorry, we're unable to save your address right now. Please try again or come back later."
     )
   })
-
-  it('Should show modal when postcode is outside delivery area', () => {
-    cy.visitAndOverrideNextData(
-      '/account/edit/address',
-      'props.pageProps.data.subscriptions',
-      printSubscriptionPageProps.props.pageProps.user.subscriptions
-    )
-    cy.get('input[name="line1"]').clear().type('News UK')
-    cy.get('input[name="line2"]').clear().type('1 London Bridge Street')
-    cy.get('input[name="line3"]').clear().type('Buckie')
-    cy.get('input[name="city"]').clear().type('London')
-    cy.get('input[name="county"]').clear().type('Kent')
-    cy.get('input[name="postcode"]').clear().type('SE1')
-    cy.get('[data-testid="primary-button"]').click()
-    cy.get('[data-testid="description-block"]').should('exist')
-    cy.get('[data-testid="modal-link-0"]').should('exist')
-    cy.get('[aria-label="Return to My Account"]').click({ multiple: true })
-    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 vouchers', () => {
-    cy.visitAndOverrideNextData(
-      '/account/edit/address',
-      'props.pageProps.data.subscriptions',
-      voucherSubscriptionPageProps.props.pageProps.user.subscriptions
-    )
-    cy.get('input[name="line1"]').clear().type('2 Tuke House')
-    cy.get('input[name="line2"]').clear().type('Cromwell Road')
-    cy.get('input[name="line3"]').clear().type('3rd optional line')
-    cy.get('input[name="city"]').clear().type('York')
-    cy.get('input[name="county"]').clear().type('North Yorkshire')
-    cy.get('input[name="postcode"]').clear().type('YO1 6DJ')
-
-    cy.get('[data-testid="primary-button"]').click()
-
-    cy.get('[data-testid="description-block"]').should('not.exist')
-    cy.get('[data-testid="modal-link-0"]').should('not.exist')
-    cy.get('Address Outside Delivery Area').should('not.exist')
-    cy.get('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')
-  })
 })
 
 describe('My account personal details - Display name', () => {
@@ -402,3 +351,176 @@ describe('My account personal details - Display name', () => {
     })
   })
 })
+
+describe('My account personal details - Edit address - Outside delivery area modal', () => {
+  //print
+  it('Should show modal when postcode is outside delivery area and user has print subscription', () => {
+    cy.GetTnlAcsSession('print')
+    cy.mockConsentAndVisit('/account')
+
+    cy.get('a[href="/account/edit/address"]').click({ force: true })
+
+    cy.get('input[name="line1"]').clear().type('Buckingham Palace')
+    cy.get('input[name="city"]').clear().type('London')
+    cy.get('input[name="postcode"]').clear().type('SW1A')
+
+    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({ multiple: true })
+    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')
+  })
+
+  //digiprint
+  it('Should show modal when postcode is outside delivery area and user has digi-print subscription', () => {
+    cy.GetTnlAcsSession('digiprint')
+    cy.mockConsentAndVisit('/account')
+
+    cy.get('a[href="/account/edit/address"]').click({ force: true })
+
+    cy.get('input[name="line1"]').clear().type('1 London Bridge Street')
+    cy.get('input[name="city"]').clear().type('London')
+    cy.get('input[name="postcode"]').clear().type('SE1')
+
+    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({ multiple: true })
+    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')
+  })
+
+  //printVouchers
+  it('Should not show modal when postcode is outside delivery area and user has print with vouchers subscription', () => {
+    cy.GetTnlAcsSession('printVouchers')
+    cy.mockConsentAndVisit('/account')
+
+    cy.get('a[href="/account/edit/address"]').click({ force: true })
+
+    cy.get('input[name="line1"]').clear().type('2 Tuke House')
+    cy.get('input[name="line2"]').clear().type('Cromwell Road')
+    cy.get('input[name="city"]').clear().type('York')
+    cy.get('input[name="county"]').clear().type('North Yorkshire')
+    cy.get('input[name="postcode"]').clear().type('YO1 6DJ')
+
+    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')
+  })
+
+  //digiprintVouchers
+  it('Should not show modal when postcode is outside delivery area and user has digi-print with vouchers subscription', () => {
+    cy.GetTnlAcsSession('digiprintVouchers')
+    cy.mockConsentAndVisit('/account')
+
+    cy.get('a[href="/account/edit/address"]').click({ force: true })
+
+    cy.get('input[name="line1"]').clear().type('Harpercollins Publishers')
+    cy.get('input[name="line2"]').clear().type('1 London Bridge Street')
+    cy.get('input[name="city"]').clear().type('London')
+    cy.get('input[name="postcode"]').clear().type('SE1')
+
+    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')
+  })
+
+  //digital
+  it('Should not show modal when postcode is outside delivery area and user has digital subscription', () => {
+    cy.GetTnlAcsSession('tnl')
+    cy.mockConsentAndVisit('/account')
+
+    cy.get('a[href="/account/edit/address"]').click({ force: true })
+
+    cy.get('input[name="line1"]').clear().type('News UK')
+    cy.get('input[name="line2"]').clear().type('1 London Bridge Street')
+    cy.get('input[name="city"]').clear().type('London')
+    cy.get('input[name="postcode"]').clear().type('SE1')
+
+    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/cypress/e2e/account/main-api.cy.js

@@ -73,7 +73,7 @@ describe('MAIN API', () => {
         expect(response.body.mobile).to.eq('+447777777778')
         expect(response.body.firstName).to.eq('John')
         expect(response.body.lastName).to.eq('Smith')
-        expect(response.body.address.city).to.eq('York')
+        expect(response.body.address.city).to.eq('London')
       })
     })
   })

package/cypress/support/commands.js

@@ -58,6 +58,26 @@ const userMap = {
     username: 'cmp1aug2022printstag@yopmail.com',
     password: 'Password123',
   },
+  print: {
+    //dtc=true
+    username: 'cmp-dtc-card-20-09-22@yopmail.com',
+    password: 'Password123',
+  },
+  printVouchers: {
+    //dtc=false
+    username: 'cmp-test-direct-20-09-22@yopmail.com',
+    password: 'Password123',
+  },
+  digiprint: {
+    //dtc=true
+    username: 'digi-print.dtc.test@yopmail.com',
+    password: 'Password123',
+  },
+  digiprintVouchers: {
+    //dtc=false
+    username: 'digi-print-card-15-11-22@yopmail.com',
+    password: 'Password123',
+  },
 }
 
 Cypress.Commands.add('GetAcsSession', (user = 'default') => {
@@ -85,6 +105,7 @@ Cypress.Commands.add('GetAcsSession', (user = 'default') => {
 
 Cypress.Commands.add('GetTnlAcsSession', (user = 'tnl') => {
   const { username, password } = userMap[user]
+
   cy.request({
     method: 'POST',
     url: 'https://login.staging-thetimes.co.uk/services/session',

package/cypress/visual/account/print-visual-regression.cy.js

@@ -1,14 +1,7 @@
-import * as printSubscriptionPageProps from '../../fixtures/print-subscriptions/print-subscription-response.json'
-
 describe('Visual regression for print and digi_print subscriptions', () => {
   it('should show sections for print user subscriptions', () => {
-    cy.GetAcsSession('withSub')
-    cy.mockConsent()
-    cy.visitAndOverrideNextData(
-      '/account/subscription-and-billing',
-      'props.pageProps.user.subscriptions',
-      printSubscriptionPageProps.props.pageProps.user.subscriptions
-    )
+    cy.GetTnlAcsSession('print')
+    cy.mockConsentAndVisit('/account/subscription-and-billing')
     // eslint-disable-next-line cypress/no-unnecessary-waiting
     cy.wait(1000)
     cy.percySnapshot('Subscription and Billing page for print subscriptions')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "4.19.4-alpha.0",
+  "version": "4.19.4-alpha.1",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",

package/cypress/fixtures/print-subscriptions/print-subscription-response.json

@@ -1,50 +0,0 @@
-{
-  "props": {
-    "pageProps": {
-      "user": {
-        "paymentFailure": {
-          "__typename": "CustomerPaymentFailure",
-          "active": false,
-          "startDate": null
-        },
-        "subscriptions": [
-          {
-            "id": "SUB-0010708256",
-            "startDate": "2022-08-01T13:22:33",
-            "serviceCancellationDate": null,
-            "isActive": true,
-            "currency": "GBP",
-            "price": 0,
-            "type": "Print",
-            "status": "Active",
-            "billingDetails": {
-              "__typename": "BillingDetails",
-              "billCycleDay": null,
-              "paymentMethod": {
-                "__typename": "PaymentMethod",
-                "cardType": null,
-                "cardNumber": null,
-                "type": null,
-                "expirationYear": null,
-                "expirationMonth": null
-              }
-            },
-            "__typename": "Subscription"
-          }
-        ],
-        "__typename": "User",
-        "cpn": "4AAA039158001"
-      },
-      "env": { "LOQACCOUNT_KEY": "" }
-    },
-    "tenant": "DEMO",
-    "__N_SSP": true
-  },
-  "page": "/account/subscription-and-billing",
-  "query": {},
-  "buildId": "development",
-  "isFallback": false,
-  "gssp": true,
-  "appGip": true,
-  "scriptLoader": []
-}

package/cypress/fixtures/print-subscriptions/voucher-subscription-response.json

@@ -1,101 +0,0 @@
-{
-  "props": {
-    "pageProps": {
-      "user": {
-        "userId": null,
-        "cpn": "4AAA039261010",
-        "firstName": "Test",
-        "lastName": "test",
-        "email": "cmp-test-direct-20-09-22@yopmail.com",
-        "paymentFailure": {
-          "__typename": "CustomerPaymentFailure",
-        	"active": false,
-				  "startDate": null
-        },
-        "subscriptions": [
-          {
-            "id": "SUB-0010708341",
-            "cpn": "4AAA039261010",
-            "startDate": "2022-09-20T09:44:28",
-            "endDate": null,
-            "serviceCancellationDate": null,
-            "isActive": true,
-            "status": "Active",
-            "price": 34.67,
-            "currency": "GBP",
-            "type": "Print",
-            "dtc": false,
-            "products": [
-              {
-                "id": "SUB-0010708341|PKPG-065",
-                "code": "PKPG-065"
-              }
-            ],
-            "phases": [
-              {
-                "id": "SUB-0010708341|InitialCooling",
-                "type": "Cooling Off",
-                "active": false,
-                "startDate": "2022-09-26T00:00:00",
-                "endDate": "2022-10-10T23:59:59"
-              },
-              {
-                "id": "SUB-0010708341|TM-S01",
-                "type": "Contract",
-                "active": false,
-                "startDate": "2022-10-10T23:59:59",
-                "endDate": "2022-12-26T00:00:00"
-              },
-              {
-                "id": "SUB-0010708341|TM-S02",
-                "type": "Rolling",
-                "active": false,
-                "startDate": "2022-12-26T00:00:00",
-                "endDate": null
-              }
-            ],
-            "billingDetails": {
-              "__typename": "BillingDetails",
-              "available": true,
-              "billCycleDay": 26,
-              "paymentMethod": {
-                "__typename": "PaymentMethod",
-                "type": "BankTransfer",
-                "cardType": null,
-                "cardNumber": null,
-                "expirationMonth": null,
-                "expirationYear": null,
-                "bankName": "A Bank",
-                "bankCode": "200000",
-                "bankTransferAccountNumberMask": "****4247",
-                "paymentMethodStatus": "Active",
-                "paypalBaid": null,
-                "paypalType": null,
-                "walletType": null
-              }
-            },
-            "nextVoucherBookletDueDate": "2023-09-17",
-            "nextVoucherInsGenerationDate": "2023-09-10",
-            "fulfilmentPeriodStartDate": "2023-09-25",
-            "fulfilmentPeriodEndDate": "2023-12-24",
-            "freeOfCharge": false,
-            "deliveryInformation": "On my doorstep",
-            "__typename": "Subscription"
-          }
-        ],
-        "__typename": "User",
-        "cpn": "4AAA039261010"
-      },
-      "env": { "LOQACCOUNT_KEY": "" }
-    },
-    "tenant": "DEMO",
-    "__N_SSP": true
-  },
-  "page": "/account/subscription-and-billing",
-  "query": {},
-  "buildId": "development",
-  "isFallback": false,
-  "gssp": true,
-  "appGip": true,
-  "scriptLoader": []
-}