Merge branch 'main' into allow-accessibility-tagpage

guardian · Jul 2, 2024 · 2d7d9aa · 2d7d9aa
2 parents 0e115c4 + a7c70e0
commit 2d7d9aa
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 54 deletions.
diff --git a/applications/app/views/fragments/audioBody.scala.html b/applications/app/views/fragments/audioBody.scala.html
@@ -63,17 +63,6 @@
                             </a>
                         </li>
                     }
-                    @audio.googlePodcastsUrl.map { googlePodcastsUrl =>
-                        <li class="podcast__meta-item podcast__meta-item--googlePodcasts">
-                            <a class="podcast__meta__item-link podcast__section-link"
-                                href="@googlePodcastsUrl"
-                                data-link-name="@trackingCode("googlePodcasts")"
-                                >
-                                @fragments.inlineSvg("google-podcasts", "journalism/audio", List("podcast__meta-icon", "podcast__section-icon"))
-                                Google Podcasts
-                            </a>
-                        </li>
-                    }
                     @audio.spotifyUrl.map { spotifyUrl =>
                         <li class="podcast__meta-item podcast__meta-item--spotify">
                             <a class="podcast__meta__item-link podcast__section-link"

diff --git a/common/app/conf/switches/ABTestSwitches.scala b/common/app/conf/switches/ABTestSwitches.scala
@@ -54,4 +54,14 @@ trait ABTestSwitches {
     sellByDate = Some(LocalDate.of(2024, 7, 31)),
     exposeClientSide = true,
   )
+
+  Switch(
+    ABTests,
+    "ab-sticky-live-blog-ask-test",
+    "A sticky reader revenue ask on the left column of a liveblog",
+    owners = Seq(Owner.withEmail("[email protected]")),
+    safeState = Off,
+    sellByDate = Some(LocalDate.of(2024, 7, 31)),
+    exposeClientSide = true,
+  )
 }
diff --git a/common/app/conf/switches/PerformanceSwitches.scala b/common/app/conf/switches/PerformanceSwitches.scala
@@ -213,7 +213,7 @@ trait PerformanceSwitches {
     "Shorten the surrogate cache time for recent articles for load testing",
     owners = Seq(Owner.withEmail("[email protected]")),
     safeState = Off,
-    sellByDate = LocalDate.of(2024, 7, 1),
+    sellByDate = LocalDate.of(2024, 8, 1),
     exposeClientSide = false,
   )
 
@@ -223,7 +223,7 @@ trait PerformanceSwitches {
     "Shorten the surrogate cache time for older articles for load testing",
     owners = Seq(Owner.withEmail("[email protected]")),
     safeState = Off,
-    sellByDate = LocalDate.of(2024, 7, 1),
+    sellByDate = LocalDate.of(2024, 8, 1),
     exposeClientSide = false,
   )
 }
diff --git a/common/app/model/Tag.scala b/common/app/model/Tag.scala
@@ -78,13 +78,12 @@ object Tag {
 
 object Podcast {
   def make(podcast: ApiPodcast): Podcast = {
-    Podcast(podcast.subscriptionUrl, podcast.googlePodcastsUrl, podcast.spotifyUrl, podcast.image)
+    Podcast(podcast.subscriptionUrl, podcast.spotifyUrl, podcast.image)
   }
   implicit val podcastWrites: Writes[Podcast] = Json.writes[Podcast]
 }
 case class Podcast(
     subscriptionUrl: Option[String],
-    googlePodcastsUrl: Option[String],
     spotifyUrl: Option[String],
     image: Option[String],
 )

diff --git a/common/app/model/content.scala b/common/app/model/content.scala
@@ -684,7 +684,6 @@ final case class Audio(override val content: Content) extends ContentType {
 
   private lazy val podcastTag: Option[Tag] = tags.tags.find(_.properties.podcast.nonEmpty)
   lazy val iTunesSubscriptionUrl: Option[String] = podcastTag.flatMap(_.properties.podcast.flatMap(_.subscriptionUrl))
-  lazy val googlePodcastsUrl: Option[String] = podcastTag.flatMap(_.properties.podcast.flatMap(_.googlePodcastsUrl))
   lazy val spotifyUrl: Option[String] = podcastTag.flatMap(_.properties.podcast.flatMap(_.spotifyUrl))
   lazy val seriesFeedUrl: Option[String] = podcastTag.map(tag => s"/${tag.id}/podcast.xml")
 }

diff --git a/common/app/views/fragments/media/audio.scala.html b/common/app/views/fragments/media/audio.scala.html
@@ -24,13 +24,6 @@
                            data-link-name="@trackingCode("iTunes")">Apple Podcasts</a>
                     </li>
                 }
-                @audio.googlePodcastsUrl.map { googlePodcastsUrl =>
-                    <li class="podcast-meta__item podcast-meta__item--googlePodcasts">
-                        <a class="podcast-meta__item__link pseudo-icon"
-                        href="@googlePodcastsUrl"
-                        data-link-name="@trackingCode("googlePodcasts")">Google Podcasts</a>
-                    </li>
-                }
                 @audio.spotifyUrl.map { spotifyUrl =>
                     <li class="podcast-meta__item podcast-meta__item--spotify">
                         <a class="podcast-meta__item__link pseudo-icon"

diff --git a/static/src/inline-svgs/journalism/audio/google-podcasts.svg b/static/src/inline-svgs/journalism/audio/google-podcasts.svg
diff --git a/static/src/javascripts/projects/common/modules/experiments/ab-tests.ts b/static/src/javascripts/projects/common/modules/experiments/ab-tests.ts
@@ -4,6 +4,7 @@ import { mpuWhenNoEpic } from './tests/mpu-when-no-epic';
 import { remoteRRHeaderLinksTest } from './tests/remote-header-test';
 import { signInGateMainControl } from './tests/sign-in-gate-main-control';
 import { signInGateMainVariant } from './tests/sign-in-gate-main-variant';
+import { stickyLiveBlogAskTest } from './tests/sticky-liveblog-ask';
 
 // keep in sync with ab-tests in dotcom-rendering
 // https://github.com/guardian/dotcom-rendering/blob/main/dotcom-rendering/src/web/experiments/ab-tests.ts
@@ -13,4 +14,5 @@ export const concurrentTests: readonly ABTest[] = [
 	remoteRRHeaderLinksTest,
 	mpuWhenNoEpic,
 	deeplyReadRightColumn,
+	stickyLiveBlogAskTest,
 ];
diff --git a/static/src/javascripts/projects/common/modules/experiments/tests/sticky-liveblog-ask.ts b/static/src/javascripts/projects/common/modules/experiments/tests/sticky-liveblog-ask.ts
@@ -0,0 +1,29 @@
+import type { ABTest } from '@guardian/ab-core';
+
+export const stickyLiveBlogAskTest: ABTest = {
+	id: 'StickyLiveBlogAskTest',
+	author: '@growth',
+	start: '2024-06-25',
+	expiry: '2024-07-31',
+	audience: 1,
+	audienceOffset: 0,
+	audienceCriteria: 'everyone',
+	successMeasure: 'There is more revenue generated when this is on the page',
+	description:
+		'Test that revenue is generated from this ask than when there is only an epic on a pageview.',
+	variants: [
+		{
+			id: 'control',
+			test: (): void => {
+				/* no-op */
+			},
+		},
+		{
+			id: 'variant',
+			test: (): void => {
+				/* no-op */
+			},
+		},
+	],
+	canRun: () => true,
+};