Skip to content

Commit

Permalink
Merge branch 'latest' into dep-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Jamie Blaut committed Apr 15, 2020
2 parents e0ce954 + 1ca55dd commit 4e13c05
Show file tree
Hide file tree
Showing 13 changed files with 1,831 additions and 36 deletions.
74 changes: 49 additions & 25 deletions cypress/support/config/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -3374,7 +3374,7 @@ module.exports = () => ({
enabled: false,
},
test: {
paths: [],
paths: ['/serbian/cyr/23279016'],
enabled: false,
},
local: {
Expand Down Expand Up @@ -3426,12 +3426,12 @@ module.exports = () => ({
enabled: false,
},
test: {
paths: [],
enabled: false,
paths: ['/serbian/cyr/23279016'], // CPS video
enabled: true,
},
local: {
paths: [], // Once support for variants is available: '/serbian/cyr/srbija-49427344'
enabled: false,
paths: ['/serbian/cyr/23279016'], // CPS video
enabled: true,
},
},
smoke: false,
Expand Down Expand Up @@ -3537,12 +3537,12 @@ module.exports = () => ({
enabled: false,
},
test: {
paths: [],
enabled: false,
paths: ['/serbian/lat/23279016'], // CPS video
enabled: true,
},
local: {
paths: [],
enabled: false,
paths: ['/serbian/lat/23279016'], // CPS video
enabled: true,
},
},
smoke: false,
Expand Down Expand Up @@ -4686,12 +4686,18 @@ module.exports = () => ({
enabled: false,
},
test: {
paths: [],
enabled: false,
paths: [
'/ukchina/simp/23279012', // CPS video
'/ukchina/simp/multimedia/2016/11/161104_tc2_testmap1', // TC2 video
],
enabled: true,
},
local: {
paths: [],
enabled: false,
paths: [
'/ukchina/simp/23279012', // CPS video
'/ukchina/simp/multimedia/2016/11/161104_tc2_testmap1', // TC2 video
],
enabled: true,
},
},
smoke: false,
Expand Down Expand Up @@ -4797,12 +4803,18 @@ module.exports = () => ({
enabled: false,
},
test: {
paths: [],
enabled: false,
paths: [
'/ukchina/trad/23279012', // CPS video
'/ukchina/trad/multimedia/2016/11/161104_tc2_testmap1', // TC2 video
],
enabled: true,
},
local: {
paths: [], // Enable once variants supported '/ukchina/trad/49375846'
enabled: false,
paths: [
'/ukchina/trad/23279012', // CPS video
'/ukchina/trad/multimedia/2016/11/161104_tc2_testmap1', // TC2 video
],
enabled: true,
},
},
smoke: false,
Expand Down Expand Up @@ -5542,12 +5554,18 @@ module.exports = () => ({
enabled: false,
},
test: {
paths: [],
enabled: false,
paths: [
'/zhongwen/simp/uk-23283128', // CPS Audio
'/zhongwen/simp/multimedia/2016/11/161107_tc2_testmap1', // TC2 Video
],
enabled: true,
},
local: {
paths: [],
enabled: false,
paths: [
'/zhongwen/simp/uk-23283128', // CPS Audio
'/zhongwen/simp/multimedia/2016/11/161107_tc2_testmap1', // TC2 Video
],
enabled: true,
},
},
smoke: false,
Expand Down Expand Up @@ -5653,12 +5671,18 @@ module.exports = () => ({
enabled: false,
},
test: {
paths: [],
enabled: false,
paths: [
'/zhongwen/trad/uk-23283128', // CPS Audio
'/zhongwen/trad/multimedia/2016/11/161107_tc2_testmap1', // TC2 Video
],
enabled: true,
},
local: {
paths: [], // Once variant support is available '/zhongwen/trad/chinese-news-49631219'
enabled: false,
paths: [
'/zhongwen/trad/uk-23283128', // CPS Audio
'/zhongwen/trad/multimedia/2016/11/161107_tc2_testmap1', // TC2 Video
],
enabled: true,
},
},
smoke: false,
Expand Down
167 changes: 167 additions & 0 deletions data/serbian/cpsAssets/cyr/23279016.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
{
"content": {
"blocks": [
{
"advertising": true,
"caption": "nnnnn",
"embedding": true,
"format": "video",
"id": "p01qjbpq",
"imageUrl": "ichef.test.bbci.co.uk/images/ic/$recipe/p01qjbvt.jpg",
"subType": "clip",
"synopses": {
"long": "koala ijm aus",
"medium": "australia",
"short": "koajaa"
},
"title": "koala",
"type": "media",
"versions": [
{
"availableFrom": 1582890367000,
"availableTerritories": {
"nonUk": true,
"uk": true,
"world": false
},
"duration": 15,
"durationISO8601": "PT15S",
"types": ["Editorial"],
"versionId": "p01qjbvb",
"warnings": {}
}
]
},
{
"markupType": "plain_text",
"text": "Јинка Илори је уметник који живи у Лондону.",
"type": "paragraph"
},
{
"markupType": "plain_text",
"text": "Његова дела су инспирисана нигеријским причама и нигеријским наслеђем.",
"type": "paragraph"
},
{
"markupType": "plain_text",
"text": "Илоријеви радови су изложени у галеријама и на улицама Лондона.",
"type": "paragraph"
},
{
"markupType": "plain_text",
"text": "Ево како је пут у Нигерију у детињству утицао на његов рад.",
"type": "paragraph"
}
]
},
"metadata": {
"analyticsLabels": {
"counterName": "serbiancyr.media_asset.23279016.page",
"cps_asset_id": "23279016",
"cps_asset_type": "map"
},
"blockTypes": ["media", "paragraph"],
"createdBy": "serbian-v6",
"firstPublished": 1585040745000,
"id": "urn:bbc:ares::asset:serbian/cyr/23279016",
"includeComments": false,
"language": "sr-Cyrl",
"lastPublished": 1585040746000,
"lastUpdated": 1585040757028,
"locators": {
"assetId": "23279016",
"assetUri": "/serbian/cyr/23279016",
"cpsUrn": "urn:bbc:content:assetUri:serbian/cyr/23279016",
"curie": "http://www.bbc.co.uk/asset/281f815b-b6dc-e240-87ec-2fdcc6fe401f"
},
"options": {
"allowDateStamp": true,
"allowHeadline": true,
"allowPrintingSharingLinks": true,
"allowRelatedStoriesBox": true,
"allowRightHandSide": true,
"hasNewsTracker": false,
"includeComments": false,
"isBreakingNews": false,
"isFactCheck": false,
"isIgorSeoTagsEnabled": false,
"isKeyContent": false
},
"tags": {},
"timestamp": 1585040745000,
"type": "MAP",
"version": "v1.1.8"
},
"promo": {
"headlines": {
"headline": "Улична уметност: „Доносим експлозију боја у јавни простор“ MAP MAP TEST 1",
"shortHeadline": "Улична уметност: „Доносим експлозију боја у јавни простор“ MAP TEST 1"
},
"id": "urn:bbc:ares::asset:serbian/cyr/23279016",
"indexImage": {
"altText": "corona",
"caption": "corna",
"copyrightHolder": "BBC",
"height": 351,
"href": "http://b.files.bbci.co.uk/4289/test/_63733071_coronavirus.jpg",
"id": "63733071",
"path": "/cpsdevpb/4289/test/_63733071_coronavirus.jpg",
"subType": "index",
"type": "image",
"width": 624
},
"language": "sr-Cyrl",
"locators": {
"assetId": "23279016",
"assetUri": "/serbian/cyr/23279016",
"cpsUrn": "urn:bbc:content:assetUri:serbian/cyr/23279016",
"curie": "http://www.bbc.co.uk/asset/281f815b-b6dc-e240-87ec-2fdcc6fe401f"
},
"media": {
"advertising": true,
"caption": "nnnnn",
"embedding": true,
"format": "video",
"id": "p01qjbpq",
"imageUrl": "ichef.test.bbci.co.uk/images/ic/$recipe/p01qjbvt.jpg",
"subType": "clip",
"synopses": {
"long": "koala ijm aus",
"medium": "australia",
"short": "koajaa"
},
"title": "koala",
"type": "media",
"versions": [
{
"availableFrom": 1582890367000,
"availableTerritories": { "nonUk": true, "uk": true, "world": false },
"duration": 15,
"durationISO8601": "PT15S",
"types": ["Editorial"],
"versionId": "p01qjbvb",
"warnings": {}
}
]
},
"passport": { "taggings": [] },
"summary": "Улична уметност: „Доносим експлозију боја у јавни простор“ MAP TEST 1",
"timestamp": 1585040745000,
"type": "cps"
},
"relatedContent": {
"groups": [],
"section": {
"name": "Почетна страна",
"subType": "index",
"type": "simple",
"uri": "/serbian/cyr/front_page"
},
"site": {
"name": "BBC News na srpskom",
"subType": "site",
"type": "simple",
"uri": "/serbian/cyr"
}
}
}

0 comments on commit 4e13c05

Please sign in to comment.