@suffolklitlab/alkiln 5.8.1-feat2columns1 → 5.8.1-feat2columns3

package/.github/workflows/github_server.yml

@@ -88,4 +88,5 @@ jobs:
           #### Developer note: Useful for temporarily shortening ALKiln tests
           #### to debug the docker install step
           # ALKILN_TAG_EXPRESSION: @a_tag_expression
+          ALKILN_VERSION: 5.8.1-feat2columns3
 

package/.github/workflows/playground.yml

@@ -55,4 +55,4 @@ jobs:
           #### to debug the docker install step
           # ALKILN_TAG_EXPRESSION: @a_tag_expression
           #### Developer note: you probalby don't need this
-          # ALKILN_VERSION: 5.7.0-feature-tap1
+          ALKILN_VERSION: 5.8.1-feat2columns3

package/CHANGELOG.md

@@ -45,6 +45,10 @@ Format:
 
 <!-- ## [Unreleased] -->
 
+### Added
+
+- 2-column Story Tables that work without the trigger variable. Now column 1, "var", should only contain the actual variable name with no proxies (x, i, j, etc). For example, instead of `x[i].name.first` the var column should now contain `users[0].name.first`. Column 2 is the same as it was before - the answer for the field. See [#582](https://github.com/SuffolkLITLab/ALKiln/issues/582).
+
 ## [5.8.1] - 2023-12-28
 
 ### Fixed

package/lib/scope.js

@@ -292,6 +292,9 @@ module.exports = {
     if ( !elem ) { reports.addToReport(scope, { type: `error`, value: msg }); }
     expect( elem, msg ).to.exist;
 
+    // Get the text on the button or link for a potential error message later
+    let tapperText = await (await elem.getProperty('textContent')).jsonValue();
+
     click_promise = click_promise || elem.click();
     
     // TODO: implement and use scope.handle_possible_timeout()
@@ -308,14 +311,11 @@ module.exports = {
     } catch ( error ) {
 
       if ( error.name === `TimeoutError` ) {
-        let non_reload_report_msg = `ALKiln tapped "${ tapperText }", but the interview took to long to finish.`;
+        let non_reload_report_msg = `After ALKiln tapped "${ tapperText }" it took too long to load the next page.`;
         await scope.handle_page_timeout_error( scope, { non_reload_report_msg, error });
       } else {
-
-        // Get the text on the button or link for a potential error message later
-        let tapperText = await (await elem.getProperty('textContent')).jsonValue();
         // Throw any non-timeout error
-        let err_msg = `Error occurred when ALKiln tried to tap "${ tapperText }".`
+        let err_msg = `An error occurred when ALKiln tried to tap "${ tapperText }".`
         reports.addToReport( scope, { type: `error`, value: err_msg });
         throw error;
       }  // ends if error is timeout error
@@ -464,9 +464,9 @@ module.exports = {
 
   throw_server_was_reloading_error: async function( scope ) {//, { server_timeout_id, timeout_message } ) {
     /* Throw the server reload error with appropriate side effects. */
-    let reload_failure_msg = `The test was unable to continue because the `
-      + `server was reloading. ALKiln will try this Scenario a total of 2 times. An `
-      + `error will still be printed for this attempt.`;
+    let reload_failure_msg = `The test was unable to continue because it `
+      + `took too long to reach the server. ALKiln will try this Scenario a total of `
+      + `2 times. A full error will be printed for the second attempt.`;
     reports.addToReport( scope, { type: `error`, value: reload_failure_msg });
     // reports.addToReport( scope, { type: `error`, value: timeout_message });
     // clearTimeout( server_timeout_id );
@@ -721,51 +721,6 @@ module.exports = {
     return result;
   },  // Ends scope.getLoadData()
 
-  // three_column_table_warning: async function ( scope, { var_data=null, raw_var_data=null }) {
-
-  // },
-
-  // normalize_table_base: async function ( scope, { var_data=null, raw_var_data=null }) {
-  //   /* Return data derived from cucumber variable-setting data, from either an object format
-  //    * (var_data) or an array format (raw_var_data). `var_data` only is used when calling
-  //    * normalizeTable internally.
-  //    *
-  //    * Takes care of the shared funcitonality that needs to happen to all tables.
-  //    */
-
-  //   if (!var_data && ! raw_var_data) {
-  //     let no_data_msg = `ALKiln Internal error: normalizeTable called w/o var_data or raw_var_data:` +
-  //         ` open an issue at https://github.com/SuffolkLITLab/ALKiln/issues/new if you see this!`;
-  //     reports.addToReport( scope, { type: `error`, value: no_data_msg });
-  //     throw Error(no_data_msg);
-  //   }
-
-  //   // Always use the raw var data if present; it has the full first row
-  //   if (raw_var_data) {
-  //     var_data = raw_var_data.hashes();
-  //     if (!('var' in var_data[0]) || !('value' in var_data[0])) {
-  //       let raw_array = raw_var_data.raw();
-  //       var_data = [];
-  //       for (let row_raw of raw_array) {
-  //         if (row_raw.length < 2) {
-  //           let bad_table_msg = `Your Story Table has less than 2 columns.`
-  //               + ` Take another look at Story Table documentation at`
-  //               + ` https://suffolklitlab.org/docassemble-AssemblyLine-documentation/docs/alkiln/#story-tables.`
-  //           reports.addToReport( scope, { type: `error`, value: bad_table_msg})
-  //           throw Error(bad_table_msg);
-  //         } else if (row_raw.length == 2) {
-  //           var_data.push({var: row_raw[0], value: row_raw[1]});
-  //         } else {
-  //           var_data.push({var: row_raw[0], value: row_raw[1], trigger: row_raw[2]});
-  //         }
-  //       }
-  //     }
-  //   }
-
-
-
-  // },
-
   normalizeTable: async function ( scope, { var_data=null, raw_var_data=null }) {
     /* Return data derived from cucumber variable-setting data, from either an object format
      * (var_data) or an array format (raw_var_data). `var_data` only is used when calling
@@ -915,13 +870,6 @@ module.exports = {
         field_data.selector = `#daquestion canvas`;
         field_data.tag = `canvas`;
         not_decoded_name = $( `input[name="_save_as"]` ).attr( `value` );
-        
-        // field_data.guesses = [{
-        //   var: trigger,
-        //   value: '/sign',
-        // }];
-        // fields.push( field_data );
-        // continue;
       }
       
       // The selector we'll use to set the DOM node's value later
@@ -1489,9 +1437,12 @@ module.exports = {
 
       let multiple_matches_msg = `Do you have a duplicate story table row? `
         + `Multiple story table rows match this field's variable name. `
-        + `The test will use the last row that matched. See `
-        + `https://suffolklitlab.org/docassemble-AssemblyLine-documentation/docs/alkiln/#trigger.`
-        + `\nThe matching rows:\n${ rows_as_story_table.join(`\n`) }`
+        + `The test will use the last row that matched.`
+
+      if ( trigger_might_be_needed ) {
+        multiple_matches_msg += ` See https://suffolklitlab.org/docassemble-AssemblyLine-documentation/docs/alkiln/#trigger.`
+      }
+      multiple_matches_msg += `\nThe matching rows:\n${ rows_as_story_table.join(`\n`) }`
         + `\nThis field's data:\n${ JSON.stringify( field )}`;
       reports.addToReport(scope, { type: `warning`, value: multiple_matches_msg });
     }
@@ -2155,24 +2106,21 @@ module.exports = {
 
     // If all table rows must be used and any table row was not, error
     if ( ensure_all_vars_used ) {
-      let num_unused_rows = 0;
       for ( let row of var_data ) {
         if ( row.times_used === 0 ) {
-          num_unused_rows += 1;
+          let values_used_status = 'The page is missing a value';
           let source_row = row;
           // TODO: Make the row object flatter so we don't need to dig in this way
           if ( row.source ) { source_row = row.source; }
           let original_row = source_row.original;
-          let msg = `Did not find a field on this page for the variable "${ original_row.var }" that could be set to "${ original_row.value }"`;
-          reports.addToReport(scope, { type: `warning`, value: msg });
+          let { id } = await scope.examinePageID( scope, 'none to match' );
+          let msg = `In a linear Step all the values you give MUST be filled in, but ALKiln was unable `
+            + `to find a field on the page "${id}" for the variable "${ original_row.var }" that `
+            + `could be set to "${ original_row.value }". See this Scenario's HTML file for details.`;
+          reports.addToReport(scope, { type: `error`, value: msg });
+          expect( values_used_status, msg ).to.equal( '' );
         }
       }
-      if ( num_unused_rows > 0 ) {
-        let { id } = await scope.examinePageID( scope, 'none to match' );
-        let msg = `Error on page "${id}". See screenshot and see text above for more details.`;
-        reports.addToReport(scope, { type: `error`, value: msg });
-        expect( num_unused_rows, msg ).to.equal( 0 );
-      }
     }
 
     // If didn't already press a continue button, press one now.

package/lib/steps.js

@@ -297,7 +297,9 @@ Given(/the max(?:imum)? sec(?:ond)?s for each step (?:in this scenario )?is (\d+
 // Story
 //#####################################
 //#####################################
-
+// TODO: Consider more permissive sentences:
+// with(?: this data| these answers)?:?
+// with(?:.*):?
 When(/^(?:the user gets)?(?:I get)? to ?(?:the)?(?: ?question)?(?: id)? "([^"]+)" with this data:?/, {timeout: -1}, async (target_id, raw_var_data) => {
   /* NO CUCUMBER TIMEOUT. Must handle timeout ourselves:
   * https://github.com/cucumber/cucumber-js/blob/master/docs/support_files/timeouts.md#disable-timeouts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suffolklitlab/alkiln",
-  "version": "5.8.1-feat2columns1",
+  "version": "5.8.1-feat2columns3",
   "description": "Integrated automated end-to-end testing with docassemble, puppeteer, and cucumber.",
   "main": "lib/index.js",
   "scripts": {

package/tests/unit_tests/fields.fixtures.js

@@ -1,5 +1,10 @@
 let fields =  {};
 
+/** The fixtures in here are used in at least 2 types of tests:
+ * - getAllFields
+ * - getMatchignRows
+ * */
+
 // ============================
 // Standard fields - no proxies, no showifs.
 // ============================
@@ -736,7 +741,8 @@ fields.buttons_event_action = [
 // ============================
 // Proxy vars (x, i, j, ...)
 // ============================
-// x[i].name.first
+// First loop (first time this question is asked)
+// x[i].name.first where i = 0
 fields.proxies_xi = [
   {
     "selector": "#daquestion input[name=\"eFtpXS5uYW1lLmZpcnN0\"][id=\"eFtpXS5uYW1lLmZpcnN0\"][class=\"form-control\"]",
@@ -764,8 +770,8 @@ fields.proxies_xi = [
 ];
 
 // Multiple proxies by the same name are in the story table (because of a loop)
-// Second loop (second page where this question is asked)
-// x[i].name.first
+// Second loop (second time this question is asked)
+// x[i].name.first where i = 1
 fields.proxies_multi = [
   {
     "selector": "#daquestion input[name=\"eFtpXS5uYW1lLmZpcnN0\"][id=\"eFtpXS5uYW1lLmZpcnN0\"][class=\"form-control\"]",
@@ -792,6 +798,89 @@ fields.proxies_multi = [
   }
 ];
 
+// Proxy substitution instead of target variable
+// First loop (first time this question is asked)
+// x[i].name.first where i = 0
+fields.proxy_substitution_i_is_0 = [
+  {
+    "selector": "#daquestion input[name=\"eFtpXS5uYW1lLmZpcnN0\"][id=\"eFtpXS5uYW1lLmZpcnN0\"][class=\"form-control\"]",
+    "tag": "input",
+    "guesses": [
+      {
+        "var": "eFtpXS5uYW1lLmZpcnN0",
+        "value": ""
+      },
+      {
+        "var": "x[i].name.first",
+        "value": ""
+      },
+      {
+        "var": "proxy_list[0].name.first",
+        "value": ""
+      }
+    ],
+    "type": "text",
+    "trigger": ""
+  },
+  {
+    "selector": "#daquestion button[id=\"da-continue-button\"][class=\"btn btn-da btn-primary\"]",
+    "tag": "button",
+    "guesses": [
+      {
+        "var": "da-continue-button",
+        "value": ""
+      },
+      {
+        "var": "u���{b��n�m�",
+        "value": ""
+      }
+    ],
+    "type": "submit",
+    "trigger": ""
+  }
+]
+
+// Proxy substitution instead of target variable
+// Second loop (second time this question is asked)
+// x[i].name.first where i = 1
+fields.proxy_substitution_i_is_1 = [
+  {
+    "selector": "#daquestion input[name=\"eFtpXS5uYW1lLmZpcnN0\"][id=\"eFtpXS5uYW1lLmZpcnN0\"][class=\"form-control\"]",
+    "tag": "input",
+    "guesses": [
+      {
+        "var": "eFtpXS5uYW1lLmZpcnN0",
+        "value": ""
+      },
+      {
+        "var": "x[i].name.first",
+        "value": ""
+      },
+      {
+        "var": "proxy_list[1].name.first",
+        "value": ""
+      }
+    ],
+    "type": "text",
+    "trigger": ""
+  },
+  {
+    "selector": "#daquestion button[id=\"da-continue-button\"][class=\"btn btn-da btn-primary\"]",
+    "tag": "button",
+    "guesses": [
+      {
+        "var": "da-continue-button",
+        "value": ""
+      },
+      {
+        "var": "u���{b��n�m�",
+        "value": ""
+      }
+    ],
+    "type": "submit",
+    "trigger": ""
+  }
+]
 
 // ============================
 // Signature
@@ -799,20 +888,23 @@ fields.proxies_multi = [
 // Signature page continue buttons are contained in a different DOM structure than regular ones
 // Also, there's an additional hidden continue button on the page with similar selectors
 fields.signature = [
-    {
-      "trigger": "signature_1",
-      "selector": "#daquestion canvas",
-      "tag": "canvas",
-      "guesses": [
-        {
-          "var": "signature_1",
-          "value": "/sign",
-        }
-      ],
-      "type": ""
-    },
-    
-  ];
+  {
+    "selector": "#daquestion canvas",
+    "tag": "canvas",
+    "guesses": [
+      {
+        "var": "c2lnbmF0dXJlXzE",
+        "value": ""
+      },
+      {
+        "var": "signature_1",
+        "value": ""
+      }
+    ],
+    "type": "",
+    "trigger": "signature_1"
+  }
+];
 
 
 // ============================

package/tests/unit_tests/getAllFields.test.js

@@ -79,32 +79,43 @@ it(`creates the right data for an event action button`, async function() {
 // ============================
 // Proxy vars (x, i, j, ...)
 // ============================
-// x[i].name.first
-it(`creates the right data for a multi-proxy name (x[i])`, async function() {
+// x[i].name.first where i = 0
+it(`creates the right data for x[i] target variable where "i" is 0`, async function() {
   let result = await getAllFields( scope, { html: html.proxies_xi });
   expect( result ).to.deep.equalInAnyOrder( fields.proxies_xi );
 });
 
-// Multiple proxies by the same name are on the list (because of a loop)
-// x[i].name.first
-it(`creates the right data for a multi-proxy name (x[i]) again for consistency`, async function() {
-  // same data as `proxies_xi`, but have this here for consistency
+// x[i].name.first where i = 1
+it(`creates the right data for x[i] target variable where "i" is 1`, async function() {
   let result = await getAllFields( scope, { html: html.proxies_multi });
   expect( result ).to.deep.equalInAnyOrder( fields.proxies_multi );
 });
 
 
-// Passing, but shouldn't be. Must implement poxie substitution for this too
-// // ============================
-// // Signature
-// // ============================
-// it(`creates the right data for a signature field`, async function() {
-//   // `field:` and `action buttons:`
-//   let result = await getAllFields( scope, { html: html.signature });
-//   console.log(`=================\n${ JSON.stringify(fields.signature, null, 2) }`);
-//   console.log(`-----------------\n${ JSON.stringify(result, null, 2) }`);
-//   expect( result ).to.deep.equalInAnyOrder( fields.signature );
-// });
+// ============================
+// Proxy vars (x, i, j, ...)
+// ============================
+// x[i].name.first where i = 0
+it(`creates the right data for x[i] proxy substitution where "i" is 0`, async function() {
+  let result = await getAllFields( scope, { html: html.proxy_substitution_i_is_0 });
+  expect( result ).to.deep.equalInAnyOrder( fields.proxy_substitution_i_is_0 );
+});
+
+// x[i].name.first where i = 1
+it(`creates the right data for x[i] target variable where "i" is 1`, async function() {
+  let result = await getAllFields( scope, { html: html.proxy_substitution_i_is_1 });
+  expect( result ).to.deep.equalInAnyOrder( fields.proxy_substitution_i_is_1 );
+});
+
+
+// ============================
+// Signature
+// ============================
+it(`creates the right data for a signature field`, async function() {
+  // `field:` and `action buttons:`
+  let result = await getAllFields( scope, { html: html.signature });
+  expect( result ).to.deep.equalInAnyOrder( fields.signature );
+});
 
 
 // ============================

package/tests/unit_tests/getMatchingRows.test.js

@@ -38,6 +38,8 @@ describe("Matches: For standard fields", async function() {
     let name = getSafeName( field );
     let result = await getMatchingRows( scope, { field, var_data: tables.standard });
     it( `finds the right matches for ${ name }`, async function() {
+      // console.log(`=================\n${ JSON.stringify(curr_matches) }`);
+      // console.log(`-----------------\n${ JSON.stringify(result) }`);
       expect( result ).to.deep.equal( curr_matches );
     });
   }
@@ -194,10 +196,10 @@ describe(`For mulitple rows with the same proxies`, async function() {
 describe(`For a second proxy loop page,`, async function() {
   for ( let test_i = 0; test_i < fields.proxies_multi.length; test_i++ ) {
     let field = fields.proxies_multi[ test_i ];
-    let curr_matches = matches.proxies_missing_loop[ test_i ];
+    let curr_matches = matches.proxies_missing_table_row[ test_i ];
     let name = getSafeName( field );
     it( `does not find any matches when table row for second loop page is missing`, async function() {
-      let result = await getMatchingRows( scope, { field, var_data: tables.proxies_missing_loop });
+      let result = await getMatchingRows( scope, { field, var_data: tables.proxies_missing_table_row });
       expect( result ).to.deep.equal( curr_matches );
     });
   }
@@ -216,6 +218,46 @@ describe(`For a second proxy loop page,`, async function() {
   }
 });
 
+// Proxy substitutes (no trigger) first loop (i = 0)
+describe(`For proxy substitution where "i" = 0`, async function() {
+  for ( let test_i = 0; test_i < fields.proxy_substitution_i_is_0.length; test_i++ ) {
+    let field = fields.proxy_substitution_i_is_0[ test_i ];
+    let curr_matches = matches.proxy_substitution_i_is_0[ test_i ];
+    let name = getSafeName( field );
+    it( `finds the right matches for ${ name }`, async function() {
+      let result = await getMatchingRows( scope, { field, var_data: tables.proxy_substitution_i_is_0 });
+      expect( result ).to.deep.equal( curr_matches );
+    });
+  }
+});
+
+// Multiple proxies by the same name are on the list (because of a loop)
+// Proxy substitutes (no trigger) second loop (i = 1)
+describe(`For proxy substitutions with mulitple rows of "i" where "i" = 1`, async function() {
+  for ( let test_i = 0; test_i < fields.proxy_substitution_i_is_1.length; test_i++ ) {
+    let field = fields.proxy_substitution_i_is_1[ test_i ];
+    let curr_matches = matches.proxy_substitution_i_is_1[ test_i ];
+    let name = getSafeName( field );
+    it( `finds the right matches for ${ name }`, async function() {
+      let result = await getMatchingRows( scope, { field, var_data: tables.proxy_substitution_i_is_1 });
+      expect( result ).to.deep.equal( curr_matches );
+    });
+  }
+});
+
+// Proxy substitution (no trigger) missing table row for second loop (i = 1)
+describe(`For a second loop page with a proxy substitution Story Table,`, async function() {
+  for ( let test_i = 0; test_i < fields.proxies_multi.length; test_i++ ) {
+    let field = fields.proxies_multi[ test_i ];
+    let curr_matches = matches.proxy_substitution_missing_table_row[ test_i ];
+    let name = getSafeName( field );
+    it( `finds no matches when the Story Table row for that loop is missing`, async function() {
+      let result = await getMatchingRows( scope, { field, var_data: tables.proxy_substitution_missing_table_row });
+      expect( result ).to.deep.equal( curr_matches );
+    });
+  }
+});
+
 
 // ============================
 // Signature

package/tests/unit_tests/html.fixtures.js

@@ -505,7 +505,8 @@ html.buttons_event_action = `
 // proxies correctly, but we don't need to worry about guessing the proxy
 // name. See https://github.com/plocket/docassemble-cucumber/pull/221
 
-// x[i].name.first
+// First loop (first time this question appears)
+// x[i].name.first (i = 0)
 html.proxies_xi = `
 <div id="daquestion" aria-labelledby="dapagetitle" role="main" class="tab-pane fade show active offset-xl-3 offset-lg-3 col-xl-6 col-lg-6 offset-md-2 col-md-8">
     <div data-variable="cHJveHlfbGlzdFswXS5uYW1lLmZpcnN0" id="trigger" aria-hidden="true" style="display: none;"></div>
@@ -534,9 +535,8 @@ html.proxies_xi = `
     </form>
 </div>`;
 
-// Second page of above
-// Multiple proxies by the same name are on the list (because of a loop)
-// x[i].name.first
+// Second loop (second time this question appears)
+// x[i].name.first (i = 1)
 html.proxies_multi = `
 <div id="daquestion" aria-labelledby="dapagetitle" role="main" class="tab-pane fade show active offset-xl-3 offset-lg-3 col-xl-6 col-lg-6 offset-md-2 col-md-8">
     <div data-variable="cHJveHlfbGlzdFsxXS5uYW1lLmZpcnN0" id="trigger" aria-hidden="true" style="display: none;"></div>
@@ -565,6 +565,68 @@ html.proxies_multi = `
     </form>
 </div>`;
 
+// Proxy substitution, no target variable
+// First loop (first time this question appears)
+// x[i].name.first (i = 0)
+html.proxy_substitution_i_is_0 = `
+<div id="daquestion" aria-labelledby="dapagetitle" role="main" class="tab-pane fade show active offset-lg-3 col-lg-6 offset-md-2 col-md-8">
+  <div id="alkiln_proxy_var_values" data-generic_object="cHJveHlfbGlzdA" data-index_var_i="MA" data-index_var_j="" data-index_var_k="" data-index_var_l="" data-index_var_m="" data-index_var_n="" aria-hidden="true" style="display: none;"></div>
+  <form aria-labelledby="daMainQuestion" action="/interview?i=docassemble.playground12ALKilnTestALKiln5822columns1706994311264:test_pdf.yml" id="daform" class="form-horizontal daformfields" method="POST" novalidate="novalidate">
+    <div class="da-page-header">
+      <h1 class="h3" id="daMainQuestion">Proxy var 1</h1>
+      <div class="daclear"></div>
+    </div>
+    <div class="da-container da-form-group row darequired da-field-container da-field-container-datatype-text">
+      <label for="eFtpXS5uYW1lLmZpcnN0" class="col-md-4 col-form-label da-form-label datext-right" >first proxy name</label>
+      <div class="col-md-8 dafieldpart">
+        <input alt="Input box" class="form-control" type="text" name="eFtpXS5uYW1lLmZpcnN0" id="eFtpXS5uYW1lLmZpcnN0" required=""/>
+      </div>
+    </div>
+    <fieldset class="da-button-set da-field-buttons">
+      <legend class="visually-hidden">Press one of the following buttons:</legend>
+      <button class="btn btn-da btn-primary" id="da-continue-button" type="submit">Continue</button>
+    </fieldset>
+    <input type="hidden" name="csrf_toke" value="ImNlMGRmOWY5NmQ4MGRjMjI0ZDQyNGFjMWRiYjdiODAzOTk2ZThhY2Ui.Zb7dOA.Fvil0jDP4mebaBoPmtM7sXv6wSQ"/>
+    <input type="hidden" name="_event" value="WyJwcm94eV9saXN0WzBdLm5hbWUuZmlyc3QiXQ"/>
+    <input type="hidden" name="_question_name" value="ID proxy vars"/>
+    <input type="hidden" name="_tracker" value="3"/>
+    <input type="hidden" name="_datatypes" value="eyJlRnRwWFM1dVlXMWxMbVpwY25OMCI6ICJ0ZXh0In0"/>
+    <input type="hidden" name="_visible" value="" />
+    <input type="hidden" name="_varnames" value="eyJYMlpwWld4a1h6QSI6ICJlRnRwWFM1dVlXMWxMbVpwY25OMCJ9"/>
+  </form>
+</div>`;
+
+// Proxy substitution, no target variable
+// Second loop (second time this question appears)
+// x[i].name.first (i = 1)
+html.proxy_substitution_i_is_1 = `
+<div id="daquestion" aria-labelledby="dapagetitle" role="main" class="tab-pane fade show active offset-lg-3 col-lg-6 offset-md-2 col-md-8">
+    <div id="alkiln_proxy_var_values" data-generic_object="cHJveHlfbGlzdA" data-index_var_i="MQ" data-index_var_j="" data-index_var_k="" data-index_var_l="" data-index_var_m="" data-index_var_n="" aria-hidden="true" style="display: none;"></div>
+    <form aria-labelledby="daMainQuestion" action="/interview?i=docassemble.playground12ALKilnTestALKiln5822columns1706994311264:test_pdf.yml" id="daform" class="form-horizontal daformfields" method="POST" novalidate="novalidate">
+        <div class="da-page-header">
+            <h1 class="h3" id="daMainQuestion">Proxy var 2</h1>
+            <div class="daclear"></div>
+        </div>
+        <div class="da-container da-form-group row  darequired da-field-container da-field-container-datatype-text">
+          <label for="eFtpXS5uYW1lLmZpcnN0" class="col-md-4 col-form-label da-form-label datext-right">second proxy name</label>
+          <div class="col-md-8 dafieldpart">
+            <input alt="Input box" class="form-control" type="text" name="eFtpXS5uYW1lLmZpcnN0" id="eFtpXS5uYW1lLmZpcnN0" required="">
+          </div>
+        </div>
+        <fieldset class="da-button-set da-field-buttons">
+          <legend class="visually-hidden">Press one of the following buttons:</legend>
+          <button class="btn btn-da btn-primary" id="da-continue-button" type="submit">Continue</button>
+        </fieldset>
+        <input type="hidden" name="csrf_token" value="ImNlMGRmOWY5NmQ4MGRjMjI0ZDQyNGFjMWRiYjdiODAzOTk2ZThhY2Ui.Zb7fVw.D9gMWkXreNYpd_eKkSXwMUybSZ4">
+        <input type="hidden" name="_event" value="WyJwcm94eV9saXN0WzFdLm5hbWUuZmlyc3QiXQ">
+        <input type="hidden" name="_question_name" value="ID proxy vars">
+        <input type="hidden" name="_tracker" value="7">
+        <input type="hidden" name="_datatypes" value="eyJlRnRwWFM1dVlXMWxMbVpwY25OMCI6ICJ0ZXh0In0">
+        <input type="hidden" name="_visible" value="">
+        <input type="hidden" name="_varnames" value="eyJYMlpwWld4a1h6QSI6ICJlRnRwWFM1dVlXMWxMbVpwY25OMCJ9">
+    </form>
+</div>`;
+
 
 // ============================
 // Signature

package/tests/unit_tests/matches.fixtures.js

@@ -107,12 +107,12 @@ matches.proxies_xi = [
 // Multiple proxies by the same name are on the list (because of a loop)
 // x[i].name.first
 matches.proxies_multi = [
-  [{"trigger":"proxy_list[1].name.first","var":"x[i].name.first","value":"Firstname"}],
+  [{"trigger":"proxy_list[1].name.first","var":"x[i].name.first","value":"2 Firstname"}],
   []
 ];
 
 // Missing table row for second loop
-matches.proxies_missing_loop = [
+matches.proxies_missing_table_row = [
   [],
   []
 ];
@@ -123,6 +123,24 @@ matches.proxies_missing_trigger = [
   []
 ];
 
+// Proxy substitutes (no trigger) i = 0
+matches.proxy_substitution_i_is_0 = [
+  [{"trigger": "","var": "proxy_list[0].name.first","value":"Firstname"}],
+  []
+];
+
+// Proxy substitutes (no trigger) i = 1 (3 loops possible)
+matches.proxy_substitution_i_is_1 = [
+  [{"trigger": "","var":"proxy_list[1].name.first","value":"2 Firstname"}],
+  []
+];
+
+// Proxy substitution (no trigger) missing table row for second loop (i = 1)
+matches.proxy_substitution_missing_table_row = [
+  [],
+  []
+];
+
 
 // ============================
 // Signature

package/tests/unit_tests/tables.fixtures.js

@@ -139,16 +139,16 @@ tables.proxies_xi = [
   { "trigger": "proxy_list[0].name.first", "var": "x[i].name.first", "value": "Firstname", },
 ];
 
-// Multiple proxies by the same name are on the list (because of a loop)
+// Multiple proxies by the same name are on the list because of a loop (3 loops possible)
 // x[i].name.first
 tables.proxies_multi = [
-  { "trigger": "proxy_list[0].name.first", "var": "x[i].name.first", "value": "Firstname", },
-  { "trigger": "proxy_list[1].name.first", "var": "x[i].name.first", "value": "Firstname", },
-  { "trigger": "proxy_list[2].name.first", "var": "x[i].name.first", "value": "Firstname", },
+  { "trigger": "proxy_list[0].name.first", "var": "x[i].name.first", "value": "1 Firstname", },
+  { "trigger": "proxy_list[1].name.first", "var": "x[i].name.first", "value": "2 Firstname", },
+  { "trigger": "proxy_list[2].name.first", "var": "x[i].name.first", "value": "3 Firstname", },
 ];
 
 // Missing table row for second loop
-tables.proxies_missing_loop = [
+tables.proxies_missing_table_row = [
   { "trigger": "proxy_list[0].name.first", "var": "x[i].name.first", "value": "Firstname", "original": { "trigger": "proxy_list[0].name.first", "var": "x[i].name.first", "value": "Firstname" } },
 ];
 
@@ -157,6 +157,23 @@ tables.proxies_missing_trigger = [
   { "trigger": "", "var": "x[i].name.first", "value": "Firstname", "original": { "trigger": "", "var": "x[i].name.first", "value": "Firstname" }},
 ];
 
+// Proxy substitutes (no trigger) i = 0
+tables.proxy_substitution_i_is_0 = [
+  { "trigger": "", "var": "proxy_list[0].name.first", "value": "Firstname", },
+];
+
+// Proxy substitutes (no trigger) i = 1 (3 loops possible)
+tables.proxy_substitution_i_is_1 = [
+  { "trigger": "", "var": "proxy_list[0].name.first", "value": "1 Firstname", },
+  { "trigger": "", "var": "proxy_list[1].name.first", "value": "2 Firstname", },
+  { "trigger": "", "var": "proxy_list[2].name.first", "value": "3 Firstname", },
+];
+
+// Proxy substitution (no trigger) missing table row for second loop (i = 1)
+tables.proxy_substitution_missing_table_row = [
+  { "trigger": "", "var": "proxy_list[0].name.first", "value": "Firstname", "original": { "trigger": "", "var": "proxy_list[0].name.first", "value": "Firstname" } },
+];
+
 
 // ============================
 // Signature