@suffolklitlab/alkiln 5.8.0 → 5.8.1-feat2columns2

package/tests/unit_tests/getAllFields.test.js

@@ -33,8 +33,8 @@ chai.config.truncateThreshold = 0
 it(`creates the right data for standard fields`, async function() {
   // 18 fields (03/15/21)
   let result = await getAllFields( scope, { html: html.standard });
-  //console.log(`${ JSON.stringify(result) }`);
-  //console.log(`-----------------\n${ JSON.stringify(fields.standard) }`);
+//   console.log(`=================\n${ JSON.stringify(fields.standard, null, 2) }`);
+//   console.log(`-----------------\n${ JSON.stringify(result, null, 2) }`);
   expect( result ).to.deep.equalInAnyOrder( fields.standard );
 });
 
@@ -79,21 +79,35 @@ 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 );
 });
 
 
+// ============================
+// 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
 // ============================

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