Merge pull request #259 from CentreForDigitalHumanities/feature/test-fixes

Frontend test fixes

Author: jgonggrijp

frontend/karma.conf.js

@@ -20,7 +20,8 @@ module.exports = function(config) {
         'node_modules/select2/dist/js/select2.js',
         'node_modules/backbone/backbone.js',
         'node_modules/backbone-fractal/backbone-fractal.js',
-        'vre/test-index.js'
+        {pattern: 'vre/edpop-record-ontology.json', included: false},
+        'vre/test-index.js',
     ],
 
     // list of files / patterns to exclude
@@ -38,7 +39,7 @@ module.exports = function(config) {
             'jquery',
             'lodash',
             'underscore',
-            'popper.js',
+            '@popperjs/core',
             'bootstrap',
             'select2',
             'backbone',
@@ -80,6 +81,9 @@ module.exports = function(config) {
 
     // web server port
     port: 9876,
+    proxies: {
+        '/static/': '/base/vre/',
+    },
 
     // enable / disable colors in the output (reporters and logs)
     colors: true,

frontend/vre/index.html

@@ -38,7 +38,7 @@
 
         <script src="https://cdn.jsdelivr.net/npm/lodash@4.17.21/lodash.min.js"></script>
 
-        <script src="https://cdn.jsdelivr.net/npm/popper.js@1.14.3/dist/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
+        <script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.8/dist/umd/popper.min.js" integrity="sha256-whL0tQWoY1Ku1iskqPFvmZ+CHsvmRWx/PIoEvIeWh4I=" crossorigin="anonymous"></script>
         <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js"></script>
         <script src="https://cdn.jsdelivr.net/npm/backbone@1.6.0/backbone-min.js"></script>