Merge d53a209 into 9dc56b1

wikimedia · Sep 25, 2019 · 5fea1f2 · 5fea1f2
2 parents 9dc56b1 + d53a209
commit 5fea1f2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/projects/v1/wikimedia.wmf.yaml b/projects/v1/wikimedia.wmf.yaml
@@ -72,4 +72,4 @@ paths:
   /feed:
     x-modules:
       - path: v1/availability.yaml
-        options: '{{options.wikifeeds}}'
+        options: '{{options.mobileapps}}'
diff --git a/projects/v1/wikipedia.wmf.yaml b/projects/v1/wikipedia.wmf.yaml
@@ -107,11 +107,11 @@ paths:
   /feed:
     x-modules:
       - path: v1/feed.js
-        options: '{{merge({"feed_cache_control": "s-maxage=300, max-age=60"}, options.wikifeeds)}}'
+        options: '{{merge({"feed_cache_control": "s-maxage=300, max-age=60"}, options.mobileapps)}}'
       - path: v1/announcements.yaml
-        options: '{{merge({"announcement_cache_control": "s-maxage=86400, max-age=86400"}, options.wikifeeds)}}'
+        options: '{{merge({"announcement_cache_control": "s-maxage=86400, max-age=86400"}, options.mobileapps)}}'
       - path: v1/onthisday.js
-        options: '{{merge({"feed_cache_control": "s-maxage=300, max-age=60"}, options.wikifeeds)}}'
+        options: '{{merge({"feed_cache_control": "s-maxage=300, max-age=60"}, options.mobileapps)}}'
   /transform:
     x-modules:
       - path: v1/transform.yaml

diff --git a/test/features/feed.js b/test/features/feed.js
@@ -5,7 +5,7 @@ const Server = require('../utils/server.js');
 const preq   = require('preq');
 
 function assertMCSRequest(content, date, expected) {
-    const serviceURI = 'https://wikifeeds.wmflabs.org';
+    const serviceURI = 'https://mobileapps.wmflabs.org';
     let path = `/en.wikipedia.org/v1/${content}`;
     if (date) {
         path += `/${date}`;