E2E tests in CI (#307)

Fixes the E2E tests in CI so that they always run to completion.

We were used disk mode for the session store in tests, and it appears it was interfering with some of the tests - and suggests that we may have an issue with session cleanup (particularly the in-memory caches) which we can resolve in another PR.

There was a recent change to how examples are generated which broke the other test, but all should be working as expected now.

Author: rossjones

lib/importer/src/dudk/backend.js

@@ -9,7 +9,7 @@ const errorTypes = require('./util/errors');
 // An implementation of the interface described in https://struct.register-dynamics.co.uk/trac/wiki/DataImporter/API
 
 let sessionStore = function () {
-  if (process.env.NODE_ENV === undefined || process.env.NODE_ENV == "development") {
+  if (process.env.NODE_ENV == "development") {
     return store.MakeSessionStore(store.SessionStoreType.DISK)
   }
 
@@ -571,7 +571,7 @@ exports.SessionSuggestFields = (sid, typeGuesses, domainModelFields) => {
 exports.SessionGetInputValues = (sid, range, maxValues) => {
   assert(sessionStore.get(sid));
   assert(sessionStore.get(sid).wb.Sheets[range.sheet]);
-  assert(range.end.row >= range.start.row);
+  assert(range.end.row >= range.start.row, `End row (${range.end.row}) must be >= start row (${range.start.row}) to get input values`);
   assert(range.end.column >= range.start.column);
 
   const sheet = sessionStore.get(sid).wb.Sheets[range.sheet];
@@ -669,7 +669,7 @@ function validateMapping(range, mapping) {
 exports.SessionPerformMappingJob = (sid, range, mapping, includeErrorRow = false) => {
   assert(sessionStore.get(sid));
   assert(sessionStore.get(sid).wb.Sheets[range.sheet]);
-  assert(range.end.row >= range.start.row);
+  assert(range.end.row >= range.start.row, `End row (${range.end.row}) must be >= start row (${range.start.row}) when performing mapping`);
   assert(range.end.column >= range.start.column);
 
   const footerRange = this.SessionGetFooterRange(sid, range.sheet); // Ensure the footer range is loaded

lib/importer/src/dudk/sheets.js

@@ -226,8 +226,12 @@ exports.GetColumnValues = (sid, sheet, columnIndex, cellWidth = 30, count = 10)
 
   // The range passed to SessionGetInputValues is inclusive, and therefore
   // we end up with the first row of the selected footer. To avoid this
-  // we will decrement the end.row to ensure we don't pull too make values.
-  dataRange.end.row = dataRange.end.row - 1
+  // we will decrement the end.row to ensure we don't pull too many values.
+  // We also need to make sure in small tables thast this doesn't make end.row
+  // less than start.row
+  if (dataRange.end.row > dataRange.start.row) {
+    dataRange.end.row = dataRange.end.row - 1
+  }
 
   let values = backend.SessionGetInputValues(
     sid,

prototypes/basic/tests/helpers/mapping_page.js

@@ -11,7 +11,8 @@ export class MappingPage {
 
     getColumnNames = async() => {
         let tbl = await this.getTable()
-        let rowCount = await tbl.locator("tbody tr").count()
+
+        let rowCount = await tbl.locator("tbody tr").count();
         let names = new Array()
 
         for (let idx = 0; idx< rowCount; idx++) {

prototypes/basic/tests/small-file.spec.js

@@ -85,8 +85,9 @@ test('tiny files', async ({ page }) => {
     const examples = await mapping.getExamples()
     expect(examples).toStrictEqual(expectedExamples)
 
+    // One of these must be Salary as it is required, the other can be anything
     await mapping.setMapping('A', 'Title')
-    await mapping.setMapping('B', 'Surname')
+    await mapping.setMapping('B', 'Salary')
     await mapping.submit()
 
     // // ---------------------------------------------------------------------------

prototypes/basic/tests/tribbles.spec.js

@@ -86,7 +86,7 @@ test('trouble with tribbles', async ({ page }) => {
         "1-1-24, 1-5-24, 2-3-24, 2-4-24, 3-5-24",
         "15:05, 1:00, 4:34, 6:01, 9:55",
         "4.9, 5.5, 6, 6.5, 8.4",
-        "Beige, Black, Brown, Maroon, Pink",
+        "Beige, Brown, Maroon, Pink", // Pink appears twice but should only be in the list once
         "Blob on top, N/A, Splotches, Yes,"
     ]