:%s/fileslist/filelist/g

ampproject · Jul 20, 2021 · 4915cdf · 4915cdf
1 parent f1b7a02
commit 4915cdf
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 33 deletions.
diff --git a/build-system/common/utils.js b/build-system/common/utils.js
@@ -114,15 +114,15 @@ function getFilesFromArgv() {
 }
 
 /**
- * Returns list of files in the comma-separated file named at --fileslist.
+ * Returns list of files in the comma-separated file named at --filelist.
  *
  * @return {Array<string>}
  */
-function getFilesFromFilesList() {
-  if (!argv.fileslist) {
+function getFilesFromFileList() {
+  if (!argv.filelist) {
     return [];
   }
-  return fs.readFileSync(argv.fileslist, {encoding: 'utf8'}).trim().split(',');
+  return fs.readFileSync(argv.filelist, {encoding: 'utf8'}).trim().split(',');
 }
 
 /**
@@ -187,7 +187,7 @@ module.exports = {
   buildRuntime,
   getExperimentConfig,
   getFilesFromArgv,
-  getFilesFromFilesList,
+  getFilesFromFileList,
   getFilesToCheck,
   usesFilesOrLocalChanges,
 };
diff --git a/build-system/pr-check/e2e-tests.js b/build-system/pr-check/e2e-tests.js
@@ -21,7 +21,7 @@
 
 const {
   TEST_FILES_LIST_FILE_NAME,
-  generateCircleCiShardTestFilesList,
+  generateCircleCiShardTestFileList,
   skipDependentJobs,
   timedExecOrDie,
   timedExecOrThrow,
@@ -37,9 +37,9 @@ const jobName = 'e2e-tests.js';
  */
 function pushBuildWorkflow() {
   try {
-    generateCircleCiShardTestFilesList(e2eTestPaths);
+    generateCircleCiShardTestFileList(e2eTestPaths);
     timedExecOrThrow(
-      `amp e2e --nobuild --headless --compiled --report --fileslist ${TEST_FILES_LIST_FILE_NAME}`,
+      `amp e2e --nobuild --headless --compiled --report --filelist ${TEST_FILES_LIST_FILE_NAME}`,
       'End-to-end tests failed!'
     );
   } catch (e) {
@@ -56,9 +56,9 @@ function pushBuildWorkflow() {
  */
 function prBuildWorkflow() {
   if (buildTargetsInclude(Targets.RUNTIME, Targets.E2E_TEST)) {
-    generateCircleCiShardTestFilesList(e2eTestPaths);
+    generateCircleCiShardTestFileList(e2eTestPaths);
     timedExecOrDie(
-      `amp e2e --nobuild --headless --compiled --fileslist ${TEST_FILES_LIST_FILE_NAME}`
+      `amp e2e --nobuild --headless --compiled --filelist ${TEST_FILES_LIST_FILE_NAME}`
     );
   } else {
     skipDependentJobs(

diff --git a/build-system/pr-check/experiment-e2e-tests.js b/build-system/pr-check/experiment-e2e-tests.js
@@ -21,7 +21,7 @@
 
 const {
   TEST_FILES_LIST_FILE_NAME,
-  generateCircleCiShardTestFilesList,
+  generateCircleCiShardTestFileList,
   skipDependentJobs,
   timedExecOrDie,
   timedExecOrThrow,
@@ -44,9 +44,9 @@ function runExperimentTests(config) {
     const defineFlag = `--define_experiment_constant ${config.define_experiment_constant}`;
     const experimentFlag = `--experiment ${experiment}`;
     const reportFlag = isPushBuild() ? '--report' : '';
-    generateCircleCiShardTestFilesList(e2eTestPaths);
+    generateCircleCiShardTestFileList(e2eTestPaths);
     timedExecOrThrow(
-      `amp e2e --nobuild --compiled --headless ${experimentFlag} ${defineFlag} ${reportFlag} --fileslist ${TEST_FILES_LIST_FILE_NAME}`
+      `amp e2e --nobuild --compiled --headless ${experimentFlag} ${defineFlag} ${reportFlag} --filelist ${TEST_FILES_LIST_FILE_NAME}`
     );
   } catch (e) {
     if (e.status) {

diff --git a/build-system/pr-check/unit-tests.js b/build-system/pr-check/unit-tests.js
@@ -21,7 +21,7 @@
 
 const {
   TEST_FILES_LIST_FILE_NAME,
-  generateCircleCiShardTestFilesList,
+  generateCircleCiShardTestFileList,
   skipDependentJobs,
   timedExecOrDie,
   timedExecOrThrow,
@@ -37,9 +37,9 @@ const jobName = 'unit-tests.js';
  */
 function pushBuildWorkflow() {
   try {
-    generateCircleCiShardTestFilesList(unitTestPaths);
+    generateCircleCiShardTestFileList(unitTestPaths);
     timedExecOrThrow(
-      `amp unit --headless --coverage --report --fileslist ${TEST_FILES_LIST_FILE_NAME}`,
+      `amp unit --headless --coverage --report --filelist ${TEST_FILES_LIST_FILE_NAME}`,
       'Unit tests failed!'
     );
     timedExecOrThrow(
@@ -60,9 +60,9 @@ function pushBuildWorkflow() {
  */
 function prBuildWorkflow() {
   if (buildTargetsInclude(Targets.RUNTIME, Targets.UNIT_TEST)) {
-    generateCircleCiShardTestFilesList(unitTestPaths);
+    generateCircleCiShardTestFileList(unitTestPaths);
     timedExecOrDie(
-      `amp unit --headless --coverage --fileslist ${TEST_FILES_LIST_FILE_NAME}`
+      `amp unit --headless --coverage --filelist ${TEST_FILES_LIST_FILE_NAME}`
     );
     timedExecOrDie('amp codecov-upload');
   } else {

diff --git a/build-system/pr-check/utils.js b/build-system/pr-check/utils.js
@@ -314,17 +314,17 @@ async function processAndStoreBuildToArtifacts() {
  *
  * @param {!Array<string>} globs array of glob strings for finding test file paths.
  */
-function generateCircleCiShardTestFilesList(globs) {
+function generateCircleCiShardTestFileList(globs) {
   const joinedGlobs = globs.map((glob) => `"${glob}"`).join(' ');
-  const filesList = getStdout(
+  const fileList = getStdout(
     `circleci tests glob ${joinedGlobs} | circleci tests split --split-by=timings`
   )
     .trim()
     .replace(/\s+/g, ',');
-  fs.writeFileSync(TEST_FILES_LIST_FILE_NAME, filesList, {encoding: 'utf8'});
+  fs.writeFileSync(TEST_FILES_LIST_FILE_NAME, fileList, {encoding: 'utf8'});
   logWithoutTimestamp(
     'Stored list of',
-    cyan(filesList.split(',').length),
+    cyan(fileList.split(',').length),
     'test files in',
     cyan(TEST_FILES_LIST_FILE_NAME)
   );
@@ -346,5 +346,5 @@ module.exports = {
   storeModuleBuildToWorkspace,
   storeExperimentBuildToWorkspace,
   processAndStoreBuildToArtifacts,
-  generateCircleCiShardTestFilesList,
+  generateCircleCiShardTestFileList,
 };
diff --git a/build-system/tasks/e2e/index.js b/build-system/tasks/e2e/index.js
@@ -28,7 +28,7 @@ const path = require('path');
 const {
   buildRuntime,
   getFilesFromArgv,
-  getFilesFromFilesList,
+  getFilesFromFileList,
 } = require('../../common/utils');
 const {
   createCtrlcHandler,
@@ -167,9 +167,9 @@ function runTests_() {
   const addFile = addMochaFile_.bind(null, mocha);
 
   // specify tests to run
-  if (argv.files || argv.fileslist) {
+  if (argv.files || argv.filelist) {
     getFilesFromArgv().forEach(addFile);
-    getFilesFromFilesList().forEach(addFile);
+    getFilesFromFileList().forEach(addFile);
   } else {
     config.e2eTestPaths.forEach((path) => {
       glob.sync(path).forEach(addFile);
@@ -196,8 +196,8 @@ function runTests_() {
  */
 async function runWatch_() {
   const filesToWatch =
-    argv.files || argv.fileslist
-      ? getFilesFromArgv().concat(getFilesFromFilesList())
+    argv.files || argv.filelist
+      ? getFilesFromArgv().concat(getFilesFromFileList())
       : config.e2eTestPaths;
 
   log('Watching', cyan(filesToWatch), 'for changes...');
@@ -247,5 +247,5 @@ e2e.flags = {
   'debug': 'Print debugging information while running tests',
   'report': 'Write test result report to a local file',
   'coverage': 'Collect coverage data from instrumented code',
-  'fileslist': 'Run tests specified in this comma-separated list of test files',
+  'filelist': 'Run tests specified in this comma-separated list of test files',
 };
diff --git a/build-system/tasks/runtime-test/runtime-test-base.js b/build-system/tasks/runtime-test/runtime-test-base.js
@@ -35,7 +35,7 @@ const {createKarmaServer, getAdTypes} = require('./helpers');
 const {cyan, green, red, yellow} = require('../../common/colors');
 const {dotWrappingWidth} = require('../../common/logging');
 const {getEsbuildBabelPlugin} = require('../../common/esbuild-babel');
-const {getFilesFromArgv, getFilesFromFilesList} = require('../../common/utils');
+const {getFilesFromArgv, getFilesFromFileList} = require('../../common/utils');
 const {isCiBuild, isCircleciBuild} = require('../../common/ci');
 const {log} = require('../../common/logging');
 const {SERVER_TRANSFORM_PATH} = require('../../server/typescript-compile');
@@ -233,10 +233,10 @@ class RuntimeTestConfig {
   updateFiles() {
     switch (this.testType) {
       case 'unit':
-        if (argv.files || argv.fileslist) {
+        if (argv.files || argv.filelist) {
           this.files = commonUnitTestPaths
             .concat(getFilesFromArgv())
-            .concat(getFilesFromFilesList());
+            .concat(getFilesFromFileList());
           return;
         }
         if (argv.firefox || argv.safari || argv.edge) {

diff --git a/build-system/tasks/unit.js b/build-system/tasks/unit.js
@@ -83,5 +83,5 @@ unit.flags = {
   'testnames': 'List the name of each test being run',
   'verbose': 'Enable logging',
   'watch': 'Watch for changes in files, runs corresponding test(s)',
-  'fileslist': 'Run tests specified in this comma-separated list of test files',
+  'filelist': 'Run tests specified in this comma-separated list of test files',
 };