improved some tests

TrkHwry · Dec 19, 2018 · 579bf36 · 579bf36
1 parent d0344e8
commit 579bf36
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 13 deletions.
diff --git a/lib/loadmanager.js b/lib/loadmanager.js
diff --git a/lib/loadmanager.js.map b/lib/loadmanager.js.map
diff --git a/src/index.js b/src/index.js
@@ -76,15 +76,17 @@ class loadManager {
         scripts.forEach((script) => this.addToDom(script));
 
         let counter = 0;
-        let checkComplete = () => {
+        let checkComplete = (script) => {
+            if(script.onRequest) return;
+
             counter++;
 
             if(counter >= scripts.length) {
                 this.emit('complete');
             }
         }
-        this.on('loaded', () => checkComplete())
-        this.on('error', () => checkComplete())
+        this.on('loaded', (script) => checkComplete(script))
+        this.on('error', (script) => checkComplete(script))
     }
 
     addToDom(data) {
@@ -133,16 +135,22 @@ class loadManager {
             if(script.loaded) {
                 resolve()
             }
-            else {
+            else if(script.onRequest) {
                 // onRequest
                 // check if the script is allowed to be loaded
                 if(script.onRequest) {
                     let level = this.getLevel();
                     if(level >= script.level) {
                         this.addToDom(script);
                     }
+                    this.on('loaded', (script) => {
+                        if(script.key == key) {
+                            resolve();
+                        }
+                    })
                 }
-
+            }
+            else {
                 this.scriptListener[key] = this.scriptListener[key] || [];
                 this.scriptListener[key].push(resolve);
             }
@@ -164,6 +172,7 @@ class loadManager {
         for(let key in this.scriptListener) {
             this.scriptListener[key].forEach((callback) => callback());
         }
+        this.scriptListener = {};
     }
 
     // EVENT HANDLING

diff --git a/test/loadTests.js b/test/loadTests.js
@@ -103,5 +103,23 @@ export default function (scripts) {
                 manager.load(1);
             });
         });
+
+        describe('#whenever (on request)', function() {
+            it('should load the script and execute afterwards without error', function(done) {
+                var manager = new loadManager;
+
+
+                scripts[0].onRequest = true;
+
+                // set scripts
+                manager.setScripts(scripts);
+
+                manager.whenever('cdn-jquery-1').then(() => {
+                    done();
+                });
+
+                manager.load(1);
+            });
+        });
     });
 }