tests: fix imports

amiranvarov · Oct 26, 2021 · 430407a · 430407a
1 parent f2c95b0
commit 430407a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/lib/loader/pluginLoader.js b/lib/loader/pluginLoader.js
@@ -341,11 +341,12 @@
             for(var i = 0; i < mixins.length; i++) {
 
                 var mixin = mixins[i];
+                if (plugins[mixin]) {
+                    var m = plugins[mixin].getPluginLastModifiedDate();
 
-                var m = plugins[mixin].getPluginLastModifiedDate();
-
-                if (m > modified) {
-                    modified = m;
+                    if (m > modified) {
+                        modified = m;
+                    }
                 }
             }
         }

diff --git a/modules/tests-ui/models.js b/modules/tests-ui/models.js
@@ -1,4 +1,6 @@
     import * as moment from 'moment';
+    import config from '../../config.js';
+    global.CONFIG = config;
 
     var mongoose, db;
 

diff --git a/modules/tests-ui/tester.js b/modules/tests-ui/tester.js
@@ -1,12 +1,10 @@
-import config from '../../config';
+import config from '../../config.js';
 global.CONFIG = config;
 
-global.CONFIG = config.default;
-
 if (!CONFIG.tests) {
     console.error('Tests not started: CONFIG.tests not configured.');
     process.exit(0);
-    return;
+    // return;
 }
 
 process.title = "iframely-tests";
@@ -15,7 +13,7 @@ import * as async from 'async';
 import * as _ from 'underscore';
 import * as models from './models.js';
 import * as utils from './utils.js';
-import { run as iframely } from '../../lib/core';
+import { run as iframely } from '../../lib/core.js';
 import * as whitelist from '../../lib/whitelist.js';
 import * as pluginLoader from '../../lib/loader/pluginLoader.js';
 var plugins = pluginLoader._plugins;
@@ -51,7 +49,7 @@ var TestingProgress = models.TestingProgress;
 
 if (!PluginTest) {
     process.exit(0);
-    return;
+    // return;
 }
 
 function log() {

diff --git a/modules/tests-ui/utils.js b/modules/tests-ui/utils.js
@@ -1,5 +1,5 @@
 import * as _ from 'underscore';
-import * as FeedParser from 'feedparser';
+import FeedParser from 'feedparser';
 import request from 'request';
 import * as async from 'async';
 import * as url from 'url';