@suffolklitlab/alkiln 4.0.0-pre-api.8 → 4.1.0

package/lib/steps.js

@@ -19,7 +19,7 @@ const { v4: uuidv4 } = require('uuid');
 
 // Ours
 const scope = require('./scope');
-const env_vars = require('./utils/env_vars');
+const session_vars = require('./utils/session_vars');
 
 /* Of Note:
 - We're using `*=` because sometimes da text has funny characters in it that are hard to anticipate
@@ -33,7 +33,7 @@ require("dotenv").config();  // Where did this go?
 1. 'choice' to have a more specific way to access each item. For
     example, for a list collect or other things that have multiple
     things with the same text on the page.
-1. Figure out how to test allowing felxibility for coder. For example:
+1. Figure out how to test allowing flexibility for coder. For example:
     there is placeholder text for the title of the form and if it's not
     defined, placeholder text should appear (though that behavior may
     bear discussion).
@@ -180,7 +180,7 @@ Given(/I start the interview at "([^"]+)"(?: in lang "([^"]+)")?/, {timeout: -1}
 
     // If response has a file in it that matches the file we are downloading
     if ( response._headers['content-disposition'] && (response._headers['content-disposition']).includes(`attachment;filename=${scope.toDownload}`) ) {
-      // We're chosing avoid removing the event listener in case removal
+      // We're choosing to avoid removing the event listener in case removal
       // would prevent downloading other files. The listener should get
       // destroyed when the page closes anyway.
 
@@ -219,7 +219,7 @@ Given(/I start the interview at "([^"]+)"(?: in lang "([^"]+)")?/, {timeout: -1}
   await custom_lang_timeout;
 
 
-  let custom_aferStep_timeout = new Promise(async ( resolve, reject ) => {
+  let custom_afterStep_timeout = new Promise(async ( resolve, reject ) => {
     let page_timeout = setTimeout(function() { reject(`\`afterStep()\` took too long.`); }, scope.timeout);
     // self-invoke an anonymous async function so we don't have to
     // abstract the details of resolving and rejecting.
@@ -230,8 +230,8 @@ Given(/I start the interview at "([^"]+)"(?: in lang "([^"]+)")?/, {timeout: -1}
       // prevent temporary hang at end of tests
       finally { clearTimeout( page_timeout ); }
     })();
-  });  // ends custom_aferStep_timeout
-  await custom_aferStep_timeout;
+  });  // ends custom_afterStep_timeout
+  await custom_afterStep_timeout;
 });
 
 Given(/I (?:sign|log) ?(?:in)?(?:on)?(?:to the server)? with(?: the email)? "([^"]+)" and(?: the password)? "([^"]+)"(?: SECRETs)?/i, {timeout: -1}, async ( email, password ) => {
@@ -252,7 +252,7 @@ Given(/I (?:sign|log) ?(?:in)?(?:on)?(?:to the server)? with(?: the email)? "([^
   );
 });
 
-// I am using a moble/pc
+// I am using a mobile/pc
 When(/I am using an? (.*)/, async ( device ) => {
   // Let developer pick mobile device if they want to
   // TODO: Add tablet?
@@ -350,7 +350,7 @@ When(/^(?:the user gets)?(?:I get)? to ?(?:the)?(?: ?question)?(?: id)? "([^"]+)
   for ( let row of supported_table ) {
     row.report_str = `${ await scope.convertToOriginalStoryTableRow(scope, { row_data: row }) }`;
   }
-  // Sort into aphabetical order, as is recommended for writing story tables
+  // Sort into alphabetical order, as is recommended for writing story tables
   let sorted_rows = supported_table.sort( function ( row1, row2 ) {
     if( row1.report_str < row2.report_str ) { return -1; }
     if( row1.report_str > row2.report_str ) { return 1; }
@@ -404,7 +404,7 @@ When(/I wait (\d*\.?\d+) seconds?/, { timeout: -1 }, async ( seconds ) => {
   * - Should this really reset the 'navigated' flag? Should the below
   *     return succeed or fail? e.g:
   *     I tap to continue; I wait 10 seconds; I arrive at the next page;
-  *     Maybe the 'navitaged' flag should only be reset just before trying to
+  *     Maybe the 'navigated' flag should only be reset just before trying to
   *     navigate (after pressing a button)
   */
   return wrapPromiseWithTimeout(
@@ -426,7 +426,7 @@ Then(/I take a screenshot ?(?:named "([^"]+)")?/, { timeout: -1 }, async ( name
 When("I do nothing", async () => { await scope.afterStep(scope); });  // √
 
 Then('the question id should be {string}', { timeout: -1 }, async ( question_id ) => {
-  /* Looks for a santized version of the question id as it's written
+  /* Looks for a sanitized version of the question id as it's written
   *     in the .yml. docassemble's way */
   let { question_has_id, id, id_matches } = await scope.examinePageID( scope, question_id );
 
@@ -449,7 +449,7 @@ Then('the question id should be {string}', { timeout: -1 }, async ( question_id
 });
 
 // Allow emphasis with capital letters
-Then(/I should see the phrase "([^"]+)"/i, async ( phrase ) => {  // √
+Then(/I ?(?:should)? see the phrase "([^"]+)"/i, async ( phrase ) => {  // √
   /* In Chrome, this `innerText` gets only visible text */
   const bodyText = await scope.page.$eval('body', elem => elem.innerText);
 
@@ -567,7 +567,7 @@ Then('I arrive at the next page', async () => {  // √
 
 // Link observations have the 'Escape' button link in mind
 Then('I should see the link {string}', async ( linkText ) => {  // √
-  /* Loosley match link visible text. Should probably deprecate this. */
+  /* Loosely match link visible text. Should probably deprecate this. */
   let [link] = await scope.page.$x(`//a[contains(text(), "${linkText}")]`);
 
   let msg = `Cannot find a link with the text "${ linkText }".`;
@@ -668,7 +668,7 @@ Then(/I get the(?: page's)?(?: JSON)? var(?:iable)?s and val(?:ue)?s/i, { timeou
   *    to get the variable values on the page of the interview and add
   *    them to the report.
   * 
-  * Varations:
+  * Variations:
   * I get the page's JSON variables and values
   * I get the json vars and vals
   * I get the page's vars and vals
@@ -717,7 +717,7 @@ When('I tap to continue', { timeout: -1 }, async () => {
 // --- VARIABLES-BASED STEPS ---
 
 When(/I set the var(?:iable)? "([^"]+)" to "([^"]+)"/, { timeout: -1 }, async ( var_name, set_to ) => {
-  /* Set any variable (with or without a choice associated with it) to a value. Set:
+  /* Set a non-story table variable (with or without a choice associated with it) to a value. Set:
   *  - Buttons associated with variables
   *  - Dropdowns
   *  - Checkboxes (multiple choice checkboxes must be set to "true" or "false")
@@ -725,7 +725,7 @@ When(/I set the var(?:iable)? "([^"]+)" to "([^"]+)"/, { timeout: -1 }, async (
   *  - Text inputs
   *  - Textareas
   *
-  * Examples:
+  * Variations:
   * 1. I set the var "benefits['SSI']" to "false"
   * 1. I set the var "rent_interval" to "weekly"
   */
@@ -736,7 +736,7 @@ When(/I set the var(?:iable)? "([^"]+)" to "([^"]+)"/, { timeout: -1 }, async (
 });
 
 Then(/I upload "([^"]+)" to "([^"]+)"/, { timeout: -1 }, async ( filenames, var_name ) => {
-  /* Uploads sibling file (docx, jpg, etc) to input var. Can actually use
+  /* Uploads file (docx, jpg, etc) in same folder to input var. Can actually use
   * 'I set the var "" to ""', but this is more explicit if it's desired. */
   return wrapPromiseWithTimeout(
     scope.steps.set_regular_var( scope, var_name, filenames ),
@@ -867,9 +867,9 @@ After(async function(scenario) {
   await scope.setReportScenarioStatus( scope, { status: scenario.result.status });
 
   if (scenario.result.status !== `PASSED`) {
-    if ( env_vars.DEBUG ) {
+    if ( session_vars.get_debug() ) {
       console.log( `Non-passed status occurred while running test:`, scenario.result.status );
-      // If there's a page visible, give us time to examine it
+      // If there's a page visible (locally), give us time to examine it
       if ( scope.page ) { await scope.page.waitForTimeout( 60 * 1000 ); }
     }
 
@@ -909,15 +909,15 @@ After(async function(scenario) {
     // Consider, instead, catching the reload error for a bad restart and just
     // re-trying at that point.
     try {
-      await scope.page.goto(`${ env_vars.BASE_URL }/user/sign-out`, {waitUntil: `domcontentloaded`});  
+      await scope.page.goto(`${ session_vars.get_da_server_url() }/user/sign-out`, {waitUntil: `domcontentloaded`});  
     } catch ( err ) {
-      if ( env_vars.DEBUG ) {
+      if ( session_vars.DEBUG ) {
         console.log( `Trying to reset for the next test a second time because the first time failed.` );
       }
 
       try {
-        await scope.page.goto(`${ env_vars.BASE_URL }/user/sign-out`, {waitUntil: `domcontentloaded`});  
-
+        await scope.page.goto(`${ session_vars.get_da_server_url() }/user/sign-out`, {waitUntil: `domcontentloaded`});  
+      
       } catch ( err ) {
         await scope.addToReport(scope, {
           type: `warning`,

package/lib/utils/langs.js

@@ -4,7 +4,7 @@ let _path = require('path');
 let fs = require('fs');
 let glob = require('glob');
 
-let env_vars = require('./env_vars');
+let session_vars = require('./session_vars');
 
 // Get the glob filepaths to find all the test files
 let dir_root = process.env.INIT_CWD;  // Path to root of project
@@ -12,7 +12,7 @@ let test_glob = process.argv[2];  // String of glob (regex for filepaths)
 let filepaths = glob.sync( _path.resolve( dir_root, test_glob ) );
 let flag = '_lang_';
 
-let langs = env_vars.EXTRA_LANGUAGES;
+let langs = session_vars.get_languages();
 
 // Generate new language files
 for ( let full_path of filepaths ) {  // Handle old language files before creating new ones.
@@ -20,7 +20,7 @@ for ( let full_path of filepaths ) {  // Handle old language files before creati
   // Don't apply this to the example test that this package always provides
   if ( full_path.includes( 'example_test.feature' )) { continue; }
 
-  // Delete alredy existing non-default language files and skip the rest of this. For example,
+  // Delete already existing non-default language files and skip the rest of this. For example,
   // if 3 languages were tested previously and now only two are being tested.
   if ( full_path.includes( flag )) {
       fs.unlinkSync( full_path );

package/lib/utils/session_vars.js

@@ -10,75 +10,28 @@ require('dotenv').config();
 /* This file provides user info variables. E.g. server address. They're either
 *    `process.env` vars or vars that have been built from `process.env` vars.
 *    It is meant to avoid duplication, make testing easier, and leave room for
-*    future maninpulation. No other file should need to use `process.env`.
+*    future manipulation. No other file should need to use `process.env`.
 *
 * We have a bunch of `.get_foo()` functions partly because it makes the code
 *    much easier to test.
 */
 
-const session_vars = {
-  PLAYGROUND_ID: process.env.PLAYGROUND_ID,  // Need to get rid of this in favor of API
-};
+const session_vars = {};
 
 module.exports = session_vars;
 
-/**
- * Ensure all required environment variables exist. Add each missing variable
- *    to an error that will be thrown at the end.
- * 
- * @throws ReferenceError with a message for all missing variables. 
- */
- session_vars.validateEnvironment = function() {
-
-  // We are checking for BASE_URL, but we are referring it as SERVER_URL as that
-  // is the name used in GitHub secrets, which is what most devs will be using.
-
-  let errorMessage = '';
-
-  // Since this code will most often be run in GitHub, I'm going to build a single error message that outlines all missing variables.  Otherwise, a developer
-  // will have to run their pipeline an incredible number of times to discover all the missing variables.
-  if (!process.env.DOCASSEMBLE_DEVELOPER_API_KEY)
-  {
-    errorMessage += `\nThe DOCASSEMBLE_DEVELOPER_API_KEY GitHub secret must be defined. The DOCASSEMBLE_DEVELOPER_API_KEY is a docassemble API key you created for your server's testing account. It should have developer permissions.`
-  }
-  if (!process.env.PLAYGROUND_ID)
-  {
-    errorMessage += '\nThe PLAYGROUND_ID GitHub secret must be defined.  The PLAYGROUND_ID is the ID of the Docassemble suite to run.'
-  }
-  if (!process.env.SERVER_URL && !process.env.BASE_URL)
-  {
-    errorMessage += `\nThe SERVER_URL GitHub secret must be defined. The SERVER_URL is the URL of the Docassemble Server where the tests should be run.`;
-  }
-  if (!process.env.REPO_URL)
-  {
-    errorMessage += `\nThe REPO_URL GitHub secret must be defined. The REPO_URL is the URL to the Git repo whose Actions are being run.`;
-  }
-  if (!process.env.BRANCH_PATH && !process.env.BRANCH_NAME)
-  {
-    errorMessage += `\nThe BRANCH_NAME environment variable must be defined. The BRANCH_NAME is the name of the repository branch that should be pulled into the docassemble project.`;
-  }
-
-  errorMessage = errorMessage.trim();
-
-  if (errorMessage !== '') {
-    throw new ReferenceError(errorMessage);
-  }
-};
-  
-session_vars.validateEnvironment();
+session_vars.get_debug = function () { return process.env.DEBUG || null; };
+session_vars.get_dev_api_key = function () { return process.env.DOCASSEMBLE_DEVELOPER_API_KEY || null; };
+session_vars.get_repo_url = function () { return process.env.REPO_URL || null; };
 
-session_vars.get_dev_api_key = function () { return process.env.DOCASSEMBLE_DEVELOPER_API_KEY; };
 session_vars.get_da_server_url = function () {
-  let url = process.env.SERVER_URL || process.env.BASE_URL;
-  return url.replace(/\/$/g, '');  // Remove any trailing slash for safety
+  try {
+    let url = process.env.SERVER_URL || process.env.BASE_URL;
+    return url.replace(/\/$/g, '');  // Remove any trailing slash for safety
+  } catch ( error ) {
+    return null;
+  }
 };
-session_vars.get_debug = function () { return process.env.DEBUG; };
-session_vars.get_repo_url = function () { return process.env.REPO_URL; };
-// missing/moving functionality:
-// getBaseInterviewURL
-// Project name setting/getting
-// Playground id functionality needs to be transfered to api requests
-
 
 session_vars.get_branch_name = function () {
   /* Get the name of the repository's branch that is being tested */
@@ -102,29 +55,6 @@ session_vars.get_project_base_name = function () {
   return sanitized_name;
 };
 
-// // Notes: We were using `new_session=1` in the url args, but it wasn't
-// // always working. The idea was to save each session so we could look
-// // back on it if needed. Aside from the fact that you usually need to log in
-// // to make the sessions retrievable (though if you're using `interview_list()`
-// // you can get them anyway), it also has inconsistent behavior when
-// // `sessions are unique`` or `temporary session` or use `interview_list()`
-// // and/or respond immediately with a `command()`. Three ways to avoid this:
-// // 1. x Start a new browser instead of just a new page each time. Lengthens the tests.
-// // 1. √ Visit `/user/sign-out` (needed even if the user is not logged in)
-// // 1. x (seems to be causing a 'Unable to locate interview session' error
-// // instead) Use `reset=2` instead , which will not save the previous session at all. It
-// // Will not just restart any existing interview sessions, it will also
-// // clear out the browser session's memory of what other interviews the user has
-// // visited in the same browser session_vars.
-// session_vars.getBaseInterviewURL = function () {
-//   /* Return the part of the interview URL that comes before the filename.
-//   * Depends on the project name, which may have been changed. */
-//   let new_session = `/interview?new_session=1&i=docassemble.playground`;
-//   return `${ session_vars.BASE_URL }${ new_session }${ session_vars.PLAYGROUND_ID }${ session_vars.getProjectName() }%3A`;
-// };
-// // session_vars.BASE_INTERVIEW_URL = session_vars.getBaseInterviewURL();
-
-
 session_vars.get_languages = function () {
   /* Returns an array of strings, names of languages that should be tested. */
 
@@ -175,7 +105,7 @@ session_vars.get_project_name = function () {
 
 session_vars.delete_project_name = function () {
   /* Delete the file storing the name of the docassemble project */
-  // Avoid race coditions possibly caused by checking for existence first
+  // Avoid race conditions possibly caused by checking for existence first
   // Delete file if possible
   try {
     fs.unlinkSync( project_name_file_path );
@@ -186,3 +116,47 @@ session_vars.delete_project_name = function () {
     return false;
   }
 };
+
+/**
+ * Ensure all required environment variables exist. Add each missing variable
+ *    to an error that will be thrown at the end.
+ * 
+ * @throws ReferenceError with a message for all missing variables. 
+ */
+ session_vars.validateEnvironment = function() {
+  /** Throw a useful error for the developer if any of the required env vars
+  *    are missing. For most devs, these will be GitHub secrets. */
+
+  // Note: We are checking for BASE_URL, but we are referring it as SERVER_URL as that
+  // is the name used in GitHub secrets, which is what most devs will be using.
+
+  let errorMessage = '';
+
+  // Since this code will most often be run in GitHub, I'm going to build a single error message that outlines all missing variables.  Otherwise, a developer
+  // will have to run their pipeline an incredible number of times to discover all the missing variables.
+  if ( !session_vars.get_dev_api_key() )
+  {
+    errorMessage += `\nThe DOCASSEMBLE_DEVELOPER_API_KEY GitHub secret must be defined. The DOCASSEMBLE_DEVELOPER_API_KEY is a docassemble API key you created for your server's testing account. It should have developer permissions.`
+  }
+  if ( !session_vars.get_da_server_url() )
+  {
+    errorMessage += `\nThe SERVER_URL GitHub secret must be defined. The SERVER_URL is the URL of the Docassemble Server where the tests should be run.`;
+  }
+  if ( !session_vars.get_repo_url() )
+  {
+    errorMessage += `\nThe REPO_URL GitHub secret must be defined. The REPO_URL is the URL to the Git repo whose Actions are being run.`;
+  }
+  // The branch name is always automatically defined in Github, it'll be missing only if you're running locally and missing an env var.
+  if ( !session_vars.get_branch_name() )
+  {
+    errorMessage += `\nThe BRANCH_NAME environment variable must be defined. The BRANCH_NAME is the name of the repository branch that should be pulled into the docassemble project.`;
+  }
+
+  errorMessage = errorMessage.trim();
+
+  if (errorMessage !== '') {
+    throw new ReferenceError(errorMessage);
+  }
+};
+  
+session_vars.validateEnvironment();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@suffolklitlab/alkiln",
-  "version": "4.0.0-pre-api.8",
+  "version": "4.1.0",
   "description": "Integrated automated end-to-end testing with docassemble, puppeteer, and cucumber.",
   "main": "lib/index.js",
   "scripts": {
@@ -17,7 +17,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/SuffolkLITLab/alkiln.git"
+    "url": "git+https://github.com/SuffolkLITLab/ALKiln.git"
   },
   "keywords": [
     "docassemble",
@@ -30,9 +30,9 @@
   "author": "",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/SuffolkLITLab/alkiln/issues"
+    "url": "https://github.com/SuffolkLITLab/ALKiln/issues"
   },
-  "homepage": "https://suffolklitlab.github.io/docassemble-AssemblyLine-documentation/docs/automated_integrated_testing",
+  "homepage": "https://suffolklitlab.org/docassemble-AssemblyLine-documentation/docs/automated_integrated_testing/",
   "dependencies": {
     "@cucumber/cucumber": "^7.3.2",
     "axios": "^0.24.0",
@@ -48,7 +48,6 @@
   "bin": {
     "alkiln-setup": "./lib/docassemble/setup.js",
     "alkiln-takedown": "./lib/docassemble/takedown.js",
-    "alkiln-cucumber": "./lib/index.js",
     "alkiln-langs": "./lib/utils/langs.js"
   }
 }

package/tests/features/establishing_steps.feature

@@ -4,13 +4,13 @@ Feature: Establishing steps
 Steps that establish things about the state of the test
 # In tag names, 'e' is for 'establishing'
 
-@slow @e1
+@slow @e1 @wait
 Scenario: I am able to set a custom wait time that allows steps to run longer than the half minute default
   Given I start the interview at "all_tests"
   And the max seconds for each step in this scenario is 40
   And I wait 35 seconds
 
-@slow @e2
+@slow @e2 @wait
 Scenario: I am able to set a custom wait time before an interview has been loaded
   Given the max seconds for each step in this scenario is 40
   And I start the interview at "all_tests"

package/tests/features/observation_steps.feature

@@ -96,7 +96,7 @@ Scenario: Test "Then I don’t continue" with an apostrophe
   Then I don’t continue
   And I will be told an answer is invalid
 
-@fast @o9
+@fast @o9 @table
 Scenario: I can match JSON page var to str
   Given I start the interview at "all_tests.yml"
   And I get to "showifs" with this data:

package/tests/features/reports.feature

@@ -138,7 +138,7 @@ Scenario: Fail with missing link with url
   And I start the interview at "all_tests"
   Then I should see the link to "http://missing-url.com"
 
-@slow @rf13 @error
+@slow @rf13 @error @table
 Scenario: Fail with link with given text does not lead to correct url
   Given the final Scenario status should be "failed"
   Given the Scenario report should include:
@@ -166,7 +166,7 @@ Scenario: Fail with link with given text does not lead to correct url
   And I should see the link to "http://ecosia.org/"
   Then the "Link to external page" link leads to "http://wrong-url.com"
 
-@slow @rf14 @error
+@slow @rf14 @error @table
 Scenario: Fail with link unexpectedly opens in same window
   Given the final Scenario status should be "failed"
   Given the Scenario report should include:
@@ -194,7 +194,7 @@ Scenario: Fail with link unexpectedly opens in same window
   And I should see the link to "http://ecosia.org/"
   Then the "Link to external page" link opens in the same window
 
-@fast @rf15 @error
+@fast @rf15 @error @table
 Scenario: Fail with link unexpectedly opens in a new window
   Given the final Scenario status should be "failed"
   Given the Scenario report should include:
@@ -223,7 +223,7 @@ Scenario: Fail with link unexpectedly opens in a new window
   Then the "Link: reload the page" link opens in a new window
 
 ## Don't currently have a broken link to test and this Step is not officially supported
-#@fast @rf16 @error
+#@fast @rf16 @error @table
 #Scenario: Fail with link leads to a broken page
 #  Given the final Scenario status should be "failed"
 #  Given the Scenario report should include:
@@ -321,7 +321,7 @@ Scenario: Fail with system error after Step using wrong file name as trigger
 #  """
 #  And I start the interview at "wrong_yaml_filename"
 
-@fast @rf22
+@fast @rf22 @table
 Scenario: I can't match JSON page var to str
   Given the final Scenario status should be "failed"
   Given the Scenario report should include:
@@ -376,6 +376,16 @@ Scenario: Fail with 2 wrong signin secrets
   """
   Given I sign in with the email "WRONG_EMAIL_NAME" and the password "WRONG_PASSWORD_NAME"
 
+@fast @rf25 @upload
+Scenario: Fail with could not find files 
+  Given the final Scenario status should be "failed"
+  Given the Scenario report should include:
+  """
+  Could not find "nonexistant1.pdf, nonexistant2.pdf"
+  """
+  Given I start the interview at "all_tests"
+  And I upload "nonexistant1.pdf, nonexistant2.pdf" to "upload_files_visible"
+
 # scope.js
 # I upload "___" to "___"
 # No need to test wrong var name
@@ -384,6 +394,7 @@ Scenario: Fail with 2 wrong signin secrets
 #
 # I sign
 
+
 # ===============================
 # Reports for Scenarios with warnings
 # ===============================
@@ -448,70 +459,27 @@ Scenario: Report still shows page id when I tap to continue without setting any
   # Next page (showifs ID SHOULD BE SHOWN IN REPORT)
   Then the question id should be "buttons yesnomaybe"
 
-@slow @rp2
+@slow @rp2 @table
 Scenario: Report lists unused table rows
   Given the final Scenario status should be "passed"
   Given the Scenario report should include:
     """
-
-    ---------------
-    Scenario: Report lists unused table rows
-    Tags: @reports @slow @rp2
-    ---------------
-    screen id: upload-files
-    screen id: group-of-complex-fields
-          | single_quote_dict['single_quote_key']['sq_two'] | true |  |
-          | double_quote_dict[\"double_quote_key\"]['dq_two'] | true |  |
-
-      Rows that got set:
-        And I get to the question id "direct standard fields" with this data:
-          | var | value | trigger |
-          | double_quote_dict[\"double_quote_key\"]['dq_two'] | true |  |
-          | single_quote_dict['single_quote_key']['sq_two'] | true |  |
       Unused rows:
           | extra_2 | extra 2 |  |
           | extra_out_of_alphabetical_order | extra 1 |  |
-
-    screen id: direct-standard-fields
-          | checkboxes_other['checkbox_other_opt_1'] | true |  |
-          | radio_yesno | False | false |
-          | radio_other | radio_other_opt_3 |  |
-          | text_input | Regular text input field value |  |
-          | textarea | Multiline text\narea value |  |
-          | dropdown_test | dropdown_opt_2 |  |
-
-      Rows that got set:
-        And I get to the question id "showifs" with this data:
-          | var | value | trigger |
-          | checkboxes_other['checkbox_other_opt_1'] | true |  |
-          | dropdown_test | dropdown_opt_2 |  |
-          | radio_other | radio_other_opt_3 |  |
-          | radio_yesno | False | false |
-          | text_input | Regular text input field value |  |
-          | textarea | Multiline text\narea value |  |
+    """
+  Given the Scenario report should include:
+    """
       Unused rows:
           | extra_3 | extra 3 |  |
           | extra_4 | extra 4 |  |
           | extra_5 | extra 5 |  |
-
-    screen id: showifs
-    screen id: buttons-yesnomaybe
-          | buttons_yesnomaybe | True |  |
-    screen id: buttons-other
-          | buttons_other | button_2 |  |
-    screen id: button-continue
-          | button_continue | True |  |
-
-      Rows that got set:
-        And I get to the question id "screen features" with this data:
-          | var | value | trigger |
-          | button_continue | True |  |
-          | buttons_other | button_2 |  |
-          | buttons_yesnomaybe | True |  |
+    """
+  Given the Scenario report should include:
+    """
       Unused rows:
           | extra_6 | extra 6 |  |
           | extra_7 | extra 7 |  |
-
     """
   And I start the interview at "all_tests"
   And I get to "direct standard fields" with this data:

package/tests/features/story_table_formats.feature

@@ -1,4 +1,4 @@
-@story_tables_formats
+@story_tables_formats @table
 Feature: Supported story table formats
 
 NOTE:

package/tests/features/story_tables.feature

@@ -1,4 +1,4 @@
-@story_tables
+@story_tables @table
 Feature: Story tables
 
 NOTE:

package/tests/unit_tests/getMatchingRows.test.js

@@ -7,6 +7,8 @@ const fields = require('./fields.fixtures.js');
 const matches = require('./matches.fixtures.js');
 const scope = require('../../lib/scope.js');
 const getMatchingRows = scope.getMatchingRows;
+// Match state var instantiated in steps.js. TODO: Add tests for such rows.
+scope.row_needs_trigger_flag = `ALKiln: no trigger variable needed`;
 
 // TODO: Add tests for reports
 
@@ -188,6 +190,32 @@ describe(`For mulitple rows with the same proxies`, async function() {
   }
 });
 
+// Missing table row for loop
+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 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 });
+      expect( result ).to.deep.equal( curr_matches );
+    });
+  }
+});
+
+// Missing trigger matches second loop
+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_trigger[ test_i ];
+    let name = getSafeName( field );
+    it( `matches with a missing trigger row with the correct variable name`, async function() {
+      let result = await getMatchingRows( scope, { field, var_data: tables.proxies_missing_trigger });
+      expect( result ).to.deep.equal( curr_matches );
+    });
+  }
+});
+
 
 // ============================
 // Signature

package/tests/unit_tests/matches.fixtures.js

@@ -15,7 +15,7 @@ matches.standard = [
   [],
   [ { var: 'radio_other', value: 'radio_other_opt_2' } ],
   [],
-  [ { var: 'text_input', value: 'Some one-line text' }, { var: 'text_input', value: 'Some conflicting text' } ],
+  [ { var: 'text_input', value: 'Some one-line text', "original": { var: 'text_input', value: 'Some one-line text' } }, { var: 'text_input', value: 'Some conflicting text', "original": { var: 'text_input', value: 'Some conflicting text' } } ],
   [ { var: 'textarea', value: 'Some\nmulti-line\ntext' } ],
   [ { 'var': 'date_input','value':'today-1' } ],
   [ { var: 'dropdown_test', value: 'dropdown_opt_2' } ],
@@ -111,6 +111,18 @@ matches.proxies_multi = [
   []
 ];
 
+// Missing table row for second loop
+matches.proxies_missing_loop = [
+  [],
+  []
+];
+
+// Missing trigger matches second loop
+matches.proxies_missing_trigger = [
+  [{ "trigger": "", "var": "x[i].name.first", "value": "Firstname", "original": { "trigger": "", "var": "x[i].name.first", "value": "Firstname" }}],
+  []
+];
+
 
 // ============================
 // Signature