@newskit-render/core 4.26.3-alpha.1 → 4.26.3-alpha.2

package/cypress/e2e/account/subscription-and-billing.cy.js

@@ -0,0 +1,434 @@
+describe('Subscription and billing details without user', () => {
+  beforeEach(() => {
+    cy.mockConsentAndVisit('/account/subscription-and-billing')
+  })
+
+  it('Should show no subscription view without account', () => {
+    cy.contains('You don’t have a subscription')
+    cy.contains('Start a subscription and get access to all benefits.')
+    cy.contains('a', 'View subscription options').should(
+      'have.attr',
+      'href',
+      '/title-storefront'
+    )
+  })
+
+  it('Should show no subscription view for user without subscription', () => {
+    cy.GetAcsSession('noSub')
+
+    cy.contains('You don’t have a subscription')
+    cy.contains('Start a subscription and get access to all benefits.')
+    cy.get('[data-testid="primary-button"]')
+      .should('have.attr', 'href', '/title-storefront')
+      .contains('View subscription options')
+  })
+})
+
+describe('Subscription and billing details for newly registered user', () => {
+  it('Should show pending activation view', () => {
+    cy.GetAcsSession('withSub')
+    cy.mockConsent()
+    cy.visitAndOverrideNextData(
+      '/account/subscription-and-billing',
+      'props.pageProps.user.subscriptions[0].status',
+      'Pending Activation'
+    )
+    cy.contains('Your subscription is being activated')
+    cy.contains(
+      'Your membership is being set up at the moment, so you can’t access your subscription and billing details yet.'
+    )
+    cy.contains(
+      'Setting up your account can take a couple of hours, so please come back and try again later.'
+    )
+  })
+})
+
+describe('Subscription and billing details for user with expired subscription', () => {
+  it('Should show expired subscription view', () => {
+    const date = new Date(Date.now() - 24 * 35 * 3600 * 1000)
+
+    cy.GetAcsSession('expiredSub')
+    cy.mockConsent()
+    cy.visitAndOverrideNextData(
+      '/account/subscription-and-billing',
+      'props.pageProps.user.subscriptions[0].serviceCancellationDate',
+      date.toISOString()
+    )
+
+    cy.contains('You’ve previously had a subscription that has now expired')
+    cy.contains(
+      `On ${date.toLocaleDateString(
+        'en-GB'
+      )} your Digital subscription expired. You can re-subscribe by confirming a few details or view other packages that are available.`
+    )
+    cy.get('[data-testid="primary-button"]')
+      .should('have.attr', 'href', '/title-re-subscribe')
+      .contains('Re-subscribe')
+
+    cy.get('[data-testid="secondary-button"]')
+      .should('have.attr', 'href', '/title-subscription-options')
+      .contains('View subscription options')
+  })
+})
+
+describe('Subscription and billing details for user with VIP/free subscription', () => {
+  it('Should show no payment details view', () => {
+    cy.GetAcsSession('withSub')
+    cy.mockConsent()
+    cy.visitAndOverrideNextData(
+      '/account/subscription-and-billing',
+      'props.pageProps.user.subscriptions[0].billingDetails.paymentMethod.type',
+      null
+    )
+    cy.contains(
+      'There are no payment details associated with this type of account'
+    )
+  })
+})
+
+describe('Subscription and billing details for Digital user', () => {
+  beforeEach(() => {
+    cy.GetTnlAcsSession('digitalCard')
+    cy.mockConsentAndVisit('/account/subscription-and-billing')
+  })
+
+  it('Should display page header and description', () => {
+    cy.contains('Subscription & Billing')
+    cy.contains(
+      'All your subscription details, including payment info and transactions.'
+    )
+  })
+
+  it('Should display Subscription details section', () => {
+    cy.contains(
+      '[data-testid="ContentListIntroduction"]',
+      'Subscription details'
+    )
+    cy.contains('Type')
+    cy.contains('Digital')
+    cy.contains('Price')
+    cy.contains('£25.99')
+    cy.contains('Customer number')
+    cy.contains('4AAA039263007')
+    cy.contains(
+      'Your customer number is your unique identifier and may be asked when contacting us'
+    )
+    cy.contains('Start date')
+    cy.contains('20/09/2022')
+    cy.contains('Benefits')
+    cy.contains(
+      'Short description of subscription type, including product access'
+    )
+  })
+
+  it('Should display Cancellation link', () => {
+    cy.contains('Cancel subscription')
+    cy.get('a[href="/account/cancellation"]').should('be.visible').click()
+    cy.location().should((loc) => {
+      expect(loc.pathname).to.eq('/account/cancellation')
+    })
+    cy.contains('Please tell us why you want to cancel')
+  })
+
+  it('Should display Billing details section', () => {
+    cy.contains('[data-testid="ContentListIntroduction"]', 'Billing details')
+    cy.contains('Payment method')
+    cy.get('[data-testid="visa-icon"]').should('exist')
+    cy.contains('************1111')
+    cy.contains('expiry date 03/30')
+  })
+
+  it('Should display Invoice history section', () => {
+    cy.contains('[data-testid="ContentListIntroduction"]', 'Invoice history')
+    cy.contains('Digital pack')
+    cy.contains('20 Sept 2022')
+    cy.contains('Paid')
+    cy.get('a[data-testid="download-button"]')
+      .should('have.attr', 'href', '#')
+      .contains('View')
+  })
+
+  it('Should NOT display Your deliveries section', () => {
+    cy.contains(
+      '[data-testid="ContentListIntroduction"]',
+      'Your deliveries'
+    ).should('not.exist')
+  })
+})
+
+describe('Subscription and billing details for Print user', () => {
+  beforeEach(() => {
+    cy.GetTnlAcsSession('print')
+    cy.mockConsentAndVisit('/account/subscription-and-billing')
+  })
+
+  it('Should display page header and description', () => {
+    cy.contains('Subscription & Billing')
+    cy.contains(
+      'All your subscription details, including payment info and transactions.'
+    )
+  })
+
+  it('Should display Subscription details section', () => {
+    cy.contains(
+      '[data-testid="ContentListIntroduction"]',
+      'Subscription details'
+    )
+    cy.contains('Type')
+    cy.contains('Print')
+    cy.contains('Price')
+    cy.contains('£10.83')
+    cy.contains('Customer number')
+    cy.contains('4AAA039261011')
+    cy.contains(
+      'Your customer number is your unique identifier and may be asked when contacting us'
+    )
+    cy.contains('Start date')
+    cy.contains('20/09/2022')
+    cy.contains('Benefits')
+    cy.contains(
+      'Short description of subscription type, including product access'
+    )
+  })
+
+  it('Should display Cancellation link', () => {
+    cy.contains('Cancel subscription')
+    cy.get('a[href="/account/cancellation"]').should('be.visible').click()
+    cy.location().should((loc) => {
+      expect(loc.pathname).to.eq('/account/cancellation')
+    })
+    cy.contains('Please tell us why you want to cancel')
+  })
+
+  it('Should display Billing details section', () => {
+    cy.contains('[data-testid="ContentListIntroduction"]', 'Billing details')
+    cy.contains('Payment method')
+    cy.get('[data-testid="visa-icon"]').should('exist')
+    cy.contains('************1111')
+    cy.contains('expiry date 01/28')
+    cy.contains('Billing postcode')
+    cy.contains('SE1 9GF')
+  })
+
+  it('Should display Your deliveries section', () => {
+    cy.contains('[data-testid="ContentListIntroduction"]', 'Your deliveries')
+    cy.contains('Address')
+    cy.contains('Buckingham Palace, London, SW1A 1AA')
+    cy.contains('Delivery instructions')
+    cy.contains('On my doorstep')
+    cy.contains('Holiday Stops')
+    cy.contains(
+      'You can pause your print delivery at any time by adding a Holiday Stop to your account. Holiday Stops need to be booked before 16:00 GMT the day before you want to pause delivery.'
+    )
+
+    cy.contains(
+      'Your contact address will be used for any of your deliveries. This can be managed via Personal details'
+    )
+  })
+
+  it('Should display Invoice history section', () => {
+    cy.contains('[data-testid="ContentListIntroduction"]', 'Invoice history')
+    cy.contains('Print pack')
+    cy.contains('24 Apr 2023')
+    cy.contains('Paid')
+    cy.get('a[data-testid="download-button"]')
+      .should('have.attr', 'href', '#')
+      .contains('View')
+  })
+
+  it('Should display Your deliveries section for users with vouchers', () => {
+    cy.GetTnlAcsSession('printVouchers')
+    cy.mockConsentAndVisit('/account/subscription-and-billing')
+
+    cy.contains('[data-testid="ContentListIntroduction"]', 'Your deliveries')
+    cy.contains('Address')
+    cy.contains('2 Tuke House, Cromwell Road, York, YO1 6DJ, North Yorkshire')
+    cy.contains('Delivery instructions')
+    cy.contains('On my doorstep')
+    cy.contains('Holiday Stops')
+    cy.contains(
+      'You can pause your print delivery at any time by adding a Holiday Stop to your account. Holiday Stops need to be booked before 16:00 GMT the day before you want to pause delivery.'
+    )
+    cy.contains('Your vouchers')
+    cy.contains(
+      'If your voucher booklet hasn’t arrived within three days of your booklet start date, or you have any issues regarding your vouchers, please contact us.'
+    )
+    cy.contains('Voucher booklet start date')
+    cy.contains('17/03/24')
+    cy.contains(
+      'Your contact address will be used for any of your deliveries. This can be managed via Personal details'
+    )
+  })
+})
+
+describe('Subscription and billing details for Digi-Print user', () => {
+  beforeEach(() => {
+    cy.GetTnlAcsSession('digiprint')
+    cy.mockConsentAndVisit('/account/subscription-and-billing')
+  })
+  // Same as Print user
+
+  it('Should display Subscription details section', () => {
+    cy.contains(
+      '[data-testid="ContentListIntroduction"]',
+      'Subscription details'
+    )
+    cy.contains('Type')
+    cy.contains('Digi-Print')
+    //...rest is same as Print user
+  })
+
+  it('Should display Invoice history section', () => {
+    cy.contains('[data-testid="ContentListIntroduction"]', 'Invoice history')
+    cy.contains('Digi-Print pack')
+    cy.contains('12 Nov 2023')
+    cy.contains('Paid')
+    cy.get('a[data-testid="download-button"]')
+      .should('have.attr', 'href', '#')
+      .contains('View')
+  })
+})
+
+describe('Subscription and billing details for Paypal user', () => {
+  beforeEach(() => {
+    cy.GetAcsSession('paypalSub')
+    cy.mockConsentAndVisit('/account/subscription-and-billing')
+  })
+  // Same as Digital user
+
+  it('Should display Billing details section', () => {
+    cy.contains('[data-testid="ContentListIntroduction"]', 'Billing details')
+    cy.contains('Payment method')
+    cy.get('[data-testid="paypal-icon"]').should('exist')
+    cy.contains('cmp.paypal.user.verified.test@news.co.uk')
+  })
+
+  it('Should show inline banner for Paypal subscription', () => {
+    cy.get('a[href="/account/payment"]').should('be.visible').click()
+    cy.contains(
+      '[data-testid="Zuora-inline"]',
+      'To update your Paypal credentials, please speak to one of our advisors on xxxx-xxx-xxxx or add a new payment method via credit/debit card using the form below.'
+    )
+  })
+})
+
+describe('Subscription and billing edit pages', () => {
+  describe('Edit delivery instructions', () => {
+    beforeEach(() => {
+      cy.GetTnlAcsSession('print')
+      cy.mockConsentAndVisit('/account/subscription-and-billing')
+    })
+
+    it('Should show user current delivery instructions', () => {
+      cy.get('a[href="/account/edit/delivery-instructions"]')
+        .should('be.visible')
+        .click()
+
+      cy.contains('Delivery instructions')
+      cy.contains('Where should we leave your Newspaper?')
+      cy.contains('Through my letterbox')
+      cy.get('input[value="Through my letterbox"]').should(
+        'not.have.attr',
+        'checked'
+      )
+      cy.contains('On my doorstep')
+      cy.get('input[value="On my doorstep"]').should('have.attr', 'checked')
+      cy.contains('On my porch')
+      cy.get('input[value="On my porch"]').should('not.have.attr', 'checked')
+      cy.contains('Other (Please state)')
+      cy.get('input[value="Other (Please state)"]').should(
+        'not.have.attr',
+        'checked'
+      )
+
+      cy.contains('[data-testid="primary-button"]', 'Save')
+      cy.contains('[data-testid="secondary-button"]', 'Cancel')
+
+      // Redirects to Subscription and billing page
+      cy.get('[data-testid="secondary-button"]').click()
+      cy.location().should((loc) => {
+        expect(loc.pathname).to.eq('/account/subscription-and-billing')
+      })
+    })
+
+    it('Should change user delivery instructions', () => {
+      cy.get('a[href="/account/edit/delivery-instructions"]')
+        .should('be.visible')
+        .click()
+
+      cy.contains('Through my letterbox').click()
+
+      // mock sussesful api call
+      cy.intercept('POST', '/api/account/mutate', {
+        statusCode: 200,
+        body: { data: { updateUserSubscription: { success: true } } },
+      })
+
+      cy.get('[data-testid="primary-button"]').click()
+      cy.contains(
+        '[data-testid="toast-container"]',
+        'Updating your delivery instructions...'
+      )
+
+      // Redirects to Subscription and billing page
+      cy.location().should((loc) => {
+        expect(loc.pathname).to.eq('/account/subscription-and-billing')
+      })
+      cy.contains(
+        '[data-testid="toast-container"]',
+        'Your delivery instructions were succesfully updated. This may take up to 48hrs to come into effect.'
+      )
+      // cy.contains('Through my letterbox').should('have.length', 1)
+    })
+
+    it('Should add custom delivery instructions', () => {
+      cy.get('a[href="/account/edit/delivery-instructions"]')
+        .should('be.visible')
+        .click()
+
+      cy.contains('Other (Please state)').click()
+      cy.contains('You have 70 characters remaining')
+      cy.contains(
+        'Please note that if you choose a delivery location that is not secure we cannot be liable for lost or stolen newspapers.'
+      )
+
+      cy.get('textarea[name="other"]').clear()
+      cy.get('[data-testid="primary-button"]').click()
+      cy.contains('Please enter your delivery instructions.')
+
+      cy.get('textarea[name="other"]').clear()
+      cy.get('textarea[name="other"]').type(
+        'This is more than seventy Characters. Lorem ipsum dolor sit amet, consectetur.'
+      )
+      cy.contains('You have 0 characters remaining')
+      //If hitting Save, field will be updated
+
+      cy.get('textarea[name="other"]').clear()
+      cy.get('textarea[name="other"]').type('Ring the bell')
+
+      // mock sussesful api call
+      cy.intercept('POST', '/api/account/mutate', {
+        statusCode: 200,
+        body: { data: { updateUserSubscription: { success: true } } },
+      })
+
+      cy.get('[data-testid="primary-button"]').click()
+      cy.contains(
+        '[data-testid="toast-container"]',
+        'Updating your delivery instructions...'
+      )
+
+      // Redirects to Subscription and billing page
+      cy.location().should((loc) => {
+        expect(loc.pathname).to.eq('/account/subscription-and-billing')
+      })
+      cy.contains(
+        '[data-testid="toast-container"]',
+        'Your delivery instructions were succesfully updated. This may take up to 48hrs to come into effect.'
+      )
+      // cy.contains('Ring the bell').should('have.length', 1)
+    })
+  })
+
+  // describe('Edit holiday stops', () => {}) // check holiday-stops.cy.js
+})

