Support multiple settings being defined in *-commands.csv

lib/data/parse-command-csv-row.js

@@ -194,6 +194,24 @@ function parseCommandCSVRowV2({ commands }, commandsJson) {
     const commandIds = command.command.split(' ');
     const commandKVs = findValuesByKeys(flattenedCommandsJson, [command.command]);
 
+    // Also account for 'modeless' AT configurations with 'defaultMode'
+    const [primarySetting, ...additionalSettings] = command.settings
+      ? command.settings.split(' ')
+      : ['defaultMode'];
+
+    const foundCommandIndex = commandsParsed.findIndex(
+      e =>
+        e.testId === command.testId &&
+        e.target.at.key === atTargetInfo.key &&
+        e.target.at.settings === primarySetting &&
+        (e.commands.length
+          ? e.commands.every(
+              ({ presentationNumber }) =>
+                parseInt(presentationNumber) === parseInt(command.presentationNumber)
+            )
+          : true)
+    );
+
     const assertionExceptions = command.assertionExceptions.length
       ? sanitizeWhitespace(command.assertionExceptions).split(' ')
       : [];
@@ -207,32 +225,17 @@ function parseCommandCSVRowV2({ commands }, commandsJson) {
       })),
       presentationNumber: Number(command.presentationNumber),
       assertionExceptions,
+      additionalSettings,
     }));
 
