attempt fix parsing errors in tests

coldbox-modules · Sep 29, 2024 · 6f65d44 · 6f65d44
1 parent fc64565
commit 6f65d44
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/models/CBWIREController.cfc b/models/CBWIREController.cfc
@@ -307,14 +307,13 @@ component singleton {
         if( structKeyExists( variables, "preprocessors" ) ){
             return variables.preprocessors;
         }
-        // Scan the folder 'preprocessor' for all CFCs and return an array
-        local.files = directoryList( 
-            path=getDirectoryFromPath(getCurrentTemplatePath()) & "preprocessor",
-            recurse=false,
-            listInfo="name",
-            filter="*.cfc",
-            type="file"
-        );
+        // List of preprocesssors here. Had to hard code instead of using 
+        // directoryList because of filesystem differences in various OSes
+        local.files = [
+            "TemplatePreprocessor.cfc",
+            "CBWIREPreprocessor.cfc",
+            "TeleportPreprocessor.cfc"
+        ]
         // Map the files to their getInstance path
         variables.preprocessors = local.files.map( ( _file ) => {
             local.getInstancePath = replace( _file, ".cfc", "" ) & "@cbwire";

diff --git a/models/preprocessor/TemplatePreprocessor.cfc b/models/preprocessor/TemplatePreprocessor.cfc
@@ -40,13 +40,11 @@ component {
      * @return string
      */
     function parseAssets( content, counter = 1 ) {
-        if ( counter == 1 ) {
-            content = replaceNoCase( content, "</cbwire:assets>", "</" & "cf" & "savecontent>", "all" );
+        arguments.content = replaceNoCase( arguments.content, "</cbwire:assets>", "</" & "cf" & "savecontent>", "one" );
+        arguments.content = replaceNoCase( arguments.content, "<cbwire:assets>", "<" & "cf" & "savecontent variable=""attributes.returnValues.assets#counter#"">", "one");
+        if ( findNoCase( "<cbwire:assets>", arguments.content ) ) {
+            arguments.content = parseAssets( arguments.content, arguments.counter + 1 );
         }
-        content = replaceNoCase( content, "<cbwire:assets>", "<" & "cf" & "savecontent variable=""attributes.returnValues.assets#counter#"">", "one");
-        if ( findNoCase( "<cbwire:assets>", content ) ) {
-            content = parseAssets( content, counter + 1 );
-        }
-        return content;
+        return arguments.content;
     }
 }