package/cypress/fixtures/paymentFailure.js

@@ -17,3 +17,8 @@ export const paymentFailureTerminatedNotice = {
   active: true,
   startDate: new Date(Date.now() - 24 * 35 * 3600 * 1000).toISOString(),
 }
+
+export const serviceCancellationDate = new Date(Date.now() + 20 * 30 * 3600 * 1000).toISOString()
+
+
+

package/cypress/support/commands.js

@@ -8,7 +8,7 @@ import {
 } from './consentValues'
 import { userMap } from './users'
 
-const setConentLocalStorage = () => {
+const setConsentLocalStorage = () => {
   localStorage.setItem('_sp_local_state', JSON.stringify(_sp_local_state))
   localStorage.setItem(
     '_sp_user_consent_7377',
@@ -22,13 +22,13 @@ const setConentLocalStorage = () => {
 
 Cypress.Commands.add('mockConsentAndVisit', (url) => {
   cy.setCookie('consentUUID', consentUUIDValue)
-  setConentLocalStorage()
+  setConsentLocalStorage()
   cy.visit(url)
 })
 
 Cypress.Commands.add('mockConsent', () => {
   cy.setCookie('consentUUID', consentUUIDValue)
-  setConentLocalStorage()
+  setConsentLocalStorage()
 })
 
 Cypress.Commands.add('GetAcsSession', (user = 'default') => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@newskit-render/core",
-  "version": "4.26.3-alpha.1",
+  "version": "4.26.3-alpha.2",
   "description": "Newskit Render - Core package",
   "author": "",
   "license": "UNLICENSED",
@@ -44,12 +44,12 @@
     "@newrelic/winston-enricher": "4.0.1",
     "@newskit-render/api": "^1.11.0",
     "@newskit-render/auth": "^1.8.0",
-    "@newskit-render/checkout": "^3.9.26-alpha.0",
+    "@newskit-render/checkout": "^3.9.26-alpha.1",
     "@newskit-render/feature-flags": "^1.7.0",
     "@newskit-render/feed": "^1.8.7",
-    "@newskit-render/my-account": "^7.48.2-alpha.1",
-    "@newskit-render/shared-components": "^4.23.5-alpha.0",
-    "@newskit-render/standalone-components": "^3.20.19-alpha.0",
+    "@newskit-render/my-account": "^7.48.2-alpha.2",
+    "@newskit-render/shared-components": "^4.23.5-alpha.1",
+    "@newskit-render/standalone-components": "^3.20.19-alpha.1",
     "@newskit-render/validation": "^1.17.0",
     "cross-fetch": "3.1.5",
     "graphql": "16.6.0",

package/cypress/e2e/account/SkipToContent.cy.js

@@ -1,12 +0,0 @@
-describe('SkipToContent', () => {
-  beforeEach(() => {
-    cy.GetAcsSession()
-    cy.mockConsentAndVisit('/account')
-  })
-
-  it('should take the user to the beginning of the main area', () => {
-    cy.get('[data-testid="skip-to-content"]').focus()
-    cy.get('[data-testid="skip-to-content"]').click()
-    cy.focused().should('have.id', 'main')
-  })
-})