fixed: tests after latest merge with updated build system and renamed…

… specs
OpenClinica · Jul 20, 2023 · 4c2d2af · 4c2d2af
1 parent 67076fb
commit 4c2d2af
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/public/js/src/enketo-webform-oc.js b/public/js/src/enketo-webform-oc.js
@@ -58,12 +58,12 @@ if (settings.offline) {
     const isPreview = settings.type === 'preview';
 
     initTranslator(survey)
-        .then((props) => {
-            return connection.getFormParts({
+        .then((props) =>
+            connection.getFormParts({
                 ...props,
                 isPreview,
             })
-        })
+        )
         .then((formParts) => {
             if (
                 location.pathname.indexOf('/edit/') > -1 ||

diff --git a/test/client/config/karma.conf.js b/test/client/config/karma.conf.js
@@ -13,13 +13,14 @@ module.exports = (config) => {
 
         // list of files / patterns to load in the browser
         files: [
-            { pattern: 'test/client/**/*.spec.js', type: 'module' },
             {
                 pattern: 'public/js/src/**/*.js',
                 included: false,
                 served: true,
                 type: 'module',
             },
+            // For OC's customizations to be loaded this needs to follow the public/js/src files...
+            { pattern: 'test/client/**/*.spec.js', type: 'module' },
             {
                 pattern: 'test/fixtures/**/*.geojson',
                 included: false,

diff --git a/test/client/relevant.spec.js → test/client/relevant-extensions.spec.js b/test/client/relevant.spec.js → test/client/relevant-extensions.spec.js
@@ -1,10 +1,8 @@
-import chai from 'chai';
 import { Form } from '../../public/js/src/module/form';
 import forms from './forms/forms';
 import events from '../../public/js/src/module/event';
 import '../../public/js/src/module/form-model';
 
-const { expect } = chai;
 const range = document.createRange();
 
 const loadForm = (filename) => {