Added tests for script tag transport method

Author: michaelpb

src/Modulo.js

@@ -12,6 +12,7 @@ window.moduloPrevious = window.modulo;
 window.Modulo = class Modulo {
     constructor() {
         window._moduloID = (window._moduloID || 0) + 1;
+        this.window = window;
         this.id = window._moduloID; // Every Modulo instance gets a unique ID.
         this._configSteps = 0; // Used to check for an infinite loop during load
         this.registry = { cparts: { }, coreDefs: { }, utils: { }, core: { },
@@ -909,10 +910,11 @@ modulo.register('core', class FetchQueue {
             resolve(this.data[src], src); // (sync route)
         } else if (!(src in this.queue)) { // No cache, no queue
             this.queue[src] = [ resolve ]; // First time, create the queue Array
-            let { callback, filePadding, force } = this.modulo.config.fetchqueue;
-            if (src.startsWith('file://') || force === 'file') {
-                const auto = this.modulo.registry.stripWord(filePadding.prefix);
-                window[callback || auto] = str => { this.__data = str };
+            const { force, filePadding } = this.modulo.config.fetchqueue;
+            if (filePadding && (src.startsWith('file:/') || force === 'file')) {
+                const { prefix, callbackName } = filePadding; // JSONP callback
+                const auto = this.modulo.registry.utils.stripWord(prefix);
+                window[callbackName || auto] = str => { this.__data = str };
                 const elem = window.document.createElement('SCRIPT');
                 elem.onload = () => this.receiveData(this.__data, src);
                 elem.src = src + (src.endsWith('/') ? 'index.html' : '');
@@ -931,7 +933,7 @@ modulo.register('core', class FetchQueue {
 
     receiveData(text, src) { // Receive data, optionally trimming padding
         const { prefix, suffix } = this.modulo.config.fetchqueue.filePadding;
-        if (text.startsWith(prefix) && prefix && text.trim().endsWith(suffix)) {
+        if (text && text.startsWith(prefix) && prefix && text.trim().endsWith(suffix)) {
             text = text.trim().slice(prefix.length, 0 - suffix.length); // Clean
         }
         this.data[src] = text; // Keep retrieved data cached here for sync route

tests/index.html

@@ -25,8 +25,10 @@
     <Library -src="./cparts/component_namespace.test.html"></Library>
 
     <!-- Also, do doc tests (makes unmocked, real HTTP requests to APIs) -->
+    <!--
     <Library -src="/libraries/docseg.html"></Library>
     <Library -src="/libraries/eg.html"></Library>
+    -->
 </template>
 <script src="/js/Modulo.js"></script>
 <script src="/demos/mdu/cparts/TestSuite.js"></script>

tests/multi-file-tests/loading_src.test.html

@@ -31,7 +31,7 @@
     -src="/demos/tests/multi-file-tests/loading_src_4.json"
 ></StaticData>
 
-<TestSuite>
+<TestSuite solo>
     <Test name="Test StaticData and Template loaded">
         <Script name="static data loaded">
             const actual = JSON.stringify(staticdata);
@@ -73,6 +73,49 @@
         </Script>
 
     </Test>
+    <Test name="Test Script-tag file protocol loading">
+
+        <Script name="Creates script tag with expected attributes">
+            window.DOCTYPE_MODULO = () => { throw new Error('DOCTYPE_MODULO leaking'); };
+
+            modulo.config.fetchqueue.force = 'file'; // force to use file protocol
+            modulo.register('core', modulo.registry.core.FetchQueue); // Ensure is constructed
+            const p = modulo.fetchQueue.fetch('/demos/tests/multi-file-tests/loading_src_4.json');
+            p.then(data => { throw new Error('Should not see this since we disable onload') });
+            const scriptTag = window.document.querySelector('script[src="/demos/tests/multi-file-tests/loading_src_4.json"]')
+            scriptTag.onload = () => {} ; // prevent onload
+            delete modulo.config.fetchqueue.force; // unset just in case
+            const actual = scriptTag && scriptTag.outerHTML;
+            scriptTag.remove(); // clean up so it doesnt mess up later tests
+            const expected = '<script src="/demos/tests/multi-file-tests/loading_src_4.json" ' +
+                             'modulo-asset="y"><' + '/script>';
+            assert: actual === expected
+        </Script>
+
+
+        <Script name="Calls receive data when script loads">
+            window.DOCTYPE_MODULO = () => { throw new Error('DOCTYPE_MODULO leaking'); };
+
+            modulo.config.fetchqueue.force = 'file'; // force to use file protocol
+            modulo.register('core', modulo.registry.core.FetchQueue); // Ensure is constructed
+            const p = modulo.fetchQueue.fetch('/demos/tests/multi-file-tests/loading_src_4.json');
+
+            let cbCount = 0;
+            p.then(() => { cbCount++; });
+            delete modulo.config.fetchqueue.force; // unset just in case
+
+            //const scriptTag = window.document.querySelector('script[src="/demos/tests/multi-file-tests/loading_src_4.json"]')
+            const scriptTag = window.document.querySelector('script[src="/demos/tests/multi-file-tests/loading_src_4.json"]')
+            scriptTag.onload(); // Trigger cbCount
+            scriptTag.onload = () => {}; // prevent future onload events
+
+            // Assign to no-op, to prevent errors (due to how the test
+            // works, there will be still stray  setTimeouts)
+            window.DOCTYPE_MODULO = () => { };
+            assert: cbCount === 1
+        </Script>
+
+    </Test>
 </TestSuite>
 </Component>