Merge pull request #13700 from mozilla/train-237-uplift-1

Train 237 uplift 1
mozilla · Jul 21, 2022 · bcd66d1 · bcd66d1
2 parents 2630823 + 41bb5c8
commit bcd66d1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 22 deletions.
diff --git a/packages/fxa-admin-server/.eslintrc.json b/packages/fxa-admin-server/.eslintrc.json
diff --git a/packages/fxa-admin-server/package.json b/packages/fxa-admin-server/package.json
@@ -6,7 +6,7 @@
     "prebuild": "rimraf dist",
     "build": "yarn prebuild && yarn nest build && cp ./src/config/*.json ./dist/config",
     "compile": "tsc --noEmit",
-    "lint": "eslint .",
+    "lint": "eslint *",
     "audit": "npm audit --json | audit-filter --nsp-config=.nsprc --audit=-",
     "start": "yarn build && pm2 start pm2.config.js",
     "stop": "pm2 stop pm2.config.js",
@@ -74,7 +74,6 @@
     "esbuild": "^0.14.2",
     "esbuild-register": "^3.2.0",
     "eslint": "^8.18.0",
-    "eslint-plugin-fxa": "^2.0.2",
     "jest": "27.5.1",
     "pm2": "^5.1.2",
     "supertest": "^6.2.4",

diff --git a/packages/fxa-content-server/tests/server/helpers/routesHelpers.js b/packages/fxa-content-server/tests/server/helpers/routesHelpers.js
@@ -70,11 +70,11 @@ function checkHeaders(routes, route, res) {
  * each URL exists, responds with a 200, and in the case of JS, CSS
  * and fonts, that the correct CORS headers are set.
  */
-function extractAndCheckUrls(res, testName) {
+function extractAndCheckUrls(res, testName, acceptLanguage) {
   var href = url.parse(res.url);
   var origin = [href.protocol, '//', href.host].join('');
   return extractUrls(res.body).then((resources) =>
-    checkUrls(origin, resources, testName)
+    checkUrls(origin, resources, testName, acceptLanguage)
   );
 }
 
@@ -149,7 +149,7 @@ function isUrlIgnored(url) {
   return IGNORE_URL_REGEXPS.find((domainRegExp) => domainRegExp.test(url));
 }
 
-function checkUrls(origin, resources, testName = '') {
+function checkUrls(origin, resources, testName = '', acceptLanguage = 'en') {
   return findCssSubResources(origin, resources).then((cssSubResources) => {
     resources = resources.concat(cssSubResources);
 
@@ -158,13 +158,13 @@ function checkUrls(origin, resources, testName = '') {
         return checkedUrlPromises[resource.url];
       }
 
-      var requestOptions = {};
+      var requestOptions = {
+        headers: {
+          'accept-language': acceptLanguage,
+        },
+      };
       if (doesURLRequireCORS(resource.url)) {
-        requestOptions = {
-          headers: {
-            Origin: origin,
-          },
-        };
+        requestOptions.headers.Origin = origin;
       }
 
       var promise = makeRequest(resource.url, requestOptions).then(function (
@@ -173,7 +173,6 @@ function checkUrls(origin, resources, testName = '') {
         if (isUrlIgnored(resource.url)) {
           return;
         }
-
         assert.equal(res.statusCode, 200, `${testName}: ${resource.url}`);
 
         // If prod-like, Check all CSS and JS (except experiments.bundle.js)

diff --git a/packages/fxa-content-server/tests/server/l10n-entrained.js b/packages/fxa-content-server/tests/server/l10n-entrained.js
@@ -99,7 +99,11 @@ function routeTest(route, expectedStatusCode, requestOptions) {
         assert.equal(res.statusCode, expectedStatusCode);
         checkHeaders(routes, route, res);
 
-        return extractAndCheckUrls(res, testName);
+        return extractAndCheckUrls(
+          res,
+          testName,
+          requestOptions.headers['Accept-Language']
+        );
       })
       .then(dfd.resolve.bind(dfd), dfd.reject.bind(dfd));
 

diff --git a/yarn.lock b/yarn.lock
@@ -22717,7 +22717,6 @@ fsevents@~2.1.1:
     esbuild: ^0.14.2
     esbuild-register: ^3.2.0
     eslint: ^8.18.0
-    eslint-plugin-fxa: ^2.0.2
     express: ^4.17.2
     fxa-shared: "workspace:*"
     googleapis: ^102.0.0