View script files with includes executed.

Author: Bernt Røskar Brenna

netmockery/Controllers/EndpointsController.cs

@@ -91,10 +91,14 @@ public ActionResult EndpointJsonFile(string name)
         public ActionResult ViewRequestCreatorFile(string name, int requestCreatorId)
         {
             var endpoint = _endpointCollection.Get(name);
-            var requestCreator = endpoint.Responses.ElementAt(requestCreatorId).Item2 as IResponseCreatorWithFilename;
-            if (requestCreator != null)
+            var requestCreator = endpoint.Responses.ElementAt(requestCreatorId).Item2;
+            if (requestCreator is FileDynamicResponseCreator fileDynamicResponseCreator)
             {
-                return File(System.IO.File.OpenRead(requestCreator.Filename), "text/plain");
+                return Content(fileDynamicResponseCreator.GetSourceCodeWithIncludesExecuted(), "text/plain");
+            }
+            else if (requestCreator is IResponseCreatorWithFilename requestCreatorWithFilename)
+            {
+                return File(System.IO.File.OpenRead(requestCreatorWithFilename.Filename), "text/plain");
             }
             else
             {

netmockery/DynamicResponseCreator.cs

@@ -29,6 +29,21 @@ public DynamicResponseCreatorBase(Endpoint endpoint) : base(endpoint) { }
 
         public virtual string FileSystemDirectory { get { return null; } }
 
+        public string GetSourceCodeWithIncludesExecuted()
+        {
+            var sourceCode = SourceCode;
+
+            return 
+                FileSystemDirectory != null
+                        ?
+                        ExecuteIncludes(
+                            CreateCorrectPathsInLoadStatements(sourceCode, FileSystemDirectory),
+                            FileSystemDirectory
+                        )
+                        :
+                        sourceCode;
+        }
+
 #if NET462
         public override async Task<string> GetBodyAsync(RequestInfo requestInfo)
         {
@@ -46,14 +61,7 @@ public override async Task<string> GetBodyAsync(RequestInfo requestInfo)
                 );
 
                 var script = CSharpScript.Create<string>(
-                    FileSystemDirectory != null 
-                        ?
-                        ExecuteIncludes(
-                            CreateCorrectPathsInLoadStatements(sourceCode, FileSystemDirectory),
-                            FileSystemDirectory
-                        )                        
-                        : 
-                        sourceCode,
+                    GetSourceCodeWithIncludesExecuted(),
                     scriptOptions,
                     globalsType: typeof(RequestInfo)
                 );
@@ -96,14 +104,7 @@ public override async Task<string> GetBodyAsync(RequestInfo requestInfo)
              );
 
              var script = CSharpScript.Create<string>(
-                 FileSystemDirectory != null
-                     ?
-                     ExecuteIncludes(
-                         CreateCorrectPathsInLoadStatements(SourceCode, FileSystemDirectory),
-                         FileSystemDirectory
-                     )
-                     :
-                     SourceCode,
+                 GetSourceCodeWithIncludesExecuted(),
                  scriptOptions,
                  globalsType: typeof(RequestInfo)
              );