Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WSTEAM1-943 - Enable CAF for 3 services #11516

Merged
merged 49 commits into from
Apr 24, 2024
Merged

Conversation

emilysaffron
Copy link
Contributor

@emilysaffron emilysaffron commented Apr 11, 2024

Resolves JIRA WSTEAM1-943

Overall changes

Set isCaf to true if the service is hausa pidgin or thai to enable these services to render CPS asset through the ArticlePage/MediaArticlePage components

Code changes

  • Set isCaf to true if the service is hausa pidgin or thai
  • Remove overrides that were used for testing CAF
  • Fix/add test data for integration and E2E test suites to allow testing of services using CAF data fetching/rendering

Testing

  1. Visit http://localhost:7080/thai/61719672?renderer_env=live and check if its rendered with CAF - top news column items should have a white background, different to https://www.bbc.com/thai/61719672
  2. Visit http://localhost:7080/hausa/labarai-51622389?renderer_env=live and check media is working

Helpful Links

Add Links to useful resources related to this PR if applicable.

Coding Standards

Repository use guidelines

@emilysaffron emilysaffron self-assigned this Apr 11, 2024
@emilysaffron emilysaffron marked this pull request as ready for review April 11, 2024 14:35
src/server/index.jsx Outdated Show resolved Hide resolved
src/server/index.jsx Outdated Show resolved Hide resolved
HarveyPeachey and others added 24 commits April 19, 2024 12:12
WSTEAM1-913 - Changes page description targeting for block model format PGL E2E
…:bbc/simorgh into WSTEAM1-948-update-integration-tests-PGL
* WSTEAM1-945: Update e2e

* WSTEAM1-945: Update settings

* WSTEAM1-945: Update fixtures

* WSTEAM1-945: Alter route

* WSTEAM1-945: Fix HTML lang tests.

* WSTEAM1-945: Update fixture

* WSTEAM1-945: Fix PGL tests

* WSTEAM1-945: Add tests

* WSTEAM1-945: Update tests

* WSTEAM1-945: Update tests

* WSTEAM1-945: Update tests

* WSTEAM1-945: Enable e2e tests on CAF STY pages. Update and add fixture data

* WSTEAM1-945: Refactor cpsId check

* WSTEAM1-945: refctor to assign to variable

* WSTEAM1-945: Refactor

* WSTEAM1-945: Update MAP fixture data to include ATI campaigns

* WSTEAM1-945: Set Cypress getPageData pageType to article if isCaf

* WSTEAM1-945: Lint and simplify post merge

* WSTEAM1-945: Update snapshots

* WSTEAM1-945: Update snapshots

---------

Co-authored-by: Isabella Mitchell <i.mitchell.0707@gmail.com>
Co-authored-by: Isabella Mitchell <98817636+Isabella-Mitchell@users.noreply.github.com>
…ts-MAP

WSTEAM1-967: Update MAP integration tests
…ts-PGL

WSTEAM1-948: Update PGL integration tests
…ts-STY

WSTEAM1-968: Add integration tests for CAF STY assets
@amoore108 amoore108 changed the title WSTEAM1-943 set iscaf to true for hausa pidgin and thai WSTEAM1-943 - Enable CAF for 3 services Apr 24, 2024
@amoore108 amoore108 merged commit 1316bdb into latest Apr 24, 2024
11 checks passed
@amoore108 amoore108 deleted the WSTEAM1-942-rollout-caf branch April 24, 2024 10:04
MeriemMechri pushed a commit that referenced this pull request May 12, 2024
* changes description targeting for block model format

* adds article pageType

* set iscaf to true for hausa pidgin and thai

Co-authored-by: Shayne Marc Enzo Ahchoon <shayneahchoon@users.noreply.github.com>

* check if optimo

* fix optimo check

* check pagetype ionstead of isoptimo

* remove pagetype check

* WSTEAM1-942: Update lint

* Add Thai PGL asset

* Enable fetching of cps PGL fixtures from article page handler

* Add integration tests targetting CAF via thai

* updates test to cater for caf only services

* adds else clause

* WSTEAM1-967: CAF - Update MAP Integration test and snapshots

* Add Hausa CAF integration tests

* Apply CPS id check from e2es PR

* WSTEAM1-945: Update e2e (#11529)

* WSTEAM1-945: Update e2e

* WSTEAM1-945: Update settings

* WSTEAM1-945: Update fixtures

* WSTEAM1-945: Alter route

* WSTEAM1-945: Fix HTML lang tests.

* WSTEAM1-945: Update fixture

* WSTEAM1-945: Fix PGL tests

* WSTEAM1-945: Add tests

* WSTEAM1-945: Update tests

* WSTEAM1-945: Update tests

* WSTEAM1-945: Update tests

* WSTEAM1-945: Enable e2e tests on CAF STY pages. Update and add fixture data

* WSTEAM1-945: Refactor cpsId check

* WSTEAM1-945: refctor to assign to variable

* WSTEAM1-945: Refactor

* WSTEAM1-945: Update MAP fixture data to include ATI campaigns

* WSTEAM1-945: Set Cypress getPageData pageType to article if isCaf

* WSTEAM1-945: Lint and simplify post merge

* WSTEAM1-945: Update snapshots

* WSTEAM1-945: Update snapshots

---------

Co-authored-by: Isabella Mitchell <i.mitchell.0707@gmail.com>
Co-authored-by: Isabella Mitchell <98817636+Isabella-Mitchell@users.noreply.github.com>

* Update snaphots to reflect SEO and ATI changes

* Remove redundant isCaf flag

* Use CafEnabledServices const across app

* WSTEAM1-967: Import cafEnabledServices from lib

* Add CPS id check for STY tests

* Add CAF STY fixture asset

* Remove apple itunes banner test

* Update snapshot

* Update snapshot to include SEO and ATI values

* Update CAF STY snapshots to include lang code

---------

Co-authored-by: Harvey Peachey <harvey.peachey@bbc.co.uk>
Co-authored-by: Shayne Marc Enzo Ahchoon <shayneahchoon@users.noreply.github.com>
Co-authored-by: Aaron Moore <aaron.moore@bbc.co.uk>
Co-authored-by: Shayne Marc Enzo Ahchoon <shayne.ahchoon@bbc.co.uk>
Co-authored-by: Shayne Marc Enzo Ahchoon <32307964+shayneahchoon@users.noreply.github.com>
Co-authored-by: alex-magana <alex.magana@andela.com>
Co-authored-by: Isabella Mitchell <i.mitchell.0707@gmail.com>
Co-authored-by: Isabella Mitchell <98817636+Isabella-Mitchell@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants