Support multiple settings being defined in *-commands.csv

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

@@ -194,6 +194,22 @@ function parseCommandCSVRowV2({ commands }, commandsJson) {
     const commandIds = command.command.split(' ');
     const commandKVs = findValuesByKeys(flattenedCommandsJson, [command.command]);
 
+    // Also account for 'modeless' AT configurations with 'defaultMode'
+    const settings = command.settings || 'defaultMode';
+
+    const foundCommandIndex = commandsParsed.findIndex(
+      e =>
+        e.testId === command.testId &&
+        e.target.at.key === atTargetInfo.key &&
+        e.target.at.settings === settings &&
+        (e.commands.length
+          ? e.commands.every(
+              ({ presentationNumber }) =>
+                parseInt(presentationNumber) === parseInt(command.presentationNumber)
+            )
+          : true)
+    );
+
     const assertionExceptions = command.assertionExceptions.length
       ? sanitizeWhitespace(command.assertionExceptions).split(' ')
       : [];
@@ -209,30 +225,14 @@ function parseCommandCSVRowV2({ commands }, commandsJson) {
       assertionExceptions,
     }));
 
-    // 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,
           },
         },
         commands,

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

@@ -84,6 +84,11 @@ function parseTestCSVRow(testRow) {
   };
 }
 
+/**
+ * Utility function to check if @param object has any keys present
+ * @param object
+ * @returns {boolean}
+ */
 function isEmptyObject(object) {
   return object && Object.keys(object).length === 0;
 }
@@ -149,8 +154,7 @@ 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 settings = command.settings || 'defaultMode';
 
     if (isEmptyObject(testsParsed[arrPosition])) {
       testsParsed[arrPosition] = {
@@ -162,7 +166,7 @@ function parseTestCSVRowV2({ tests, assertions, scripts, commands }) {
           ats: [
             {
               ...atTargetInfo,
-              settings: settingsValue,
+              settings,
             },
           ],
         },
@@ -178,12 +182,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 === settings
         )
       )
         testsParsed[arrPosition].target.ats.push({
           ...atTargetInfo,
-          settings: settingsValue,
+          settings,
         });
     }
   }
@@ -210,16 +214,16 @@ function parseTestCSVRowV2({ tests, assertions, scripts, commands }) {
 
     for (const command of commands) {
       testsParsed.forEach(test => {
+        const settings = command.settings || '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 === settings)
         ) {
           const commandInfo = {
             testId: command.testId,
             command: command.command,
-            settings: command.settings || 'defaultMode',
+            settings: settings,
             presentationNumber: Number(command.presentationNumber),
             assertionExceptions: command.assertionExceptions,
           };

lib/data/process-test-directory/index.js

@@ -398,11 +398,13 @@ const processTestDirectory = async config => {
     }
 
     function getModeValue({ settings }) {
-      let v = settings.trim();
-      if (!validModes.includes(v)) {
+      let v = settings.trim().split(' ');
+      if (!v.every(el => validModes.includes(el))) {
         utils.addTestError(
           test.testId,
-          '"' + settings + '" is not valid value for "settings" property.'
+          '"' +
+            settings +
+            '" is not valid value for "settings" property. Check again that each setting is correctly spelt.'
         );
       }
       return v;
@@ -686,11 +688,38 @@ const processTestDirectory = async config => {
       // Declare a common collectedTest that will be modified (if needed)
       let common = collectedTestsGroupedByAtGroupedByTestIds[0];
       const settings = common.target.at.settings;
+
+      // Convert the mode attribute FROM the following:
+      // {
+      //    'setting1 setting2': [
+      //      [
+      //        ...setting1 string array of instructions
+      //      ],
+      //      [
+      //        ...setting2 string array of instructions
+      //      ]
+      //    ]
+      // }
+      //
+      // TO:
+      // {
+      //    'setting1': [
+      //      ...setting1 array of instructions
+      //    ],
+      //    'setting2': [
+      //      ...setting2 string array of instructions
+      //    ]
+      // }
+      const settingsResult = {};
+      settings
+        .split(' ')
+        .forEach((setting, index) => (settingsResult[setting] = common.instructions.mode[index]));
+
       common = {
         ...common,
         instructions: {
           ...common.instructions,
-          mode: { [settings]: common.instructions.mode },
+          mode: settingsResult, // TODO: Replace 'mode' references with 'settings'
         },
         commands: common.commands.map(command => ({
           ...command,
@@ -704,7 +733,10 @@ const processTestDirectory = async config => {
           const settings = additional.target.at.settings;
 
           common.target.at.settings = `${common.target.at.settings}_${settings}`;
-          common.instructions.mode[settings] = additional.instructions.mode;
+          settings.split(' ').forEach((setting, index) => {
+            if (!common.instructions.mode[setting])
+              common.instructions.mode[setting] = additional.instructions.mode[index];
+          });
           common.commands.push(
             ...additional.commands.map(command => ({
               ...command,
@@ -931,9 +963,11 @@ function validateTest(testParsed, data, { addTestError = () => {} } = {}) {
   });
 
   testParsed.target.ats.forEach(at => {
-    if (!data.mode.where(at.settings)) {
-      addTestError(`"${at.settings}" is not valid value for "settings" property.`);
-    }
+    at.settings.split(' ').forEach(setting => {
+      if (!data.mode.where(setting)) {
+        addTestError(`"${at.settings}" is not valid value for "settings" property.`);
+      }
+    });
   });
 
   const references = testParsed.references.filter(({ refId }) => {
@@ -1080,10 +1114,12 @@ function collectTestData({ test, command, supportAt, example, modeInstructionTem
     },
     instructions: {
       instructions: test.instructions,
-      mode: modeInstructionTemplate.where({
-        at: command.target.at.key,
-        mode: command.target.at.settings,
-      }).render,
+      mode: command.target.at.settings.split(' ').map(setting => {
+        return modeInstructionTemplate.where({
+          at: command.target.at.key,
+          mode: setting,
+        }).render;
+      }),
     },
     commands: command.commands,
     assertions: test.assertions,

scripts/test-reviewer/processCollectedTests.mjs

@@ -4,7 +4,7 @@ import { unescapeHTML } from './utils.mjs';
  * @param {CollectedTest} collectedTest
  * @param {commandsAPI} commandsAPI
  * @param {string} atKey
- * @param {string} mode
+ * @param {string} mode // TODO: Standardize naming on settings instead of outdated 'mode'
  * @param {string} task
  * @param {number} testNumber
  * @returns {{defaultConfigurationInstructions, assertionsForCommandsInstructions, at, modeInstructions, userInstruction, commandsValuesForInstructions}}
@@ -64,9 +64,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) {
@@ -88,13 +89,12 @@ const processCollectedTests = ({ collectedTest, commandsAPI, atKey, mode, task,
   }
 
   try {
-    assertionsForCommandsInstructions = commandsAPI.getATCommands(mode, task, {
+    assertionsForCommandsInstructions = commandsAPI.getATCommands(mode.replace(/,/g, ' '), task, {
       ...at,
       settings: {
         ...at.settings,
         defaultMode: {
-          // TODO: If there is a need to explicitly state that the
-          //  default mode is active for an AT
+          // TODO: If there is a need to explicitly state that the default mode is active for an AT
           screenText: '',
           // instructions: [at.defaultConfigurationInstructionsHTML],
         },
@@ -149,7 +149,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.replace(/,/g, '_').split('_')])];
+  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 = {