-    // Also account for 'modeless' AT configurations with 'defaultMode'
-    const settingsValue = command.settings || 'defaultMode';
-
-    const foundCommandIndex = commandsParsed.findIndex(
-      e =>
-        e.testId === command.testId &&
-        e.target.at.key === atTargetInfo.key &&
-        e.target.at.settings === settingsValue &&
-        (e.commands.length
-          ? e.commands.every(
-              ({ presentationNumber }) =>
-                parseInt(presentationNumber) === parseInt(command.presentationNumber)
-            )
-          : true)
-    );
-
     // Add new parsed command since none exist
     if (foundCommandIndex < 0) {
       commandsParsed.push({
         testId: command.testId,
         target: {
           at: {
             ...atTargetInfo,
-            settings: settingsValue,
+            settings: primarySetting,
           },
         },
         commands,

lib/data/parse-test-csv-row.js

@@ -149,8 +149,9 @@ function parseTestCSVRowV2({ tests, assertions, scripts, commands }) {
     }
 
     // Also account for 'modeless' AT configurations with 'defaultMode'
-    // TODO: Account for a list of settings as described by https://github.com/w3c/aria-at/wiki/Test-Format-Definition-V2#settings
-    const settingsValue = command.settings || 'defaultMode';
+    const [primarySetting, ...additionalSettings] = command.settings
+      ? command.settings.split(' ')
+      : ['defaultMode'];
 
     if (isEmptyObject(testsParsed[arrPosition])) {
       testsParsed[arrPosition] = {
@@ -162,7 +163,7 @@ function parseTestCSVRowV2({ tests, assertions, scripts, commands }) {
           ats: [
             {
               ...atTargetInfo,
-              settings: settingsValue,
+              settings: primarySetting,
             },
           ],
         },
@@ -178,12 +179,12 @@ function parseTestCSVRowV2({ tests, assertions, scripts, commands }) {
     } else {
       if (
         !testsParsed[arrPosition].target.ats.find(
-          e => e.key === atTargetInfo.key && e.settings === settingsValue
+          e => e.key === atTargetInfo.key && e.settings === primarySetting
         )
       )
         testsParsed[arrPosition].target.ats.push({
           ...atTargetInfo,
-          settings: settingsValue,
+          settings: primarySetting,
         });
     }
   }
@@ -203,25 +204,28 @@ function parseTestCSVRowV2({ tests, assertions, scripts, commands }) {
       return (
         testId === commandInfo.testId &&
         command === commandInfo.command &&
-        settings === commandInfo.settings &&
+        settings === commandInfo.settings && // the primary settings value
         presentationNumber === commandInfo.presentationNumber
       );
     }
 
     for (const command of commands) {
       testsParsed.forEach(test => {
+        const [primarySetting, ...additionalSettings] = command.settings
+          ? command.settings.split(' ')
+          : ['defaultMode'];
+
         if (
           command.testId === test.testId &&
-          test.target.ats.some(
-            at => at.key === key && at.settings === (command.settings || 'defaultMode')
-          )
+          test.target.ats.some(at => at.key === key && at.settings === primarySetting)
         ) {
           const commandInfo = {
             testId: command.testId,
             command: command.command,
-            settings: command.settings || 'defaultMode',
+            settings: primarySetting,
             presentationNumber: Number(command.presentationNumber),
             assertionExceptions: command.assertionExceptions,
+            additionalSettings,
           };
 
           // Test level commandInfo, useful for getting assertionExceptions and

scripts/test-reviewer/processCollectedTests.mjs

@@ -15,6 +15,9 @@ const processCollectedTests = ({ collectedTest, commandsAPI, atKey, mode, task,
     commandsValuesForInstructions,
     modeInstructions = undefined;
 
+  // TODO: Standardize naming on settings instead of outdated 'mode'
+  let additionalSettings = [];
+
   /** @type {CollectedTestAT} */
   const at = commandsAPI.isKnownAT(atKey);
   const defaultConfigurationInstructions = unescapeHTML(
@@ -50,6 +53,15 @@ const processCollectedTests = ({ collectedTest, commandsAPI, atKey, mode, task,
         })
       : undefined;
 
+  function findCommandInfo(assertionForCommand) {
+    return collectedTest.commandsInfo?.[at.key]?.find(
+      c =>
+        c.command === assertionForCommand.key &&
+        c.settings === assertionForCommand.settings &&
+        c.presentationNumber === assertionForCommand.presentationNumber
+    );
+  }
+
   /**
    * Check default assertion priorities to verify if there is a priority exception and return the
    * updated list of assertions
@@ -64,9 +76,10 @@ const processCollectedTests = ({ collectedTest, commandsAPI, atKey, mode, task,
       // Check to see if there is any command info exceptions for current at key
       const foundCommandInfo = collectedTest.commandsInfo?.[at.key]?.find(
         c =>
-          c.assertionExceptions.includes(assertion.assertionId) &&
           c.command === assertionForCommand.key &&
-          c.settings === assertionForCommand.settings
+          c.settings === assertionForCommand.settings &&
+          c.presentationNumber === assertionForCommand.presentationNumber &&
+          c.assertionExceptions.includes(assertion.assertionId)
       );
 
       if (foundCommandInfo) {
@@ -105,6 +118,36 @@ const processCollectedTests = ({ collectedTest, commandsAPI, atKey, mode, task,
       assertionsForCommandsInstructions.length &&
       typeof assertionsForCommandsInstructions[0] === 'object'
     ) {
+      // Check for additional settings
+      const foundCommandInfos = assertionsForCommandsInstructions.map(findCommandInfo);
+      assertionsForCommandsInstructions = assertionsForCommandsInstructions.map(
+        (assertionForCommand, index) => {
+          const foundCommandInfo = foundCommandInfos[index];
+
+          const additionalSettingsExpanded = [];
+          for (const additionalSetting of foundCommandInfo.additionalSettings) {
+            if (!additionalSettings.includes(additionalSetting))
+              additionalSettings.push(additionalSetting);
+
+            const expandedSettings = {
+              settings: additionalSetting,
+              settingsText: at.settings[additionalSetting].screenText,
+            };
+
+            // Update value text if additional settings exist
+            assertionForCommand.value =
+              assertionForCommand.value.slice(0, -1) + ` and ${expandedSettings.settingsText})`;
+
+            additionalSettingsExpanded.push(expandedSettings);
+          }
+
+          return {
+            ...assertionForCommand,
+            additionalSettingsExpanded,
+            additionalSettings: foundCommandInfo.additionalSettings,
+          };
+        }
+      );
       commandsValuesForInstructions = assertionsForCommandsInstructions.map(each => each.value);
     } else {
       // V1 came in as array of strings
@@ -149,7 +192,9 @@ const processCollectedTests = ({ collectedTest, commandsAPI, atKey, mode, task,
     // An error will occur if there is no data for an AT, ignore it
   }
 
-  for (const atMode of mode.split('_')) {
+  // Create unique set
+  const foundAtModes = [...new Set([...mode.split('_'), ...additionalSettings])];
+  for (const atMode of foundAtModes) {
     // TODO: If there is ever need to explicitly show the instructions
     //  for an AT with the default mode active
     // const atSettingsWithDefault = {